 cxt
|
8254251670
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-01 15:22:10 +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 |
 daiao
|
77ea22173e
|
@myshixun.shixun.language == "Html"
|
2017-09-01 09:16:35 +08:00 |
|
daiao
|
dfa5a1013e
|
获取等待时间
|
2017-08-31 17:16:59 +08:00 |
|
daiao
|
41c5300ecf
|
评测增加等待人数
|
2017-08-31 17:08:36 +08:00 |
|
cxt
|
406778632a
|
手机找回密码去掉滑块
|
2017-08-31 16:24:51 +08:00 |
|
cxt
|
75522ab120
|
在线课堂删除课程的联动更新：题库新建的tip和适用课程的输入可选列表，题库只显示普通和实训的作业
|
2017-08-30 14:39:44 +08:00 |
|
cxt
|
13d39379f8
|
Merge branch 'develop' into dev_cxt
|
2017-08-30 10:50:43 +08:00 |
|
cxt
|
43eafaf095
|
新建课堂修删除专业等信息，简洁化
|
2017-08-29 17:31:28 +08:00 |
|
miss
|
4c25c08ad4
|
调整
|
2017-08-29 09:14:14 +08:00 |
|
cxt
|
baa512e4d7
|
作业设置的相关修改
|
2017-08-28 15:02:54 +08:00 |
|
miss
|
eb2b736c45
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 11:10:44 +08:00 |
|
miss
|
4c0b2fc3a8
|
实训课程的学习须知，底部间距与头部间距保持一致 ，平台首页的相关tip更换新样式
|
2017-08-28 11:10:17 +08:00 |
|
cxt
|
1818885424
|
实训课程改为：实训路径
|
2017-08-28 09:14:09 +08:00 |
 caishi
|
f482b90cc2
|
实训点击事件
|
2017-08-25 21:42:16 +08:00 |
|
caishi
|
55d8fa7f13
|
Merge branch 'dev_cs' into develop
|
2017-08-25 21:40:01 +08:00 |
|
caishi
|
e60329fc97
|
Merge branch 'develop' into dev_cs
|
2017-08-25 21:26:06 +08:00 |
|
caishi
|
c4ac37cc4d
|
双点击事件
|
2017-08-25 21:19:20 +08:00 |
|
miss
|
78f50d70ca
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-25 20:46:10 +08:00 |
|
miss
|
c234125ee5
|
主页tip样式修改。版本库及评测区域图标变换
|
2017-08-25 20:45:44 +08:00 |
|
cxt
|
1195f09b07
|
绑定邮箱点击打开新窗口
|
2017-08-25 20:22:20 +08:00 |
|
daiao
|
ef0da2ebf6
|
修改上传附件删除按钮的位置
|
2017-08-25 19:56:17 +08:00 |
 XuCheng642
|
d0181f80b7
|
Merge branch 'dev_xucheng' into develop
|
2017-08-25 16:25:12 +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 |
|
cxt
|
67ce988957
|
Merge branch 'dev_cs' into dev_cxt
|
2017-08-25 16:12:06 +08:00 |
|
XuCheng642
|
f54453f32c
|
管理员界面新增专业
|
2017-08-25 16:11:35 +08:00 |
|
cxt
|
5bd3e4a185
|
实训课程的调整
|
2017-08-25 16:11:21 +08:00 |
|
caishi
|
b08d4da7f9
|
班级作业列表不够1页的高度调整
|
2017-08-25 15:55:23 +08:00 |
|
daiao
|
c87c73d2ee
|
实训添加合作者报500
|
2017-08-25 15:29:49 +08:00 |
|
cxt
|
49bbd36c12
|
实训套件的改版
|
2017-08-24 20:01:34 +08:00 |
|
miss
|
c16936ff4c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-24 16:37:02 +08:00 |
|
miss
|
af72500077
|
成长中心的“技能标签”tab隐藏
webssh的部分兼容问题
|
2017-08-24 16:36:31 +08:00 |
|
daiao
|
123c0e57f8
|
没有评测通过时点击重新加载，中间的加载效果一直有
|
2017-08-24 10:35:42 +08:00 |
|
daiao
|
8111d82435
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-24 09:17:03 +08:00 |
|
daiao
|
b0b6aa06e6
|
平台关于附件删除icon的显示需要统一调整
|
2017-08-24 09:16:43 +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 |
|
daiao
|
e9b7a98aba
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-23 09:42:57 +08:00 |
|
daiao
|
f1c0b688a0
|
邮箱注册后没有激活，重新登录后跳到邮箱激活页面，点击帮助中心跳转500
|
2017-08-23 09:42:39 +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 |