 caishi
|
3ddfd6cc24
|
Merge branch 'develop' into dev_cs
|
2017-08-25 17:05:25 +08:00 |
|
caishi
|
03a7b645b8
|
issues修改
|
2017-08-25 17:03:18 +08:00 |
 daiao
|
4e7205a5a0
|
非合作成员点击TPM的任务列表，请进入TPI页面
|
2017-08-23 15:05:57 +08:00 |
|
daiao
|
55a1367b8a
|
新建和编辑关卡的时候，点击代码库弹框后，页面被滚动置顶部了
|
2017-08-22 16:11:56 +08:00 |
|
caishi
|
268de03f8b
|
TPM任务显示顺序
|
2017-08-18 16:44:46 +08:00 |
 cxt
|
15c5f91d06
|
实训tpm参考答案页面，编辑时参考答案显示为“参考答案1111” 正常
|
2017-08-18 09:41:03 +08:00 |
 miss
|
0629886965
|
技能标签的修改
|
2017-08-16 17:47:07 +08:00 |
|
miss
|
a20044c593
|
技能标签问题的修改
|
2017-08-16 17:35:21 +08:00 |
|
daiao
|
0aad842900
|
MD自动保存
|
2017-08-15 11:29:31 +08:00 |
 huang
|
355ffddbd4
|
Merge branch 'develop' into dev_kubernete
|
2017-08-11 20:14:37 +08:00 |
|
cxt
|
a0453dadd0
|
实训关卡调整
|
2017-08-11 19:56:27 +08:00 |
|
huang
|
1fee1dd7f9
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-11 17:15:39 +08:00 |
|
cxt
|
009761abde
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/controllers/shixuns_controller.rb
app/views/challenges/_content_list.html.erb
|
2017-08-11 16:29:30 +08:00 |
|
huang
|
d92d4e8ee7
|
Merge branch 'develop' into dev_kubernete
Conflicts:
.idea/dataSources.xml
app/controllers/shixuns_controller.rb
|
2017-08-11 14:52:08 +08:00 |
|
huang
|
2fe2b9a825
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-10 16:19:03 +08:00 |
|
caishi
|
3a95db144b
|
个人成长记录中心页面样式修改
|
2017-08-10 14:10:01 +08:00 |
|
cxt
|
adedcf45f2
|
Merge branch 'dev_cxt' into dev_cs
|
2017-08-10 10:33:15 +08:00 |
|
daiao
|
979d1d9624
|
trustie注册时登录名是不能少于4个字符，但是修改资料时登录名可以改为1位数
|
2017-08-09 15:48:26 +08:00 |
|
daiao
|
491591fb49
|
新建关卡时，评测设置的文件路径与执行文件保存时不能为空
|
2017-08-09 15:34:21 +08:00 |
|
cxt
|
1557ad3e9d
|
实训tpm的关卡删除功能遗漏
|
2017-08-08 15:35:34 +08:00 |
|
daiao
|
fc1a7be3fb
|
实训详情增加进入上一关的入口
|
2017-08-08 10:32:36 +08:00 |
|
daiao
|
fa1cad5af3
|
实训的预备知识tab恢复，名称换成“背景知识”
|
2017-08-08 09:39:38 +08:00 |
|
daiao
|
46fe64d045
|
已发布的实训首页全部任务的编辑icon不应该隐藏
|
2017-08-08 09:10:54 +08:00 |
|
daiao
|
999726b8f8
|
实训任务的“技能勋章”修改为“技能标签”
|
2017-08-08 09:05:40 +08:00 |
|
huang
|
4bad2e3087
|
优化新建实训代码，添加事务及异常处理
|
2017-08-07 14:28:43 +08:00 |
|
caishi
|
013724be30
|
实训的编辑区域加宽，左右留白太多
实训的列表中显示信息位置调整
实训首页只有一排数据时，页面滑动到最下面后把鼠标移动到数据上会引起筛选处向下动
|
2017-08-07 11:01:11 +08:00 |
|
caishi
|
1f0a34babf
|
我的关注新页加最小高度
实训套件中拖拽实训模块应该用拖拽的手势，而不是点击手势
技能勋章添加第一个标签时回车会整个页面刷新
|
2017-08-06 17:14:55 +08:00 |
|
caishi
|
c12627b6d8
|
TPI/TPM字母超过范围未换行
|
2017-08-04 21:08:51 +08:00 |
|
caishi
|
755214f92a
|
认证页面样式
issues修改
|
2017-08-04 19:25:12 +08:00 |
|
caishi
|
2cc1727693
|
Issues修改
|
2017-08-04 16:39:12 +08:00 |
|
caishi
|
ff50a90e44
|
个人成长记录中心页面（还有金币图片）
班级动态点赞后“赞”的字会移到左边
样式修改
|
2017-08-04 09:52:13 +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
|
0e4cb4e613
|
实训单选多选题缺陷修复
|
2017-07-28 19:14:29 +08:00 |
|
caishi
|
81092b80bc
|
Merge branch 'dev_cs' into develop
|
2017-07-28 16:56:54 +08:00 |
|
daiao
|
56ccc6c6b1
|
评分设置中奖励经验值不正确，tip说明不正确，技能勋章的tip说明也不正确
|
2017-07-28 16:55:54 +08:00 |
|
caishi
|
a506fd76ca
|
增加icon，修改样式
|
2017-07-28 16:53:44 +08:00 |
|
daiao
|
c5df06266e
|
阶段详情加入任务的ICON
|
2017-07-28 16:35:39 +08:00 |
|
daiao
|
70cef71676
|
Merge branch 'dev_cs' into develop
|
2017-07-28 16:30:38 +08:00 |
|
daiao
|
643fc6ce6b
|
预备知识更新数据
|
2017-07-28 16:27:10 +08:00 |
|
caishi
|
81b74c879a
|
选择题样式问题
|
2017-07-28 16:25:17 +08:00 |
|
daiao
|
e1280f0689
|
选择题样式问题
|
2017-07-28 15:55:54 +08:00 |
|
daiao
|
648e0548d6
|
用户单选题
|
2017-07-28 11:14:30 +08:00 |
|
daiao
|
6ce887424b
|
tpm增加预备知识
|
2017-07-27 10:07:58 +08:00 |
|
daiao
|
5fdd7e82f5
|
单选多选增加验证提醒
|
2017-07-26 20:32:48 +08:00 |
|
daiao
|
c825ddb18c
|
tpi单选多选题
|
2017-07-26 19:15:22 +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 |
|
caishi
|
8705a3c711
|
隐藏不用上线的部分，并修改样式
|
2017-07-26 17:41:11 +08:00 |