Commit Graph

11314 Commits

Author SHA1 Message Date
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
lizanle c5f903146d 博客资源下载问题 2015-12-14 11:19:43 +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
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 a791c39b4b Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:12:25 +08:00
cxt dfd0c95f2a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:11:48 +08:00
huang 616679e9c1 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:07:57 +08:00
huang 6c451c3561 Merge branch 'develop' into szzh 2015-12-11 18:07:48 +08:00
cxt 42f0fc62e9 分组成员不能修改作品 2015-12-11 18:07:30 +08:00
cxt 1d2b6165ef 分组作业报500 2015-12-11 18:00:55 +08:00
huang 6b9a612594 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-11 17:58:37 +08:00
huang 0ac4821f14 修改密码导航栏错误 2015-12-11 17:56:26 +08:00
lizanle df1d1a4685 论坛上传资源没有保存成功 2015-12-11 17:54:07 +08:00
cxt 1674391e4b 若删除追加的附件,则“追加附件”字样及“追加时间”也应删除 2015-12-11 17:39:34 +08:00
ouyangxuhua c2d21b5a6b 隐藏组织栏目资源列表 2015-12-11 17:11:11 +08:00
cxt e5192c7b1a 记录学生作品的提交和编辑记录 2015-12-11 17:02:34 +08:00
ouyangxuhua de0b5d1897 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-11 16:58:19 +08:00
ouyangxuhua be590497b9 组织文章设为首页后,跳转至首页 2015-12-11 16:58:00 +08:00
cxt 6c9a139450 编辑分组作业的作品报500 2015-12-11 16:36:19 +08:00
cxt ac77f0d40a 点击学号、班级也要弹出答题详情页面 2015-12-11 16:35:43 +08:00
ouyangxuhua e98338bf22 栏目增加资源类型,可以添加文件、删除文件、显示文件等 2015-12-11 16:30:50 +08:00
cxt d4bde8e73c 调整学生作品列表的样式 2015-12-11 16:05:18 +08:00
lizanle b178fb7f0a 消息提醒 病句 2015-12-11 15:56:37 +08:00
lizanle d1423ebc7e ke高度小修改。 2015-12-11 15:41:41 +08:00
huang b981f3dcea 修复项目删除403问题
课程回复的时候不显示删除按钮
2015-12-11 15:39:38 +08:00
lizanle abc0598ed2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-11 15:37:14 +08:00
lizanle 03318aac97 登录名不可修改要变成灰色 2015-12-11 15:36:59 +08:00
cxt c6470bc69b 提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择 2015-12-11 15:31:15 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt c27a2a541b Merge branch 'cxt_course' into szzh 2015-12-11 14:59:00 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
lizanle ec79ed04ee Merge branch 'szzh' into dev_zanle 2015-12-11 14:47:32 +08:00
lizanle b6607f7418 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:46:48 +08:00
huang f2b8335912 移出成员时,删除项目后没有关联删除而引起的400问题 2015-12-11 13:48:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang 75fecc0402 项目删除功能
项目删除权限
课程列表用户颜色
2015-12-11 12:53:01 +08:00
huang 9c472b9358 课程成员列表乱的问题 2015-12-11 11:23:02 +08:00
huang 35c918cb40 Merge branch 'hjq_new_course' into develop 2015-12-11 11:02:09 +08:00
huang fbd1b2f541 用户留言重复提交问题 2015-12-11 10:53:14 +08:00
huang 01b21ceda1 项目留言重复提交问题 2015-12-11 09:52:17 +08:00
huang 1ba0dae3c4 修复课程留言重复提交问题 2015-12-11 09:42:19 +08:00
cxt ba5d72b315 管理员查看在线测验的权限 2015-12-11 09:18:12 +08:00
huang 670df76c70 注释掉项目邀请加入功能 2015-12-10 20:24:42 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang c7b2c9e3af 课程删除功能
admin中课程列表取消删除按钮
2015-12-10 18:59:54 +08:00
huang a9510f4869 Merge branch 'dev_hjq' into develop 2015-12-10 17:29:52 +08:00