Commit Graph

11808 Commits

Author SHA1 Message Date
cxt 96b2c363f5 Merge branch 'develop' into cxt_course 2015-12-21 17:03:44 +08:00
cxt c8760445ab Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-21 17:00:28 +08:00
cxt a5cc1390f2 学生匿评打分时必须填写评语 2015-12-21 17:00:01 +08:00
huang 0d311fa405 Merge branch 'develop' into hjq_new_course 2015-12-21 16:52:28 +08:00
huang 849bc87950 Merge branch 'hjq_new_course' into develop 2015-12-21 16:47:26 +08:00
houxiang 240a859f2d Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-21 16:45:58 +08:00
houxiang 21461fb583 修正了以前的方法调用 by 侯翔 2015-12-21 16:45:16 +08:00
huang 91d42ac7d4 Merge branch 'hjq_new_course' into develop 2015-12-21 16:30:58 +08:00
huang 471e5f5370 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-21 16:29:58 +08:00
huang 771666f568 Merge branch 'develop' into hjq_new_course 2015-12-21 16:29:46 +08:00
houxiang 3e57237969 修改了整个提交记录总数,运用了黄总的修改的gitlab API by 侯翔 2015-12-21 16:21:39 +08:00
houxiang e8511a6210 modify the gemfile conflict by hx 2015-12-21 16:00:35 +08:00
guange 1724ae430e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-21 15:15:48 +08:00
guange b235e8de70 改为默认模板 2015-12-21 15:15:39 +08:00
guange 8cdd7c58cf at名单加宽一点 2015-12-21 15:14:51 +08:00
guange bb94a41435 红点中包含at的消息 2015-12-21 15:11:41 +08:00
huang 26c5c88757 Merge branch 'szzh' into develop 2015-12-21 14:49:51 +08:00
huang c29ab5dc6d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-21 14:49:17 +08:00
huang f94154560b Merge branch 'develop' into szzh 2015-12-21 14:49:08 +08:00
huang 3e6000a7a3 Merge branch 'hjq_new_course' into develop 2015-12-21 14:37:04 +08:00
huang 1a549eda46 版本库显示问题 2015-12-21 14:33:28 +08:00
huang 6193dc8f0a Merge branch 'develop' into hjq_new_course 2015-12-21 14:11:28 +08:00
huang c381ce177f 解决通知太长不能发的问题 2015-12-21 14:00:09 +08:00
huang ab1397d982 恢复版本 2015-12-21 13:53:22 +08:00
huang 2d170d90b3 Merge branch 'cxt_course' into develop 2015-12-21 13:49:47 +08:00
huang 73f0d70e23 Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course 2015-12-21 13:49:19 +08:00
huang a1395d69ef Merge branch 'develop' into cxt_course 2015-12-21 13:48:50 +08:00
huang 3de4c7129a 版本库读取错误问题 2015-12-21 13:48:25 +08:00
cxt e86f9f9aeb 去掉通知页面的字符限制 2015-12-21 13:20:09 +08:00
lizanle 31cbf3fbce onchange函数去掉 2015-12-21 11:19:34 +08:00
lizanle 60381fded5 表单长度对齐 2015-12-21 11:14:27 +08:00
lizanle 4630576146 issue的创建成功不需要提示sucess 2015-12-21 10:30:39 +08:00
cxt 4d75338710 Merge branch 'szzh' into cxt_course 2015-12-21 10:30:17 +08:00
lizanle 480775f2b9 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-21 09:27:17 +08:00
lizanle 538c64329f issue的修改 2015-12-21 09:26:56 +08:00
huang 4faa3c42dc Merge branch 'szzh' into develop 2015-12-18 21:36:53 +08:00
huang 188bb0c1a7 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:36:26 +08:00
huang 2efb7b6e66 Merge branch 'develop' into szzh 2015-12-18 21:36:09 +08:00
cxt 84f6ec0978 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:34:50 +08:00
cxt 65022f03cb 作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新 2015-12-18 21:34:31 +08:00
huang 52adcb378d 注释任务 2015-12-18 21:29:25 +08:00
huang a2e35917a1 Merge branch 'szzh' into develop 2015-12-18 21:22:42 +08:00
huang 4092401e68 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:22:08 +08:00
huang 9564eca754 Merge branch 'develop' into szzh 2015-12-18 21:21:54 +08:00
huang d2ba950044 绝对成 2015-12-18 21:03:36 +08:00
huang 5941d41b19 测试 2015-12-18 20:53:32 +08:00
cxt c073e56b79 学生匿评必须添加评语 2015-12-18 20:46:20 +08:00
huang dae6e68623 renwu 2015-12-18 20:46:17 +08:00
guange 5748078e3e 只调用一次at列表 2015-12-18 20:40:52 +08:00
guange 1aeef0d49c Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 20:27:09 +08:00