Commit Graph

1987 Commits (35ab3a2c7d23ecb9ca321ea1edcf6571cbe49f09)

Author SHA1 Message Date
nwb 6e53796aa9 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw f86e889c23 修复学校列表链接
11 years ago
nwb 42a602a9bc 修改首页
11 years ago
sw 2bdb0e20e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 3e185c3a4b 修改学校链接
11 years ago
nwb 1a666900c0 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 98ba57b819 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4d25ec1623 1.添加课程垃圾数据清理迁移文件
11 years ago
sw b42d742c06 1.增加我的学校链接
11 years ago
yanxd 271af6ead5 Merge branch 'szzh' into develop
11 years ago
yanxd 0e2b7ba362 tag search fix
11 years ago
sw fe4e1cc175 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb a03cdf272e Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 9f7951a22c 修改BUG
11 years ago
nwb 41ff47b839 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 52ddee2b2f 界面优化
11 years ago
nwb bc50390a2e Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 5c0b1f3a47 修改界面
11 years ago
nwb 8564f7a904 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 8d22ccd23a 修改BUG
11 years ago
sw 5abee0a06c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 39b4bd37d4 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb b928eb6ed8 修改课程首页“更多”链接错误
11 years ago
nwb ae8093c400 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 2a6cbe28f0 修正课程首页错误
11 years ago
sw 3c7e680b1b Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 41999e64b7 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 31e338f1e5 修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
11 years ago
sw 967c377191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 10a844c67f 合并导致的,任务列表分页错误
11 years ago
yanxd f664ec10b4 Merge branch 'szzh' into develop
11 years ago
yanxd 663634b9da Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
nwb 898ecb443a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e8705bccb1 修改文件上传界面样式
11 years ago
z9hang fe3861c1d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 54a2fb8a9c 主页项目得分与项目页面的项目得分保持一致
11 years ago
nwb fb0597ab4a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 2b855badf9 修正课程资源库关联已有资源功能
11 years ago
xianbo 830e2d4fb4 隐藏 站长统计
11 years ago
sw 063460f119 tt
11 years ago
z9hang cc2862ae0f 修正缺陷不能踩自己提示错误
11 years ago
nwb e94ed86ead 部分BUG修正
11 years ago
sw 4470f0dd73 添加作业时增加教师评分所占比例设置
11 years ago
nwb 6141cc56e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e863c30352 部分BUG修正
11 years ago
z9hang 9a8c5ebecc 个人得分规则显示
11 years ago
sw f6d9bfc91d 修改新建作业时传递参数
11 years ago
sw be2faea15b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
linchun 79f68c2231 Merge branch 'szzh' into develop
11 years ago
nwb 25a3114a5a 老师的学生列表显示为真实姓名
11 years ago
nwb 917288c84c 修正课程讨论区、课程通知等创建时BUG修正
11 years ago
sw 3f8f141107 修复 创建作业时,由于输入参数错误导致保存失败后,再次输入错误参数会报错。如再次输入参数正确,会进入一个空白页面 的BUG
11 years ago
nwb 99c9f81aea BUG修正
11 years ago
nwb 1a4ee62853 修正课程错误信息显示2遍的问题
11 years ago
nwb c0f0e294e5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb beeab518e8 课程动态中留言链接BUG修复
11 years ago
z9hang 0717148a0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang bc587f3e7d 屏蔽个人分数实时刷新功能
11 years ago
nwb 3565b9da88 修正用户课程界面关闭、重启课程,数据刷新不及时的问题
11 years ago
sw 09d79ae4e0 添加作业增加默认日期为当前时间的下一天
11 years ago
sw 745727b8e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 74603e1256 解决直接访问ajax链接地址报错问题
11 years ago
sw 08bfb8e80a 修复教师评分后星星显示不正常的BUG
11 years ago
sw 12b16f0bb6 1.修复作业界面点击所属任务链接出错的BUG
11 years ago
sw 392dc0c365 增加访问作业显示列表的权限
11 years ago
sw ed9b97f987 增加访问作业显示列表的权限
11 years ago
sw 56ce9e8bdb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw c4b2c47dc7 调整作业显示样式
11 years ago
sw 12087f40c7 1.当作业未选定项目时,项目得分为灰色的N/A,选定了项目,项目得分为橘色的分数
11 years ago
nwb b4af75f289 部分界面优化
11 years ago
sw 7702b746c6 修复作业显示界面,提交作业按钮不显示的问题
11 years ago
nwb f4aa817f42 修改合并后首页出错的问题
11 years ago
nwb 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
z9hang 02e221eedb 修改:网站中的旧分数显示为新分数
11 years ago
sw c320ede205 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
linchun c1e780a0f8 yan
11 years ago
linchun 0c501022fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
z9hang dc1bd010f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang df89e5e173 去掉多的一个分数显示
11 years ago
linchun e602c0f149 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
nwb ef61e41d48 去掉首页缓存
11 years ago
linchun 9c5066b81c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
sw 91408cc960 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 773b728828 修改:自己不能踩或顶自己
11 years ago
z9hang 9d9bc76af4 定时刷新分数
11 years ago
z9hang f9612ca63f 实时刷新(ajax轮询)
11 years ago
sw 339b5b0296 缺陷编辑页面直接显示,不需要点击留言按钮才显示缺陷编辑页面
11 years ago
sw 18762e2da7 增加、修改作业时提交项目增加空值选择,即不选定任何关联项目
11 years ago
sw d2376eb0b1 将页面部分jS代码转为JQuary代码
11 years ago
sw d0c9390e91 增加什么是项目链接。点击什么是项目 实现jQuary窗帘效果显示解释
11 years ago
nwb 8cdab80d31 用户课程界面链接BUG修改
11 years ago
sw 5277eddb95 封装获取一个作业参与人员方法
11 years ago
sw 600ec536b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 09eae9e253 1.作业列表增加项目得分显示
11 years ago
sw 36fecfc635 1.界面颜色调整
11 years ago
sw 19530df395 作业附件显示修改
11 years ago
z9hang 2ee5b422fb RolesController.rb移回app/controls
11 years ago
sw 463edeee71 1.修复未开启互评功能作业总评得分计算不正确的问题
11 years ago
sw e43a84ab4b 1.修复作业无关联项目是进入编辑界面报错的问题
11 years ago
sw 4d06d26303 优化新建作业页面显示
11 years ago
sw f3f303e6e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw ef234d8c50 1.按照新的评分规则修改作业得分
11 years ago
nwb 0736dd1254 课程讨论区回复权限和界面BUG修正
11 years ago
z9hang 9e4dbcc08e 加回学校主页学校的超链接
11 years ago
sw d38e009469 取消学号显示,增加参与人员在作业列表的显示
11 years ago
sw 71bb76ff91 作业显示界面页面改造,实现新的页面显示效果
11 years ago
nwb 8a5e1f5d9f 界面修改
11 years ago
z9hang 9061a77221 修改user.user_score为空问题的解决方式
11 years ago
z9hang 3c89de4c81 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang c0d97870d5 项目=》文档 文档提交者添加超链接
11 years ago
sw 2f66296b62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb f0b016bcbe 讨论区留言编辑修改
11 years ago
nwb e17090d506 修改课程通知show方法,并添加独立视图
11 years ago
nwb 462e5ab589 修改课程资源文件类型编辑BUG
11 years ago
z9hang d2db58050d 修复部分未填工作单位报错问题
11 years ago
z9hang 08ba10c32d 添加超链接
11 years ago
sw efb6c1fd19 1.修改、新增作业增加提交项目选项(可以为空)
11 years ago
sw 872357cdf4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 97a4aaf8ab homework_attach增加列project_id及相关数据迁移
11 years ago
yanxd 9b707f2b5a a
11 years ago
z9hang 1cb1eeeb1d 个人主页:姓名、工作单位
11 years ago
nwb 0de6cc8a31 修改作业基础视图
11 years ago
nwb ec72bb2904 编辑作业逻辑修改
11 years ago
yanxd b76f1c2b12 管理员用户粉丝列表出错。
11 years ago
nwb 936c40b490 提交作业逻辑和视图修改
11 years ago
yanxd 2f724aa23e xss 过滤memo content中的标签
11 years ago
nwb 78612488e5 1.修改新建作业及视图
11 years ago
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
11 years ago
nwb cdaa27b52b 文件上传去掉tag显示
11 years ago
z9hang f9a17241da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 9e53ad67d0 去除个人分数显示的链接
11 years ago
senluo cde34e42bc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
z9hang 697a6034b2 新得分显示
11 years ago
nwb 99e5644c4e 去掉上传文件的标签编辑
11 years ago
nwb 9c3605320e 加入、退出课程逻辑优化
11 years ago
nwb b4e78d2b0c 课程添加成员逻辑更改
11 years ago
yanxd 47e6c3eedd home cache
11 years ago
yanxd 63cd19c15c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd c5d892a214 footer
11 years ago
senluo ac850dd6f6 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
senluo b702411a65 fix contest show lichun
11 years ago
yanxd 579f1d4d31 start align-center
11 years ago
yanxd 955fece267 merge develop
11 years ago
yanxd 3fd7104448 welcome index obj.includes, routes add school logo
11 years ago
yanxd 07e4d40d44 cache obj
11 years ago
z9hang eae3918074 添加用户得数统计功能
11 years ago
yanxd 93d13c8867 system bin, 坑
11 years ago
yanxd ceef85719e contest fix
11 years ago
yanxd 70abac4c1e Merge branch 'competition' into develop
11 years ago
yanxd 362570e34b contestnotification_edit function
11 years ago
nwb 054cfbcafc 修改课程搜索功能
11 years ago
z9hang 621346268f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd b58c5685ac Merge branch 'szzh' into develop
11 years ago
yanxd f8bfa83ae4 move cache
11 years ago
wanglinchun 8618b73a8c 本次安卓校园竞赛获奖结果更新,首页正常显示
11 years ago
z9hang f7fc4d06a2 添加贴吧帖子顶踩功能
11 years ago
sw b7458abd9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 277aa81a60 修复占位列表界面显示的作业描述样式不正确的问题
11 years ago
yanxd 0536af6625 Merge branch 'szzh' into develop
11 years ago
nwb c8900c279c 课程标签增加、删除
11 years ago
yanxd 858a7936b5 revert userscore catch exception, added cache to footer.
11 years ago
nwb 3933817570 1.修改课程配置界面
11 years ago
sw 8075645591 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd cccb19e733 cnzz
11 years ago
wanglinchun 52e7be1b1d 修改首页中评奖结果的显示字体
11 years ago
sw f4961cbc50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw a100193373 1.作业参与人员可以对作业进行修改,但不能进行删除
11 years ago
yanxd efdbf3e808 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 09edfc7c0c cache test
11 years ago
z9hang 5a47c52d23 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 8ed95f132a 1.修改、新建占位页面增加导航栏
11 years ago
nwb ae8fcca14f 1.课程接触视图修改
11 years ago
sw 025b8971e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw d832a5eecf rake db:migrate
11 years ago
nwb 165dbc3f78 修改words_controller与课程相关方法及视图
11 years ago
wanglinchun 15c88df72d 为发布竞赛通知添加权限
11 years ago
wanglinchun d76eec27cc 为竞赛通知评论添加登录权限
11 years ago
wanglinchun 60bdff86a1 竞赛通知增加权限限制
11 years ago
nwb 517a29116f 修改message_controller与课程相关方法及视图
11 years ago
yanxd e4ed8cf970 分数显示整数
11 years ago
nwb 863dec03d2 添加课程讨论区show视图
11 years ago
wanglinchun bb06ee921a sdf
11 years ago
nwb 97d920c195 修改新增课程通知视图
11 years ago
z9hang a8670ba6fc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb d6280befca 修改新闻model、路由、index方法
11 years ago
z9hang e606fd89d2 被关注+2分、取消关注-2分
11 years ago
sw 43736ba8d6 兼容历史数据
11 years ago
sw 541ced18ec 作业显示界面增加导航栏
11 years ago
nwb 3165d97417 1.迁移课程新闻数据
11 years ago
sw a681aa76cb 1.修复进入互评界面的报错
11 years ago
nwb 7677e092e0 添加课程资源文件分类显示视图
11 years ago
sw 872b7efb84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 2abd8187d0 增加搜索用户功能
11 years ago
nwb 59051972e1 1.修改课程资源删除
11 years ago
sw d0dd6eb781 1.修改作业时实现作业添加参与人员与删除参与人员
11 years ago
wanglinchun 734d246618 sdf
11 years ago
wanglinchun 877d8f8439 etr
11 years ago
nwb b6c9415a4b 1.给各角色添加浏览课程资源文件权限
11 years ago
yanxd b364b8148f document show html. separate attachment.
11 years ago
wanglinchun 5ef8626d71 完成了竞赛子站首页显示安卓竞赛结果的代码及布局设置
11 years ago