 huang
|
2fd7b0efea
|
Merge branch 'develop' into huang_k8s
|
2017-08-01 10:43:39 +08:00 |
|
huang
|
4e0dfe4952
|
Merge branch 'develop' into huang_k8s
|
2017-08-01 09:40:47 +08:00 |
 caishi
|
22204b88e8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-01 09:36:26 +08:00 |
|
caishi
|
63af6d4d23
|
样式修改
|
2017-08-01 09:35:49 +08:00 |
|
caishi
|
239f375e24
|
样式修改
|
2017-08-01 09:34:38 +08:00 |
 cxt
|
84ebf6a07d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-01 09:31:52 +08:00 |
|
cxt
|
a78cbf2c7a
|
实训套件的新增阶段调整
|
2017-08-01 09:31:37 +08:00 |
|
huang
|
fb0e141510
|
添加Python版本
|
2017-08-01 09:28:02 +08:00 |
|
caishi
|
0ca554ac94
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-01 08:58:09 +08:00 |
|
caishi
|
56d520c569
|
实训套件界面修改，以及tab样式的公用
|
2017-08-01 08:57:44 +08:00 |
|
cxt
|
a8d44d9574
|
超级管理员的title修改
|
2017-07-31 17:39:03 +08:00 |
|
caishi
|
2df90b3376
|
Merge branch 'dev_cs' into develop
Conflicts:
public/stylesheets/css/edu-common.css
|
2017-07-31 17:13:05 +08:00 |
|
caishi
|
389e76dcd7
|
issue修改
|
2017-07-31 17:09:58 +08:00 |
 miss
|
ca845f007e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-31 16:13:11 +08:00 |
|
miss
|
55b5b7fd03
|
拖拽留白区域的解决
tip样式的完善
|
2017-07-31 16:12:24 +08:00 |
 daiao
|
6e1e199079
|
实训TPM“编程任务”改为“实践任务”
|
2017-07-31 13:54:10 +08:00 |
|
caishi
|
c0f15945a7
|
选择题tpi页面固定单行高度，但是内容过多时，框内边距应该是10px
实训首页和实训套件首页的最新排序和最热排序的点击范围需要扩大，目前是点击字才会有效果
实训配置页面的简介颜色与其他不一致，应该为#888
|
2017-07-31 12:09:41 +08:00 |
|
caishi
|
c2bef09de7
|
Merge branch 'develop' into dev_cs
|
2017-07-31 09:59:16 +08:00 |
|
daiao
|
115a7a31c3
|
评测
|
2017-07-28 21:02:55 +08:00 |
|
daiao
|
8830a58050
|
最后一关评测
|
2017-07-28 20:57:49 +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 |
|
cxt
|
1e0ba96f82
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 19:23:41 +08:00 |
|
cxt
|
01ebc0e10b
|
非老师不可置顶帖子
|
2017-07-28 19:23:20 +08:00 |
|
daiao
|
e48d0c53f4
|
缺陷修复
|
2017-07-28 19:18:11 +08:00 |
|
daiao
|
079c9b441d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 19:14:52 +08:00 |
|
daiao
|
0e4cb4e613
|
实训单选多选题缺陷修复
|
2017-07-28 19:14:29 +08:00 |
|
cxt
|
51c4d8ed23
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 17:40:03 +08:00 |
|
cxt
|
fcfc426e6a
|
新留言提醒方式变更
|
2017-07-28 17:39:50 +08:00 |
|
daiao
|
35338a8575
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 17:33:43 +08:00 |
|
daiao
|
494e338cb0
|
单选多选题宽度调整
|
2017-07-28 17:33:28 +08:00 |
|
caishi
|
fe12bb3728
|
Merge branch 'develop' into dev_cs
|
2017-07-28 17:14:22 +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 |
|
miss
|
466ddd05d2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 17:04:04 +08:00 |
|
miss
|
6093437889
|
拖拽版面比例的修改。实训列表的tip样式修改
|
2017-07-28 17:03:12 +08:00 |
|
cxt
|
8f995d7b46
|
Merge branch 'dev_cxt' into develop
|
2017-07-28 17:00:27 +08:00 |
|
cxt
|
67d76ccd3a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 17:00:17 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
|
caishi
|
81092b80bc
|
Merge branch 'dev_cs' into develop
|
2017-07-28 16:56:54 +08:00 |
|
daiao
|
d94d2876de
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 16:56:08 +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 |
|
huang
|
43f8976e59
|
以太坊英文修改
|
2017-07-28 16:48:24 +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 |
|
caishi
|
efc009e74c
|
Merge branch 'develop' into dev_cs
|
2017-07-28 15:59:58 +08:00 |