Commit Graph

39 Commits

Author SHA1 Message Date
huang cfd2161756 改动sleep时间 2017-02-28 21:11:14 +08:00
huang 7804ea69bd 项目动态ajax刷新 2017-02-28 20:50:40 +08:00
huang be1b507354 ajax刷新 2017-02-28 17:22:00 +08:00
daiao 2aabaca9b6 实训项目序号只能输入数字或复制数字 2017-02-24 20:14:20 +08:00
huang bd0bd02084 权限控制 2017-02-24 15:33:15 +08:00
huang 38e6b098c3 回复为0不显示 2017-02-24 10:01:08 +08:00
huang bd2d0d3869 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
	app/views/training_tasks/_content_list.html.erb
2017-02-24 09:58:52 +08:00
daiao 9e7ce0fd6a 实训任务样式调整 2017-02-24 09:41:15 +08:00
huang 7074cbdba6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:24:12 +08:00
huang 019ce762f8 针对实训子项目,一些权限修改 2017-02-23 17:23:52 +08:00
Linda 2fb75fdb4d Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:14:32 +08:00
Linda b369b9c281 实训任务标题样式修改 2017-02-23 17:13:56 +08:00
daiao f817aef5d2 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:13:16 +08:00
daiao 1e56a69eed 动态消息的实训动态添加回复/二级回复功能 2017-02-23 16:12:29 +08:00
Linda 95f06e50ff 实训任务动态标题样式修改 2017-02-23 16:01:23 +08:00
huang 6bd160d642 样式问题 2017-02-23 15:46:07 +08:00
huang 0e48262407 动态中提交评测ajax局部刷新 2017-02-23 15:27:10 +08:00
huang 727a6fd536 实训项目一些封装 2017-02-23 14:13:25 +08:00
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00
huang ac77c26c50 task写入项目动态中 2017-02-23 09:47:15 +08:00
huang b08a8e8050 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-22 15:52:05 +08:00
huang eeba0c362d 实训项目一些ajax控制 2017-02-22 15:49:37 +08:00
daiao 807129aeff 项目实训任务二级回复样式调整 2017-02-22 10:55:24 +08:00
daiao 06306e0214 实训项目叠层回复功能 2017-02-22 10:08:05 +08:00
huang 96aa9b7261 实训项目一些调整,api和结构 2017-02-22 08:54:38 +08:00
daiao 4a925201eb 实训任务增加二级回复功能 2017-02-21 17:23:44 +08:00
daiao 43c990c0a9 二级回复功能(回复未刷新) 2017-02-21 16:24:30 +08:00
daiao 818d7ad2ef Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:38:32 +08:00
daiao 544432adce 实训任务详情页面的一级回复功能 2017-02-21 14:38:05 +08:00
huang f7e59c782c Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:34:40 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
daiao e4b582fbb7 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-20 15:19:44 +08:00
daiao aacac21110 实训任务详情页面 2017-02-20 15:19:24 +08:00
huang d21350b754 tpi先建任务权限判断 2017-02-20 14:39:39 +08:00
daiao 8039f89d92 实训项目的列表页面 2017-02-20 14:08:48 +08:00
daiao 2aa025cf32 实训项目新建页面样式调整 2017-02-19 15:17:46 +08:00
daiao 77f58d76a5 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
# Conflicts:
#	db/schema.rb
2017-02-19 09:21:55 +08:00
huang a43c5cdb2f 启动实训Api等 2017-02-18 17:44:50 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00