Commit Graph

11360 Commits

Author SHA1 Message Date
houxiang e8511a6210 modify the gemfile conflict by hx 2015-12-21 16:00:35 +08:00
houxiang 5f2e6284ce 增加了两个template文件,大家下拉代码后将template文件复制去掉后尾的template就行 2015-12-18 09:21:05 +08:00
houxiang fc2eae4c62 add something by hx 2015-12-17 20:56:30 +08:00
huang 1dae37f613 添加commit总数 api 2015-12-17 18:28:12 +08:00
huang 2d2329a1e0 代码定位问题 2015-12-17 14:31:55 +08:00
huang 721a007779 删除 由于course、project一张表而引起的历史数据异常问题 2015-12-17 13:22:41 +08:00
huang 074d8f62c2 delete the two config files on gitlab 2015-12-17 11:16:46 +08:00
houxiang 0324282641 查询每个项目的各个成员中的提交贡献次数 2015-12-16 14:30:46 +08:00
huang 98d0e6d411 版本库“提交明细” 2015-12-16 10:53:28 +08:00
huang ac8aa9e0a6 解决作业留言和课程留言导致的bug 2015-12-16 10:03:51 +08:00
huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb

解决冲突
2015-12-16 10:02:08 +08:00
huang 06e5784436 解决英雄榜两个用户同时存在的but 2015-12-16 10:00:10 +08:00
cxt 097d0653ba 注释掉给未答题的学生0分的代码 2015-12-15 20:33:29 +08:00
cxt 481b7b96eb 正式版报500 2015-12-15 20:15:10 +08:00
cxt 699d0e22dd 删除多余学生的测验数据 2015-12-15 19:05:19 +08:00
cxt fa4a2eb0dd 未答题的学生测验分数为0 2015-12-15 18:37:00 +08:00
cxt f7a932d7b9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-15 17:37:28 +08:00
ouyangxuhua dc45321454 组织文章二级回复代码被覆盖,恢复代码 2015-12-15 17:34:40 +08:00
cxt 44ce4fe592 多次点击留言不会重复提交 2015-12-15 17:34:08 +08:00
cxt 45726576cf 学生测验列表的点击 2015-12-15 17:31:27 +08:00
cxt 7d70f53a38 Merge branch 'cxt_course' into develop 2015-12-15 16:52:11 +08:00
cxt 086cfa3867 学生列表不可点击 2015-12-15 16:51:21 +08:00
cxt c999bbbaa6 Merge branch 'develop' into cxt_course 2015-12-15 16:10:44 +08:00
cxt 90c7822c38 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-15 16:06:59 +08:00
cxt 040b00f130 Merge branch 'szzh' into develop 2015-12-15 16:06:36 +08:00
cxt a74808626c Merge branch 'szzh' into cxt_course 2015-12-15 16:05:20 +08:00
cxt 72c475e8a2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-15 16:03:26 +08:00
cxt eb3e562e9a Merge branch 'cxt_course' into szzh 2015-12-15 16:03:15 +08:00
cxt d6c2b95858 学生测验列表的提示信息 2015-12-15 16:02:10 +08:00
cxt 0215e5e38c 若测验已截止且学生已提交则在测验列表后面显示“已答” 2015-12-15 15:37:57 +08:00
cxt 0deffdba33 在线测验学生答题时可点击保存也可点击提交 2015-12-15 15:21:52 +08:00
cxt 0b25f36a7f 在线测验再次编辑时默认隐藏头部编辑块 2015-12-15 14:39:32 +08:00
cxt 1f4454d908 课程左侧的在线测验统计数 2015-12-15 10:43:43 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
cxt 2b5bf9540d 关闭了匿评再补交作品,给学生的提示信息中“当前作业已开启匿评...”改为“当前作业已关闭匿评...” 2015-12-14 17:11:07 +08:00
cxt af0e592d8a 匿评日期的设置 2015-12-14 17:03:20 +08:00
cxt 438ae82980 非课程学生不能关联项目 2015-12-14 17:02:44 +08:00
cxt d7b690e53a 匿评设置时匿评关闭日期可以等于匿评开启日期 2015-12-14 16:54:28 +08:00
cxt 85b11010d2 在线测验报500、 学生看不到已截止的测验、测验列表的样式调整 2015-12-14 16:18:39 +08:00
lizanle c5f903146d 博客资源下载问题 2015-12-14 11:19:43 +08:00
huang 5ca8d4cd66 修改http链接自动换域名 2015-12-14 10:54:37 +08:00
cxt eb8e9f32a3 作品列表的私有项目不可点击 2015-12-14 10:06:19 +08:00
cxt c199de1d36 Merge branch 'szzh' into cxt_course 2015-12-14 08:43:44 +08:00
lizanle 7c114e1a13 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-11 19:34:29 +08:00
lizanle f028992a18 帖子搜索 2015-12-11 19:34:17 +08:00
huang 625f993ed2 Merge branch 'szzh' into develop 2015-12-11 19:14:30 +08:00
cxt 7a0828a826 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 19:13:43 +08:00
cxt 502310425b 匿评成绩为空 2015-12-11 19:13:34 +08:00
huang 7e85302d9b Merge branch 'szzh' into develop 2015-12-11 18:12:56 +08:00
huang a791c39b4b Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:12:25 +08:00