Commit Graph

10524 Commits

Author SHA1 Message Date
cxt 9be1fe63b4 默认发布日期的格式 2015-11-05 15:45:21 +08:00
cxt 019e4e0630 作业动态和作品列表页面添加发布时间 2015-11-05 15:16:42 +08:00
cxt 7edb4db99d 匿评作品时不需要默认打开本人的作品信息列表 2015-11-05 15:05:01 +08:00
cxt 061b7b88ec 匿评开启时可以关闭匿评 2015-11-05 15:01:07 +08:00
cxt 144320559d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-05 14:47:40 +08:00
cxt 1b988a0a7f 作品提交完成后弹出作品信息对话框 2015-11-05 14:47:29 +08:00
Tim 060c40fa24 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-05 14:45:42 +08:00
Tim 223b17d8fe 普通作品列表、系统评分作品列表、匿评作品列表格式修改 2015-11-05 14:45:22 +08:00
lizanle 84caed0490 Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-05 13:49:37 +08:00
lizanle 59e95b08d7 feed_back 2015-11-05 13:49:27 +08:00
cxt 48cef54b9e 学生查看作品列表时默认展开学生的作品信息 2015-11-05 10:40:24 +08:00
cxt 35c60c3253 作品列表的作品信息样式调整 2015-11-05 09:37:56 +08:00
cxt c6f365c1ac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-05 09:00:22 +08:00
huang 7e5585bdd2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 16:41:18 +08:00
huang 0bcb4007ce Merge branch 'gitlab_guange' into szzh 2015-11-04 16:41:02 +08:00
lizanle 6ae28a1bef Merge branch 'szzh' into dev_zanle 2015-11-04 16:29:42 +08:00
huang 496aeb4456 添加“新版本库” 2015-11-04 16:23:08 +08:00
huang 58b7250d39 同步项目
修改同步参数问题
2015-11-04 16:19:25 +08:00
Tim 4a39eac585 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 15:49:16 +08:00
Tim 3928b2dcaf 意见反馈图片修改 2015-11-04 15:48:57 +08:00
cxt 1133b35169 作业tag的调整 作业截止时间精确到分 2015-11-04 15:24:24 +08:00
huang e2435dff4b Merge branch 'develop' into gitlab_guange 2015-11-04 14:51:36 +08:00
huang a996e658a9 单个版本库自动同步任务 2015-11-04 14:50:39 +08:00
cxt c9778353c4 作品列表的截止时间具体到分 2015-11-04 11:31:46 +08:00
cxt 958532bedc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 11:16:25 +08:00
cxt e06f08aa3b 作业状态的更改 2015-11-04 11:16:11 +08:00
lizanle de0ca8d3d8 课程相关的ke 内容提交bug 2015-11-04 11:03:45 +08:00
cxt ee7b21de72 禁用匿评功能 2015-11-04 10:54:09 +08:00
cxt c8eb0a076f 编辑作业时点击取消和发送按钮后的页面跳转 2015-11-04 10:45:02 +08:00
lizanle ea6c4b09fe 论坛编辑帖 的bug 2015-11-04 10:24:07 +08:00
lizanle 04ba73fb7a 论坛发帖 的bug 2015-11-04 10:19:27 +08:00
lizanle 43d9c5636a 课程发布通知的在ie11下的bug 2015-11-04 10:13:25 +08:00
lizanle e9a0334ab1 Merge branch 'szzh' into dev_zanle 2015-11-03 17:41:25 +08:00
lizanle 4ffafff7c4 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/services/courses_service.rb
2015-11-03 17:34:59 +08:00
huang d3cbcb38bd Merge branch 'szzh' into develop 2015-11-03 17:25:06 +08:00
huang fa3ff4d067 Merge branch 'szzh' into gitlab_guange 2015-11-03 17:20:56 +08:00
huang 98ee22a3b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-03 17:19:47 +08:00
huang 6e7950983b 1、数据任务迁移
2、添加commits总数统计
2015-11-03 17:19:19 +08:00
lizanle 42ae539ffa 答疑群 描述更改 2015-11-03 15:51:11 +08:00
lizanle 8d25b5676c tag_name名称长度扩大至120个字符 2015-11-03 14:56:32 +08:00
lizanle f1092d5072 去掉上传文件的时候文件名后的 可选的描述 2015-11-03 14:33:59 +08:00
lizanle 8ffbe8f300 course manager can not apply to join that course 2015-11-03 11:42:33 +08:00
lizanle d4218fc81b new_feedback 2015-11-03 11:33:42 +08:00
lizanle 4d1800e690 new_feedback 2015-11-03 11:31:27 +08:00
lizanle 4342c510a7 new_feedback 2015-11-03 11:31:09 +08:00
lizanle 3d87f65021 new_feedback 2015-11-03 11:27:43 +08:00
lizanle b84628af9d regist_btn color 2015-11-03 11:23:56 +08:00
lizanle 6f002613d0 答疑框 2015-11-03 10:55:35 +08:00
huang a4209bc9f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-03 10:52:49 +08:00
huang 7f3d44ce63 代码优化:gitlab和trustie分离 2015-11-03 10:52:32 +08:00