 huang
|
62862ffa3b
|
Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao
Conflicts:
app/views/challenges/edit.html.erb
|
2017-09-26 10:02:15 +08:00 |
 daiao
|
d24b6fdb6d
|
实训tpm的预备知识点击无效
|
2017-09-20 09:47:36 +08:00 |
 miss
|
c51832e2bd
|
tip样式的调整
|
2017-09-15 20:23:49 +08:00 |
|
daiao
|
ec22bbe0c1
|
Merge branch 'develop' into dev_daiao
Conflicts:
app/controllers/games_controller.rb
app/views/challenges/edit.html.erb
app/views/games/_game_show.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-15 09:10:36 +08:00 |
|
daiao
|
a67f4ca0f7
|
实训单选多选题TPM优化
|
2017-09-14 19:41:30 +08:00 |
|
miss
|
0ba7685bf3
|
issue修改
|
2017-09-08 17:41:05 +08:00 |
|
miss
|
3a874f6cf1
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-08 15:53:21 +08:00 |
|
miss
|
5fffcfdc3d
|
实训tpi页面代码过多时拖拽卡顿。
TPM提示语的修改
我的主页中粉丝板块边框和内容的处理
实训TPM配置页的tab修改
实训TPM各个板块间的距离修改。
班级所有页面背景色的修改及各个板块阴影的增加
实训路径中已发布实训的提示语的修改。
|
2017-09-08 15:52:50 +08:00 |
|
huang
|
382e5758a0
|
实训每一关卡添加背景知识
|
2017-09-07 16:14:44 +08:00 |
|
huang
|
9a4741298f
|
实训单个关卡添加背景知识
|
2017-09-07 16:11:12 +08:00 |
|
daiao
|
9c36affeec
|
单选多选题
|
2017-09-06 14:42:31 +08:00 |
|
miss
|
6e4b1c22c0
|
实训阶段详情实训tab没选中，新建帖子页面的阴影，实训路径的左侧导航
|
2017-09-06 10:54:25 +08:00 |
|
daiao
|
95b5c2ce0c
|
实训单选多选题
|
2017-09-05 16:46:51 +08:00 |
|
daiao
|
5fc623f60b
|
单选多选题
|
2017-09-05 14:32:16 +08:00 |
 caishi
|
73395c2481
|
选择题
|
2017-09-05 09:05:51 +08:00 |
|
daiao
|
a266a2a390
|
单选多选题
|
2017-09-04 15:12:51 +08:00 |
|
daiao
|
c0ce6dcd78
|
Merge branch 'dev_cs' into dev_daiao
Conflicts:
app/views/challenges/_content_list.html.erb
app/views/challenges/_task_pass_form.html.erb
app/views/challenges/edit.html.erb
|
2017-09-04 15:00:31 +08:00 |
|
daiao
|
55e76fa35b
|
单选题，多选题
|
2017-09-04 14:57:34 +08:00 |
|
caishi
|
1fef87f098
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/challenges/_content_list.html.erb
app/views/challenges/edit.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-04 14:42:44 +08:00 |
|
miss
|
d59e7b7cea
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-04 08:59:05 +08:00 |
|
miss
|
e3b6f9f66f
|
小笔样式替换
|
2017-09-04 08:58:28 +08:00 |
|
daiao
|
871f02a40f
|
上线缺陷修复
|
2017-09-03 17:37:29 +08:00 |
|
daiao
|
6ee134b2f3
|
实训技能标签失去焦点保存
|
2017-09-01 13:50:22 +08:00 |
|
caishi
|
abb4dd7214
|
单个关卡支持多个选择题的相关页面和处理变更
|
2017-08-31 09:00:24 +08:00 |
|
caishi
|
1769dc856c
|
"已保存"tip
|
2017-08-28 11:15:33 +08:00 |
|
daiao
|
fc1a7be3fb
|
实训详情增加进入上一关的入口
|
2017-08-08 10:32:36 +08:00 |
|
daiao
|
fa1cad5af3
|
实训的预备知识tab恢复，名称换成“背景知识”
|
2017-08-08 09:39:38 +08:00 |
|
daiao
|
999726b8f8
|
实训任务的“技能勋章”修改为“技能标签”
|
2017-08-08 09:05:40 +08:00 |
|
daiao
|
6e1e199079
|
实训TPM“编程任务”改为“实践任务”
|
2017-07-31 13:54:10 +08:00 |
|
daiao
|
dbd3ed3f18
|
更新经验值和金币值
|
2017-07-28 20:01:34 +08:00 |
|
daiao
|
e48d0c53f4
|
缺陷修复
|
2017-07-28 19:18:11 +08:00 |
|
daiao
|
c5df06266e
|
阶段详情加入任务的ICON
|
2017-07-28 16:35:39 +08:00 |
|
caishi
|
81b74c879a
|
选择题样式问题
|
2017-07-28 16:25:17 +08:00 |
|
daiao
|
6ce887424b
|
tpm增加预备知识
|
2017-07-27 10:07:58 +08:00 |
|
daiao
|
c825ddb18c
|
tpi单选多选题
|
2017-07-26 19:15:22 +08:00 |
|
caishi
|
8908f1279d
|
修复上线问题
|
2017-07-24 16:15:28 +08:00 |
|
caishi
|
3410002b10
|
Merge branch 'dev_huang' into dev_cs
|
2017-07-24 10:53:36 +08:00 |
|
caishi
|
a4dd6fea5a
|
及时隐藏提示信息
|
2017-07-21 20:34:42 +08:00 |
|
caishi
|
462a5b3cd6
|
样式修改以及新建实训阶段部分的修改
|
2017-07-21 19:48:49 +08:00 |
|
caishi
|
13cdda6d92
|
Merge branch 'develop' into dev_cs
|
2017-07-21 17:31:32 +08:00 |
|
caishi
|
baf6b3e1de
|
实训新建阶段tab样式修改
|
2017-07-21 17:09:05 +08:00 |
|
daiao
|
1b55407a87
|
请在阶段详情的右侧增加显示“新建任务”“下一任务”（如果有的话）
|
2017-07-21 16:57:47 +08:00 |
|
huang
|
52d27f1167
|
单选多选题编辑
|
2017-07-21 11:09:17 +08:00 |
|
daiao
|
8f5111c3a0
|
5个tab
|
2017-07-21 09:12:42 +08:00 |
|
daiao
|
c1933b5608
|
项目实训的阶段内容划分5个tab进行编辑
|
2017-07-20 16:25:44 +08:00 |
|
daiao
|
6aa3384504
|
编辑关卡时,显示当前关卡是第几关
|
2017-05-08 15:36:33 +08:00 |
|
huang
|
1fc92c5c88
|
first commit
|
2017-04-07 10:16:13 +08:00 |