Commit Graph

244 Commits

Author SHA1 Message Date
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
miss 78c5b28227 IE浏览器webssh多个tabde的高度问题 2017-08-22 10:21:05 +08:00
daiao e76d058149 载入中样式调整 2017-08-18 20:26:32 +08:00
caishi a5124c9952 TPI加载效果 2017-08-18 16:21:32 +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 f25324e23d Merge branch 'dev_cxt' into develop 2017-08-18 14:00:11 +08:00
caishi 4ecca2df04 Merge branch 'dev_cs' into develop 2017-08-18 13:59:12 +08:00
daiao 43df4f1a5d webssh根据屏幕高度自适应 2017-08-18 09:26:41 +08:00
miss bd08eee523 平台Tip样式的更换 2017-08-17 17:33:38 +08:00
daiao d9628aaac4 tpi优化缺陷调整 2017-08-17 16:09:44 +08:00
daiao bac84938b4 webssh连接增加行数 2017-08-17 14:46:08 +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
cxt ecfee445c3 复选框列表在翻页后原来页的选择被丢掉了 2017-08-16 17:34:25 +08:00
daiao 6ecea224f1 评测样式调整 2017-08-16 11:23:22 +08:00
miss e5e56bf8a3 加载样式修改 2017-08-16 11:06:55 +08:00
daiao 1c6cfe72d0 实训点击加载中效果 2017-08-16 10:34:25 +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