 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 |
|
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 |
 daiao
|
77ea22173e
|
@myshixun.shixun.language == "Html"
|
2017-09-01 09:16:35 +08:00 |
|
huang
|
f2ccccf93a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 08:58:36 +08:00 |
|
huang
|
7580ec6478
|
实训pod关联
|
2017-09-01 08:58:06 +08:00 |
|
daiao
|
dfa5a1013e
|
获取等待时间
|
2017-08-31 17:16:59 +08:00 |
|
daiao
|
3310b12af6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/games/_code_actions.html.erb
|
2017-08-31 17:10:17 +08:00 |
|
daiao
|
41c5300ecf
|
评测增加等待人数
|
2017-08-31 17:08:36 +08:00 |
|
huang
|
e60582787d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/games/_code_actions.html.erb
|
2017-08-31 16:38:07 +08:00 |
|
huang
|
43b56e190e
|
解决版本历史实训push代码没有改变实训状态的问题
|
2017-08-31 16:37:07 +08:00 |
|
huang
|
6cce4c282c
|
实训路径中开启实训权限控制
|
2017-08-31 16:25:25 +08:00 |
|
huang
|
e3ce07dacc
|
实训路径中点击实训弹出新的页面
|
2017-08-31 16:25:01 +08:00 |
 cxt
|
37a1103874
|
手机注册
|
2017-08-31 16:03:12 +08:00 |
|
cxt
|
c76dff2829
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-31 15:55:05 +08:00 |
|
cxt
|
3299c037c5
|
手机注册的滑动块无法拖动
|
2017-08-31 15:54:46 +08:00 |
|
daiao
|
2b075837fb
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/users/search_shixuns_or_courses.html.erb
|
2017-08-31 15:25:47 +08:00 |
|
caishi
|
0b62727dee
|
三个主题页面间距调整
|
2017-08-31 15:20:09 +08:00 |
|
daiao
|
d417ca0cf3
|
超级管理员的试用授权列表手动授权不应该在审批页面新增申请记录
|
2017-08-31 15:17:16 +08:00 |
|
caishi
|
dd767c6b5a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-31 14:17:12 +08:00 |
|
caishi
|
262e56eafd
|
样式
|
2017-08-31 14:16:21 +08:00 |
|
cxt
|
8c6a984683
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-31 11:10:23 +08:00 |
|
caishi
|
ff7facff16
|
样式调整
|
2017-08-31 11:08:18 +08:00 |
|
cxt
|
706c1d87c4
|
实训路径的各类文字描述细节
|
2017-08-31 11:07:16 +08:00 |
|
caishi
|
756cae137f
|
实训路径右侧头像跳转页面
|
2017-08-31 10:54:47 +08:00 |
|
caishi
|
319c157e33
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/subjects/show.html.erb
|
2017-08-31 10:40:56 +08:00 |
|
caishi
|
1d982a169d
|
实训路径右侧样式修改
|
2017-08-31 10:38:10 +08:00 |
|
huang
|
93bc2ae4dd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-31 09:32:40 +08:00 |
|
huang
|
328e7236a9
|
完成跳关打实训
|
2017-08-30 17:30:32 +08:00 |
 miss
|
1cab491884
|
样式的调整，部分issue
|
2017-08-29 18:52:20 +08:00 |
|
daiao
|
dde055fd3a
|
实训TPI提示等待时间信息
|
2017-08-29 17:07:11 +08:00 |
|
miss
|
9b84d664e5
|
平台tip的一些问题修改
|
2017-08-29 14:44:29 +08:00 |
|
daiao
|
752e9799f4
|
全部实训和在线课堂的搜索icon点开之后显示不一致
|
2017-08-29 14:16:28 +08:00 |
|
daiao
|
4e35f0adf5
|
专业列表
|
2017-08-29 09:15:28 +08:00 |
|
miss
|
a280e2cc32
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-29 09:14:54 +08:00 |
|
daiao
|
f3a4ca2a51
|
Merge branch 'dev_xucheng' into dev_daiao
Conflicts:
app/controllers/managements_controller.rb
app/views/student_work/index.html.erb
public/stylesheets/css/edu-common.css
|
2017-08-29 09:14:22 +08:00 |
|
miss
|
4c25c08ad4
|
调整
|
2017-08-29 09:14:14 +08:00 |
 XuCheng642
|
8f74cc4b42
|
iuuue
|
2017-08-29 09:08:15 +08:00 |
|
daiao
|
8ad4cab0ef
|
Merge branch 'develop' into dev_daiao
|
2017-08-29 09:06:43 +08:00 |
|
cxt
|
a21396e87b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 18:52:40 +08:00 |
|
caishi
|
eacd5fcba6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 18:52:01 +08:00 |
|
caishi
|
ef6a8b0750
|
实训路径调整
|
2017-08-28 18:51:41 +08:00 |
|
cxt
|
56f3259eb1
|
留言列表的序号显示
|
2017-08-28 18:37:17 +08:00 |
|
cxt
|
800fe68a3a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 18:30:39 +08:00 |
|
caishi
|
b8378a9dad
|
Merge branch 'dev_cs' into develop
|
2017-08-28 18:30:00 +08:00 |