Commit Graph

12299 Commits

Author SHA1 Message Date
ouyangxuhua 1216f49ac2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	app/views/org_document_comments/edit.html.erb
2016-02-20 16:59:58 +08:00
huang 3fda270a66 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
2016-02-20 16:58:20 +08:00
huang 1c5e09196d Merge branch 'develop' into szzh 2016-02-20 16:51:00 +08:00
ouyangxuhua a4ca676ccb Merge branch 'szzh' into ouyangxuhua
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
2016-02-20 16:49:19 +08:00
huang 75214f0211 新课导语修改:导语的时候显示trustie信息 2016-02-20 16:45:45 +08:00
huang 212b37ef84 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 16:19:53 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
cxt 8138da71aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 16:18:37 +08:00
cxt e04e80d64d 跨越多个学期的课程学期的显示 2016-02-20 16:18:28 +08:00
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度;2.组织页面右上角链接修改 2016-02-20 15:18:24 +08:00
ouyangxuhua fa08935f68 Merge branch 'develop' into ouyangxuhua
Conflicts:
	app/views/projects/settings/_new_repositories.html.erb
2016-02-20 11:13:38 +08:00
ouyangxuhua 72c0173256 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 11:06:37 +08:00
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后,编辑时不能增加附件“的问题 2016-02-20 11:06:21 +08:00
huang 534d93de77 弹框位置调整 2016-02-20 10:59:49 +08:00
cxt 7f32b9fb40 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 10:51:33 +08:00
cxt 1e13279440 学生查看问卷调查结果 2016-02-20 10:51:26 +08:00
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果” 2016-02-20 10:50:46 +08:00
huang aa22a253ba “发送至”弹框飘动问题 2016-02-20 09:45:37 +08:00
huang 1c4e3545c7 资源弹框剧中 2016-02-19 14:16:26 +08:00
huang db1bffd7db 资源弹空白框问题 2016-02-19 13:23:32 +08:00
guange ac121ce585 组织文章无法编辑问题 2016-02-18 15:26:07 +08:00
guange a421e8c6fa 组织文章无法编辑问题 2016-02-18 14:29:46 +08:00
guange c7bfe8f20f 组织首页异常 2016-02-06 12:04:43 +08:00
guange 2cf253a26b 复制课程图片出错 2016-02-04 17:30:49 +08:00
guange b2551f904b 组织没有显示的问题 2016-02-04 12:51:23 +08:00
guange 10eeeaa95c 弹出框居中 2016-02-03 23:30:07 +08:00
cxt 8b5896ae1c 弹框的拖动 2016-02-03 13:32:05 +08:00
cxt 89599d8679 编辑组织帖子 2016-02-03 13:04:48 +08:00
cxt 2cc24e2d4b 组织帖子的新建 2016-02-03 12:57:30 +08:00
ouyangxuhua 02f8007557 修改组织配置的样式;修改一个bug 2016-02-03 12:42:42 +08:00
cxt edbc19ceed Merge branch 'szzh' into develop 2016-02-03 12:18:13 +08:00
cxt 0a0d67642a 导入作业 2016-02-03 12:17:45 +08:00
cxt 43ac6b7e1f Merge branch 'develop' into szzh 2016-02-03 09:29:39 +08:00
cxt cc7d75a046 Merge branch 'szzh' into develop 2016-02-03 09:28:24 +08:00
guange 1f7bcbed20 处理导入题库标题中的换行字符 2016-02-02 21:28:52 +08:00
guange eb3644a197 将一堆的rake命令变为一条 2016-02-02 19:16:15 +08:00
guange eefb4c86d1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 18:48:11 +08:00
guange 7f8f3fa152 被rubymine坑了,这两个文件没加进去 2016-02-02 18:47:53 +08:00
cxt 4dd1c23c81 Merge branch 'szzh' into develop 2016-02-02 18:13:15 +08:00
guange eed6250145 secdomain问题 2016-02-02 17:36:11 +08:00
cxt b761505669 Merge branch 'szzh' into develop 2016-02-02 17:18:28 +08:00
guange 3897f9aea2 Merge remote-tracking branch 'origin/szzh' into szzh 2016-02-02 16:33:17 +08:00
guange 609d98f8a3 执行task时没有代入环境变量 2016-02-02 16:33:08 +08:00
guange ed2a3c976d 执行task时没有代入环境变量 2016-02-02 16:25:26 +08:00
cxt cb2fdc7388 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/words/create_reply.js.erb
2016-02-02 15:57:23 +08:00
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/users/user_import_homeworks.js.erb
	db/schema.rb
2016-02-02 15:55:07 +08:00
cxt 15c828197f Merge branch 'szzh' into develop 2016-02-02 15:53:30 +08:00
ouyangxuhua 0b5aa4b81e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-02 15:53:14 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
cxt d49a4569b1 Merge branch 'cxt_course' into szzh 2016-02-02 15:51:34 +08:00