 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
|
5eaef1abe3
|
实训选择题
|
2017-09-25 14:16:45 +08:00 |
 caishi
|
ecd081030b
|
成员管理数字跳转
|
2017-09-22 20:42:58 +08:00 |
|
daiao
|
ced586aca9
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 17:29:55 +08:00 |
|
daiao
|
8e9b719b0f
|
实训的每一关要增加开始玩、玩的入口
|
2017-09-22 17:29:25 +08:00 |
|
caishi
|
679b5a559d
|
增加多个选择题tab样式问题
|
2017-09-22 16:31:22 +08:00 |
|
caishi
|
d0c508bb27
|
Merge branch 'develop' into dev_cs
|
2017-09-22 09:15:56 +08:00 |
|
daiao
|
2c411320ce
|
编辑时切换另一个没有保存的选择题，页面内容没有刷新
|
2017-09-22 09:15:30 +08:00 |
|
caishi
|
b4b296d130
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/challenges/_single_or_multiple_question_show.html.erb
|
2017-09-22 08:51:34 +08:00 |
|
daiao
|
ba3bc1a4cd
|
版本库样式调整
|
2017-09-21 17:20:08 +08:00 |
|
caishi
|
ee65fd18fb
|
选择题任务通过后，遮罩弹框信息修改
|
2017-09-20 17:16:11 +08:00 |
|
daiao
|
25abf51158
|
实训版本库的样式与其它页面不一致
|
2017-09-20 17:04:35 +08:00 |
|
daiao
|
e5dc4a904d
|
编辑单选题题干，MD编辑器有点右偏
|
2017-09-20 14:28:20 +08:00 |
|
caishi
|
da6d67eb35
|
动态资源列表、讨论列表调整
|
2017-09-20 14:27:13 +08:00 |
|
daiao
|
a89f462b22
|
实训选择题任务的技能点改成知识点
|
2017-09-20 14:06:25 +08:00 |
|
daiao
|
d24b6fdb6d
|
实训tpm的预备知识点击无效
|
2017-09-20 09:47:36 +08:00 |
|
daiao
|
1e917cf72f
|
实训TPM编辑选择题后保存，题干和参考答案出现样式错误
|
2017-09-20 09:34:01 +08:00 |
|
caishi
|
a09450a805
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/games/_choice_question.html.erb
|
2017-09-19 17:17:40 +08:00 |
|
caishi
|
df60c289ad
|
选择题选项换行、开始实战的加载层
|
2017-09-19 17:15:50 +08:00 |
 miss
|
5ee33d6f8e
|
前端测试集的显示语提示语
|
2017-09-17 15:12:38 +08:00 |
|
daiao
|
39064be34b
|
刷新测试集提示样式修改
|
2017-09-17 11:08:03 +08:00 |
|
huang
|
bfe758be78
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/challenges/_single_or_multiple_question.html.erb
app/views/messages/_common_reply_box.html.erb
app/views/praise_tread/_edu_praise.html.erb
app/views/student_work/_common_reply_box.html.erb
|
2017-09-15 21:13:14 +08:00 |
|
miss
|
5d9ec8bf0c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 20:24:17 +08:00 |
|
miss
|
c51832e2bd
|
tip样式的调整
|
2017-09-15 20:23:49 +08:00 |
|
daiao
|
c6a7362051
|
在线课堂的加入学生、老师弹框，实训tpm的添加合作者显示的用户职业不正确
|
2017-09-15 20:20:01 +08:00 |
|
caishi
|
c841ec27ba
|
选择题
|
2017-09-15 20:12:24 +08:00 |
|
daiao
|
7ac17f10bd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 19:29:09 +08:00 |
|
daiao
|
550f152e27
|
单选多选题
|
2017-09-15 19:28:19 +08:00 |
|
caishi
|
8d42926389
|
选择题编辑、详情
|
2017-09-15 18:28:30 +08:00 |
|
miss
|
ac2af05d28
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 18:13:14 +08:00 |
|
daiao
|
02861c3bd2
|
单选多选题缺陷修复
|
2017-09-15 11:23:24 +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 |
|
miss
|
25cb688ace
|
测试集前端显示空格及提示语
|
2017-09-15 09:08:01 +08:00 |
|
daiao
|
a67f4ca0f7
|
实训单选多选题TPM优化
|
2017-09-14 19:41:30 +08:00 |
|
daiao
|
32eaaef9fc
|
新版实训TPM单选多选题
|
2017-09-12 16:22:52 +08:00 |
|
daiao
|
0a1e895dc2
|
单选多选题的TPM（初版）
|
2017-09-12 14:08:19 +08:00 |
|
daiao
|
a27f10d884
|
选择题的新建和详情页面
|
2017-09-12 09:05:51 +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 |
|
daiao
|
e399879d68
|
实训关卡的评测设置，非隐藏测试集不显示锁icon
|
2017-09-08 11:25:38 +08:00 |
|
daiao
|
27c20e03ec
|
实训tpm编辑评测设置，输入输出框只有一行高
|
2017-09-08 09:38:43 +08:00 |
|
daiao
|
6cc88c874d
|
实训选择题
|
2017-09-07 19:16:55 +08:00 |
|
huang
|
382e5758a0
|
实训每一关卡添加背景知识
|
2017-09-07 16:14:44 +08:00 |
|
huang
|
9a4741298f
|
实训单个关卡添加背景知识
|
2017-09-07 16:11:12 +08:00 |
|
huang
|
87612ef6ee
|
解决post请求406不接受问题
|
2017-09-07 10:26:54 +08:00 |
|
daiao
|
d67edced16
|
单选多选题
|
2017-09-07 09:42:12 +08:00 |
|
miss
|
67ecc89ce6
|
实训配置页面的tab样式需要更换成与实训TPI编辑页面tab一致，新建实训、新建实训路径、编辑实训路径需要加上阴影，Step2实训TPM的页面内容边框和阴影
|
2017-09-06 17:35:38 +08:00 |
|
daiao
|
91f869cf99
|
Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao
|
2017-09-06 14:42:45 +08:00 |
|
daiao
|
9c36affeec
|
单选多选题
|
2017-09-06 14:42:31 +08:00 |