Commit Graph

17008 Commits

Author SHA1 Message Date
cxt f332f2a469 组织文章的回复作分页 2016-10-08 17:50:06 +08:00
Tim f1e7e54816 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 17:38:57 +08:00
Tim e675050b21 Merge branch 'rep_quality' into develop 2016-10-08 17:38:43 +08:00
Tim 1db5064486 新的合并请求样式调整 2016-10-08 17:37:41 +08:00
huang 4a666d6972 Merge branch 'rep_quality' into develop 2016-10-08 17:27:30 +08:00
huang f3f59c727c 提示语 2016-10-08 17:21:30 +08:00
Tim 6e93b0dc0d 项目去掉右侧白色块后,样式调整 2016-10-08 17:08:07 +08:00
cxt 4aca50e62d 超级管理员可以给课程添加教师 2016-10-08 16:46:59 +08:00
cxt 277c1468dd 班级设置报500 2016-10-08 16:41:06 +08:00
cxt f7e5a41f5e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 16:22:47 +08:00
cxt ed05880653 https的链接转换 2016-10-08 16:22:37 +08:00
huang b22d3c9882 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 16:04:55 +08:00
huang 30e6bd6d0e 超级管理员看他人的项目列表500问题 2016-10-08 16:04:35 +08:00
cxt 9d65d61f2a 教师团队中只有一个教师时不应有上移功能 2016-10-08 15:56:43 +08:00
Tim 053e66c464 分组作业宽度调整 2016-10-08 15:37:55 +08:00
Tim b4036ba901 分组作业宽度调整 2016-10-08 15:28:09 +08:00
cxt 436fb3e96e 班级的作业列表分页换成新样式 2016-10-08 15:26:47 +08:00
Tim 6bb2501ca0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 15:08:22 +08:00
Tim 9ed58acc79 分组作业样式调整 2016-10-08 15:08:07 +08:00
cxt 937b951220 展开某个作品详情时收起其他作品 2016-10-08 15:04:01 +08:00
cxt 6ef45a094f Merge branch 'cxt_course' into develop 2016-10-08 14:24:47 +08:00
cxt 1fa07b97e3 新建班级时的课程下拉列表应包含所在课程教师团队的课程 2016-10-08 14:03:37 +08:00
cxt 7f3bb0be63 教师团队中上移、下移功能的完善 2016-10-08 13:54:35 +08:00
cxt 9e2c381b4a 取消班级设置页面的课程编辑 2016-10-08 11:22:37 +08:00
huang b235b461a9 Merge branch 'develop' into rep_quality 2016-10-08 10:50:15 +08:00
huang 23d5d57f5c admin“隐藏项目”顶部显示“公共贴吧” 2016-10-08 10:49:50 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-10-08 10:41:05 +08:00
cxt bee9dfa1b5 课程下的班级列表图片丢失 2016-10-08 10:38:12 +08:00
huang d29fb00c30 解决用户首页项目列表500问题 2016-10-08 10:29:01 +08:00
cxt 843aacc143 课程大纲自动识别URL 2016-10-08 10:25:19 +08:00
cxt 3b8dded2bc 新建课程的教师团队为空 2016-10-08 10:21:33 +08:00
cxt b805fdc666 Merge branch 'develop' into cxt_course 2016-10-08 08:50:06 +08:00
cxt ceb0913568 学生列表报500 2016-09-30 18:35:08 +08:00
cxt 87050a2adf 挂起的作业报500 2016-09-30 17:49:01 +08:00
cxt ec0d21b243 戴傲项目相关 2016-09-30 17:27:30 +08:00
cxt e5204112d0 教师列表报500 2016-09-30 17:19:57 +08:00
cxt 1cf3c2cd48 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-30 17:12:47 +08:00
cxt b5782bae39 班级左侧导航的“分班” 2016-09-30 17:12:40 +08:00
Tim 918f741db0 总得分tip鼠标放在整行均显示 2016-09-30 17:09:57 +08:00
cxt bcd76d2b9f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-30 17:04:25 +08:00
cxt 23f1c3175c 学生列表的导出 2016-09-30 17:04:19 +08:00
Tim 7d3847656b 分班名称过长折行显示问题;分班编辑按钮定位;分班icon css 2016-09-30 17:01:55 +08:00
cxt db9d4900ac Merge branch 'cxt_course' into develop 2016-09-30 16:48:05 +08:00
cxt 86e40dbdd8 总得分的提示为空的显示为0 2016-09-30 16:46:46 +08:00
cxt f1b9a98084 编辑作业报500 2016-09-30 16:32:12 +08:00
cxt b25e4ed5d7 新闻、通知的回复分页 2016-09-30 16:09:10 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt a63f58de5b 动态代码的优化 2016-09-30 14:48:42 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
cxt 7b51812ebb 头像处添加“我的课程”快捷入口 2016-09-30 13:20:35 +08:00