 huang
|
6e96f6e9ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 13:52:18 +08:00 |
|
huang
|
2e09695d79
|
Merge branch 'dev_raining' into develop
|
2017-02-24 13:50:39 +08:00 |
|
huang
|
d76e34889a
|
task不重复执行
|
2017-02-24 13:42:58 +08:00 |
|
huang
|
30c14c2e07
|
任务启动回调逻辑控制
|
2017-02-24 12:30:36 +08:00 |
 cxt
|
cee2569796
|
作业定时发布的任务调整
|
2017-02-24 11:05:27 +08:00 |
|
cxt
|
0e40bf6daf
|
题库改版
|
2017-02-24 10:32:48 +08:00 |
|
huang
|
6e9ef8ee12
|
Merge branch 'develop' into dev_raining
Conflicts:
app/controllers/repositories_controller.rb
app/views/layouts/_base_project_top.html.erb
|
2017-02-24 10:26:22 +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
|
c76db2cb24
|
项目问题动态回复功能修复
|
2017-02-24 09:56:58 +08:00 |
|
daiao
|
9e7ce0fd6a
|
实训任务样式调整
|
2017-02-24 09:41:15 +08:00 |
|
huang
|
658023cbe0
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 09:04:07 +08:00 |
|
daiao
|
4885ec5afb
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 17:26:35 +08:00 |
|
daiao
|
9697a9b5c1
|
实训项目展开/收起回复加载KE
|
2017-02-23 17:26:22 +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
|
75f1fc964a
|
实训任务项目动态展开更多与收起回复功能
|
2017-02-23 17:09:22 +08:00 |
|
huang
|
705f94428e
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 16:18:16 +08:00 |
|
huang
|
49f63992d8
|
任务开启的时候权限控制
|
2017-02-23 16:17:37 +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
|
6f06fde7dc
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 14:13:47 +08:00 |
|
huang
|
727a6fd536
|
实训项目一些封装
|
2017-02-23 14:13:25 +08:00 |
|
daiao
|
31d852cd60
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 13:40:07 +08:00 |
|
daiao
|
6d14cb131a
|
问吧右下角贴吧排序按照帖子发布数和回帖数之和排序
|
2017-02-23 13:39:44 +08:00 |
|
huang
|
384ae2764a
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 10:45:50 +08:00 |
|
huang
|
9a3793ffa9
|
完成training_task 编辑功能
|
2017-02-23 10:45:28 +08:00 |
|
daiao
|
b36c249a6b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 10:29:21 +08:00 |
|
Linda
|
e1be2fda81
|
实训任务提交测评显示状态增加样式
|
2017-02-23 10:25:55 +08:00 |
|
daiao
|
7e04e67a5b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 10:10:59 +08:00 |
|
daiao
|
8bd9fc81d6
|
账号未激活提示页提交留言机制修改（从发送到管理员留言改到贴吧）
|
2017-02-23 10:09:56 +08:00 |
|
huang
|
04edefac8b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 09:47:39 +08:00 |
|
huang
|
ac77c26c50
|
task写入项目动态中
|
2017-02-23 09:47:15 +08:00 |
|
daiao
|
8d51e896fa
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 09:32:36 +08:00 |
|
daiao
|
fa7b15db47
|
注册成功提示页与账号未激活提示页，增加‘更换邮箱的功能’
|
2017-02-23 09:32:13 +08:00 |
|
huang
|
006608dca8
|
修改参数名
|
2017-02-22 16:30:16 +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 |
|
huang
|
3f105cefe7
|
版本库访问权限控制清理
|
2017-02-22 12:33:45 +08:00 |
|
cxt
|
da4aaca1ea
|
消息首页报500
|
2017-02-22 12:26:56 +08:00 |
|
daiao
|
807129aeff
|
项目实训任务二级回复样式调整
|
2017-02-22 10:55:24 +08:00 |
|
黄井泉
|
7f7491c670
|
Merge branch 'develop' into 'develop'
部分项目切换分支500问题
See merge request !154
|
2017-02-22 10:46:42 +08:00 |
|
cxt
|
f41341a3d4
|
班级成员列表报500
|
2017-02-22 10:35:33 +08:00 |
|
huang
|
0629b31e53
|
解决部分项目（比如：594）切换版本库分支500问题
|
2017-02-22 10:14:04 +08:00 |
|
daiao
|
06306e0214
|
实训项目叠层回复功能
|
2017-02-22 10:08:05 +08:00 |