 daiao
|
ec9e28a4ad
|
上线缺陷修复
|
2017-09-01 19:55:11 +08:00 |
|
daiao
|
71c34557e5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 19:21:16 +08:00 |
|
daiao
|
888bd440e2
|
上线缺陷修复
|
2017-09-01 19:21:00 +08:00 |
 cxt
|
1775922c5b
|
试用申请的多次弹框
|
2017-09-01 19:19:19 +08:00 |
|
cxt
|
ff996a192e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 19:16:13 +08:00 |
|
cxt
|
980f2ddc51
|
班级通知去掉课程的链接
|
2017-09-01 19:05:43 +08:00 |
 caishi
|
fae3342d9c
|
显示的tip内容
|
2017-09-01 18:37:43 +08:00 |
|
daiao
|
c3e552fd3c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 18:32:33 +08:00 |
|
daiao
|
bd6d6a773c
|
修复上线缺陷
|
2017-09-01 18:32:16 +08:00 |
|
caishi
|
e438d2e09a
|
选择实训的列表中单选项需要右移，边距参考学员数，实训名称需要左对齐
|
2017-09-01 18:23:00 +08:00 |
 huang
|
dfcfd9e791
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 17:30:46 +08:00 |
 miss
|
cfc5cf1cb2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 17:28:18 +08:00 |
|
miss
|
4c56bfad47
|
实训tpi页面，点击已通关关卡的评测后有样式上的问题，实训TPM页不同块的标题栏高度不一致
|
2017-09-01 17:27:43 +08:00 |
|
caishi
|
0ad3b23899
|
翻页颜色
|
2017-09-01 17:27:40 +08:00 |
|
caishi
|
674b11b725
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 17:23:58 +08:00 |
|
cxt
|
349e9e8ac8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 17:23:31 +08:00 |
|
caishi
|
7f655465e3
|
Issues
|
2017-09-01 17:23:26 +08:00 |
|
huang
|
803ceb956f
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 17:22:14 +08:00 |
|
huang
|
7b57e04259
|
解决实训首页显示顺序和搜索顺序不一致的问题
|
2017-09-01 17:21:53 +08:00 |
|
daiao
|
f56cad84ff
|
我的实训页面已参与的时间排序不正确，与主页中我的实训排序不一致
|
2017-09-01 15:40:53 +08:00 |
|
cxt
|
8254251670
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 15:22:10 +08:00 |
|
cxt
|
9d36d71af4
|
在线课堂的搜索
|
2017-09-01 15:21:50 +08:00 |
|
daiao
|
54fa965c36
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 15:18:29 +08:00 |
|
daiao
|
d8fea2e3f6
|
实训路径中点击模拟实战或开启实战后立马关掉新开页，实训路径中有个载入效果会一直存在
|
2017-09-01 15:18:09 +08:00 |
|
miss
|
89078e6ff9
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/games/_code_actions.html.erb
# public/javascripts/edu/edu_tpi.js
|
2017-09-01 15:11:02 +08:00 |
|
miss
|
fa6faad26d
|
新增单位界面
|
2017-09-01 15:06:34 +08:00 |
|
cxt
|
a087cc809a
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/courses/index.js.erb
app/views/subjects/_subject_list.html.erb
app/views/subjects/show.html.erb
|
2017-09-01 15:06:18 +08:00 |
|
miss
|
63fab43103
|
issue列表的完成
|
2017-09-01 14:59:35 +08:00 |
|
cxt
|
8cf4d0d49c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 14:59:25 +08:00 |
|
huang
|
fce309a301
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 14:48:38 +08:00 |
|
huang
|
0ab3c43fcd
|
正在完善去掉鼠标点击效果
|
2017-09-01 14:48:25 +08:00 |
|
daiao
|
04a6108f81
|
Merge branch 'dev_daiao' into develop
|
2017-09-01 14:22:28 +08:00 |
|
daiao
|
bf0b205f61
|
评测时，左侧全部任务显示样式有缺陷
|
2017-09-01 14:21:07 +08:00 |
|
caishi
|
032b1f1d59
|
阴影样式
|
2017-09-01 14:12:32 +08:00 |
|
huang
|
dec3a7bcbc
|
弹新页面win.open改成a标签（浏览器兼容问题）
|
2017-09-01 14:10:37 +08:00 |
|
huang
|
8a0f697038
|
“正在完善”改成按钮形式
|
2017-09-01 13:59:20 +08:00 |
|
daiao
|
6ee134b2f3
|
实训技能标签失去焦点保存
|
2017-09-01 13:50:22 +08:00 |
|
caishi
|
4769029cb1
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 13:30:49 +08:00 |
|
caishi
|
a9d3277b02
|
教学团队的跳转链接
|
2017-09-01 13:30:17 +08:00 |
|
huang
|
1506ce19dd
|
发布状态的一些权限控制
|
2017-09-01 13:20:36 +08:00 |
|
huang
|
91754a330f
|
实训tpi列表中显示问题
|
2017-09-01 12:56:41 +08:00 |
|
caishi
|
d9fbbddd55
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 11:22:22 +08:00 |
|
caishi
|
db646e85f0
|
三个主题页面的间距调整
|
2017-09-01 11:21:51 +08:00 |
|
caishi
|
65878938fc
|
实训路径样式修改
|
2017-09-01 11:17:02 +08:00 |
|
huang
|
804224b5b6
|
实训正式版发布 除了默认打开的文件外不允许编辑其它文件
|
2017-09-01 10:59:11 +08:00 |
|
huang
|
bcb3005bfa
|
tpi中未发布状态下不显示关卡状态
|
2017-09-01 10:13:55 +08:00 |
|
daiao
|
da5789b45d
|
Merge branch 'develop' into dev_daiao
|
2017-09-01 10:00:39 +08:00 |
|
huang
|
717c9cc7b8
|
代码合并被丢失处理
|
2017-09-01 09:57:17 +08:00 |
|
huang
|
73ac51c810
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 09:34:46 +08:00 |
|
huang
|
8a5d5b6505
|
实训列表中编辑状态下不显示对应的操作按钮
|
2017-09-01 09:34:29 +08:00 |