Commit Graph

12349 Commits

Author SHA1 Message Date
guange 28035dfc47 子域名处理 2016-02-02 12:40:00 +08:00
guange f3a0e71cee issue中回复at列表不正常 2016-02-02 11:38:04 +08:00
guange d6e248805f changeset_num nil问题 2016-02-02 11:37:48 +08:00
Tim 105393548b 点击详情页面文本格式调整 2016-02-02 11:23:17 +08:00
Tim 619144224e 文本框格式问题 2016-02-02 10:08:04 +08:00
ouyangxuhua cdd997e45e kindeditor回复框修改 2016-02-01 14:50:45 +08:00
cxt 4d048ec596 课程推荐的课程列表中,为0的不显示 2016-02-01 11:12:04 +08:00
Tim d092891b2a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-01 10:41:30 +08:00
Tim 83a3c879d4 私信配置按钮显示 2016-02-01 10:40:42 +08:00
ouyangxuhua 25e32f09e1 Merge branch 'develop' into ouyang
Conflicts:
	app/views/words/create_reply.js.erb
2016-02-01 10:14:04 +08:00
cxt 8b9bcb4719 导入题库的搜索不起作用 2016-02-01 10:04:07 +08:00
cxt b6dc7ac4cb Merge branch 'develop' into cxt_course 2016-02-01 09:51:01 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
guange 724ff31751 Merge remote-tracking branch 'origin/szzh' into szzh 2016-01-29 21:16:27 +08:00
guange eb9232a087 at controller 的json应该登录 2016-01-29 21:15:23 +08:00
guange 63596c2ca5 留言应该为JournalsForMessage 2016-01-29 21:14:44 +08:00
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启 2016-01-29 20:31:25 +08:00
ouyangxuhua 7bdec9c182 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 20:05:24 +08:00
ouyangxuhua 50bac16d7c 组织子域名申请信息提示 2016-01-29 20:05:04 +08:00
cxt ee73191a19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 19:44:04 +08:00
cxt 49369bf109 Merge branch 'szzh' into develop 2016-01-29 19:43:56 +08:00
cxt e17a72bf57 Merge branch 'cxt_course' into szzh 2016-01-29 19:43:18 +08:00
cxt 1b5cdbe628 推荐的私有课程,点击“资源”返回403,点击“作业”也应该返回403 2016-01-29 19:41:47 +08:00
cxt 82fb50ccd2 课程学生列表的作业积分不一致 2016-01-29 19:22:10 +08:00
ouyangxuhua 45bf2ef88a Merge branch 'develop' into dev_hjq 2016-01-29 19:00:15 +08:00
ouyangxuhua 7b56dc7f8e 管理员界面,解决编辑组织报错的问题 2016-01-29 18:43:14 +08:00
cxt e8bed9c4e1 Merge branch 'develop' into cxt_course 2016-01-29 18:20:58 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
ouyangxuhua b7f1177938 1.解决组织动态中删除发送过来的帖子报404的问题;2.组织消息的状态能更新 2016-01-29 18:11:16 +08:00
ouyangxuhua 125f00689b 把组织未读消息加入铃铛消息提醒中 2016-01-29 17:49:20 +08:00
ouyangxuhua 68bd109831 对子域名申请,增加是否批准的提示 2016-01-29 17:26:28 +08:00
cxt 8358140c87 问题跟踪目标版本字体修改 2016-01-29 17:02:25 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
Tim 55fddbcabe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 16:52:14 +08:00
Tim fa70e8a714 代码错误 2016-01-29 16:51:46 +08:00
Tim 82e4fe1610 自动生成系统文件 2016-01-29 16:33:33 +08:00
ouyangxuhua 3aaa078a4b 组织动态添加项目动态 2016-01-29 16:26:00 +08:00
Tim 674a8e0035 单词折行问题 2016-01-29 16:16:02 +08:00
cxt d58d8f6fb4 Merge branch 'szzh' into develop 2016-01-29 15:46:54 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
	db/schema.rb
2016-01-29 15:44:26 +08:00
cxt 6b40b90ba4 Merge branch 'cxt_course' into szzh 2016-01-29 15:43:22 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
cxt e9a7f6f826 导出学生作业成绩列表 2016-01-29 11:02:57 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度;2.https://www.trustie.net/manual/feedback链接到帮助中心;3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
cxt a613b58b46 编程作业弹框的高度设置 2016-01-28 11:08:16 +08:00
ouyangxuhua c857fb734b 快捷回复中,设置回复框的高度和宽度 2016-01-28 10:16:45 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00