 daiao
|
397e59e5d1
|
html实训
|
2017-08-04 09:38:10 +08:00 |
|
daiao
|
7bed48e3d9
|
关注和粉丝页面
|
2017-08-02 16:34:57 +08:00 |
|
daiao
|
bf472f1303
|
关注和粉丝页面
|
2017-08-02 15:38:39 +08:00 |
|
daiao
|
9991c1244a
|
用户关注与粉丝列表
|
2017-08-02 14:24:37 +08:00 |
|
daiao
|
7a889642c4
|
个人主页关注与粉丝页面
|
2017-08-02 10:54:39 +08:00 |
|
daiao
|
6e1e199079
|
实训TPM“编程任务”改为“实践任务”
|
2017-07-31 13:54:10 +08:00 |
|
daiao
|
50877bb2c7
|
测试
|
2017-07-28 20:36:02 +08:00 |
|
daiao
|
c26f3ed61a
|
多选题
|
2017-07-28 20:13:25 +08:00 |
|
daiao
|
dbd3ed3f18
|
更新经验值和金币值
|
2017-07-28 20:01:34 +08:00 |
 huang
|
33a6b154e6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 17:10:14 +08:00 |
|
huang
|
d8bd851597
|
Merge branch 'dev_xucheng' into develop
|
2017-07-28 17:09:36 +08:00 |
 cxt
|
8f995d7b46
|
Merge branch 'dev_cxt' into develop
|
2017-07-28 17:00:27 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
|
daiao
|
643fc6ce6b
|
预备知识更新数据
|
2017-07-28 16:27:10 +08:00 |
|
daiao
|
1280d9a332
|
编程题编辑报错
|
2017-07-28 15:38:58 +08:00 |
 XuCheng642
|
67dd627a2d
|
超级管理员清除功能
|
2017-07-28 15:27:34 +08:00 |
|
daiao
|
6b0abd4703
|
tpi单选多选题
|
2017-07-28 10:40:37 +08:00 |
|
daiao
|
9b4478d629
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-27 14:45:34 +08:00 |
|
daiao
|
2a7111c800
|
单选多选题
|
2017-07-27 14:44:27 +08:00 |
|
daiao
|
12dea63148
|
实训TPM参考答案
|
2017-07-27 14:30:26 +08:00 |
|
huang
|
3834a26b6e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-27 12:32:35 +08:00 |
|
huang
|
2a2386915b
|
webssh添加语言接口
|
2017-07-27 12:32:22 +08:00 |
|
cxt
|
115feb98b2
|
Merge branch 'develop' into dev_cxt
|
2017-07-27 11:09:40 +08:00 |
|
cxt
|
33c19ff949
|
Merge branch 'dev_xucheng' into develop
|
2017-07-27 10:55:33 +08:00 |
|
XuCheng642
|
a348d23889
|
超级管理员的实训课程列表bug修复
|
2017-07-27 10:32:55 +08:00 |
|
daiao
|
2064dfb502
|
Merge branch 'develop' into dev_daiao
|
2017-07-27 10:27:36 +08:00 |
|
daiao
|
6ce887424b
|
tpm增加预备知识
|
2017-07-27 10:07:58 +08:00 |
|
cxt
|
e9e4b7177e
|
Merge branch 'dev_xucheng' into develop
Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/managements/_shixun_authorization_list.html.erb
|
2017-07-27 09:49:02 +08:00 |
|
XuCheng642
|
0621ceb861
|
超级管理员页面修改
|
2017-07-27 09:45:31 +08:00 |
|
cxt
|
a170bdf3f1
|
Merge branch 'develop' into dev_cxt
|
2017-07-27 09:00:36 +08:00 |
|
cxt
|
4a0d8ab856
|
实训套件的编辑
|
2017-07-26 19:05:46 +08:00 |
|
cxt
|
a48483ef69
|
实训套件的编辑页面
|
2017-07-26 18:57:08 +08:00 |
|
daiao
|
6d4be8bbd9
|
Merge branch 'dev_cs' into dev_daiao
Conflicts:
app/views/challenges/_content_list.html.erb
app/views/challenges/_edit_task_pass.html.erb
app/views/challenges/_task_pass_form.html.erb
|
2017-07-26 18:54:13 +08:00 |
|
daiao
|
0bf70f145e
|
单选多选题的编辑/新建页面
|
2017-07-26 18:50:52 +08:00 |
|
cxt
|
79dca41031
|
班级讨论区
|
2017-07-26 16:28:34 +08:00 |
|
cxt
|
182dc3f421
|
实训申请发布
|
2017-07-26 15:15:47 +08:00 |
|
cxt
|
faff4c1960
|
Merge branch 'dev_cxt' into dev_cs
|
2017-07-26 14:43:19 +08:00 |
|
cxt
|
f1087cb441
|
实训套件模块的改版
|
2017-07-26 14:42:20 +08:00 |
|
daiao
|
607ab2c767
|
添加日志
|
2017-07-25 16:55:52 +08:00 |
|
cxt
|
160e1514ca
|
实训套件新建流程和查看页面布局变更：Step1-增加新建独立页
|
2017-07-25 15:41:36 +08:00 |
|
daiao
|
010ebf29a2
|
实训套件创建数据不对
|
2017-07-24 17:19:25 +08:00 |
|
cxt
|
a8169c4353
|
首页班级数据分页不对
|
2017-07-24 16:54:18 +08:00 |
 caishi
|
6f84d188c6
|
Merge branch 'dev_cs' into develop
|
2017-07-24 16:43:53 +08:00 |
|
daiao
|
a199927172
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-24 16:42:59 +08:00 |
|
daiao
|
8b225ae48c
|
个人主页优化
|
2017-07-24 16:42:46 +08:00 |
|
cxt
|
36626155c6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-24 16:38:58 +08:00 |
|
caishi
|
8908f1279d
|
修复上线问题
|
2017-07-24 16:15:28 +08:00 |
|
cxt
|
4feb3586a7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/subjects_controller.rb
|
2017-07-24 15:09:07 +08:00 |
|
caishi
|
85ad576cfc
|
Merge branch 'dev_daiao' into dev_cs
|
2017-07-24 14:58:34 +08:00 |
|
cxt
|
26f68e019b
|
实训套件首页显示的数据应该包括只创建了套件但是没有添加阶段的数据
|
2017-07-24 14:58:27 +08:00 |