 miss
|
f3926dbdd2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-27 15:22:23 +08:00 |
|
miss
|
f458952d60
|
个人主页的悬浮效果错位
|
2017-08-27 15:21:57 +08:00 |
 caishi
|
325f3f536f
|
作业列表右上角下拉菜单字体
|
2017-08-27 11:06:47 +08:00 |
|
caishi
|
0f3c884f0a
|
课程实训点击事件
|
2017-08-25 21:38:07 +08:00 |
|
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 |
 cxt
|
a944456e57
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/subjects/_subject_list.html.erb
|
2017-08-25 16:13:46 +08:00 |
|
miss
|
064a62d881
|
实训套件和在线课堂首页的tip样式与实训首页的tip样式保持一致
实训TPI的评论区，评论换行后右侧的按钮应该始终显示在底部
|
2017-08-25 15:20:27 +08:00 |
|
caishi
|
ca59d5c7e1
|
三个主模块顶部颜色恢复成以前的渐变色
|
2017-08-25 14:59:17 +08:00 |
|
caishi
|
d854c7aa5b
|
实训课程页面修改
|
2017-08-25 14:35:37 +08:00 |
|
caishi
|
3c0b9c49cb
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-08-25 10:37:54 +08:00 |
|
caishi
|
2a9e8a0969
|
主页面颜色渐变
|
2017-08-25 10:36:41 +08:00 |
|
cxt
|
e884b0285a
|
Merge branch 'dev_cs' into dev_cxt
|
2017-08-24 18:27:57 +08:00 |
|
caishi
|
55392a29b3
|
实训课程页面改版
|
2017-08-24 17:36:49 +08:00 |
 daiao
|
0e456edf98
|
实训tpi页面，点击评测，在等待时间中点击全部任务，然后关闭弹出通过成功的提示，页面会有点样式性问题，点击网页后又恢复正常
|
2017-08-24 14:38:43 +08:00 |
|
miss
|
a3923f1ade
|
缺省的测试区域不正常的问题的解决
|
2017-08-23 17:36:51 +08:00 |
|
miss
|
404098149e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/games/_repository.html.erb
|
2017-08-23 15:20:51 +08:00 |
|
miss
|
6ccd257f5a
|
缺省的测试区域不正常（360兼容问题）
tip颜色的修改
|
2017-08-23 15:02:04 +08:00 |
|
daiao
|
e9f303b248
|
html渲染使用Iframes
|
2017-08-23 10:52:19 +08:00 |
 XuCheng642
|
ce362108f5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-23 09:25:00 +08:00 |
|
XuCheng642
|
bf01c1b4a8
|
issue的修改
|
2017-08-23 09:24:32 +08:00 |
|
cxt
|
696545889b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-22 16:27:41 +08:00 |
|
cxt
|
78f1fd3d1d
|
增加试用申请的留言功能
|
2017-08-22 16:27:28 +08:00 |
|
daiao
|
55a1367b8a
|
新建和编辑关卡的时候，点击代码库弹框后，页面被滚动置顶部了
|
2017-08-22 16:11:56 +08:00 |
|
miss
|
720b138631
|
平台tip的进一步优化，解决加载之后的tip事件不执行
|
2017-08-22 14:17:47 +08:00 |
|
miss
|
c24374393b
|
tip样式层级的修改
|
2017-08-20 09:57:15 +08:00 |
|
daiao
|
e76d058149
|
载入中样式调整
|
2017-08-18 20:26:32 +08:00 |
|
miss
|
b708e2f0cc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/games/_repository.html.erb
|
2017-08-18 18:38:50 +08:00 |
|
miss
|
ddb7602a90
|
tab修改
|
2017-08-18 18:36:54 +08:00 |
|
caishi
|
a5124c9952
|
TPI加载效果
|
2017-08-18 16:21:32 +08:00 |
|
caishi
|
0d48f328e7
|
Merge branch 'dev_cs' into develop
|
2017-08-18 15:25:50 +08:00 |
|
caishi
|
d478b297cb
|
实训配置页隐藏提示，icon移入效果
|
2017-08-18 15:24:47 +08:00 |
|
daiao
|
1ddac249e2
|
Merge branch 'dev_TPI' into develop
Conflicts:
public/stylesheets/css/edu-common.css
public/stylesheets/css/taskstyle.css
|
2017-08-18 14:03:05 +08:00 |
|
cxt
|
0d6746b5c2
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 14:01:10 +08:00 |
|
cxt
|
f25324e23d
|
Merge branch 'dev_cxt' into develop
|
2017-08-18 14:00:11 +08:00 |
|
cxt
|
6c9722c6ea
|
Merge branch 'dev_cs' into dev_cxt
|
2017-08-18 13:59:23 +08:00 |
|
caishi
|
4ecca2df04
|
Merge branch 'dev_cs' into develop
|
2017-08-18 13:59:12 +08:00 |
|
caishi
|
bc71a63eb6
|
边框阴影以及加载框里字体颜色
|
2017-08-18 10:59:10 +08:00 |
|
caishi
|
5922513e27
|
实训套件页面改版（未完成，已注释）
|
2017-08-18 10:45:12 +08:00 |
|
XuCheng642
|
01bc990770
|
超级管理员页面功能修改
|
2017-08-18 09:41:06 +08:00 |
|
miss
|
bd08eee523
|
平台Tip样式的更换
|
2017-08-17 17:33:38 +08:00 |
|
cxt
|
d0d133668c
|
底部的qq信息框间距调整
|
2017-08-17 14:52:34 +08:00 |
|
daiao
|
da1e4c2b5d
|
Merge branch 'develop' into dev_TPI
Conflicts:
app/controllers/games_controller.rb
app/controllers/shixuns_controller.rb
app/views/games/_code_actions.html.erb
app/views/games/_repository.html.erb
public/javascripts/application.js
public/stylesheets/css/taskstyle.css
|
2017-08-17 14:42:26 +08:00 |
|
caishi
|
7cc1b2426f
|
Issues修改
|
2017-08-17 10:29:54 +08:00 |
|
caishi
|
b0dbc2dce8
|
镜像管理页、以及部分Issues的修改
|
2017-08-16 11:22:40 +08:00 |
|
miss
|
e5e56bf8a3
|
加载样式修改
|
2017-08-16 11:06:55 +08:00 |
|
miss
|
eabdc8c8cc
|
样式修改
|
2017-08-16 08:56:49 +08:00 |
|
caishi
|
49d5d648c3
|
在线课堂的首页加入课堂和新建入口的间隔调整
课程页面显示效果调整存在缺陷
|
2017-08-15 09:20:46 +08:00 |
|
caishi
|
a8378ebc2f
|
Merge branch 'dev_cs' into develop
|
2017-08-11 21:00:16 +08:00 |
|
caishi
|
f36fd210e2
|
认证页面样式修改
|
2017-08-11 19:36:42 +08:00 |