Commit Graph

175 Commits

Author SHA1 Message Date
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
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 d29910ee9a 加载效果的显示 2017-08-11 20:43:33 +08:00
caishi 5bb9e70f57 Merge branch 'dev_cs' into develop 2017-08-11 19:26:41 +08:00
caishi 0b2cbb0c9a 继续实战的加载效果 2017-08-11 19:25:07 +08:00
miss 1aacb457e7 加载修改 2017-08-11 19:02:52 +08:00
cxt c85db2fd5a Merge branch 'dev_cs' into develop 2017-08-11 17:23:27 +08:00
caishi d5a0492914 新增加载等待的样式 2017-08-11 17:21:42 +08:00
cxt 139a0597d8 Merge branch 'dev_xucheng' into develop
Conflicts:
	app/views/layouts/base_management.html.erb
	app/views/managements/_class_shixuns_list.html.erb
	app/views/managements/_users_authorization_list.html.erb
	app/views/managements/identity_authentication.html.erb
	app/views/managements/shixun_authorization.html.erb
	app/views/managements/subject_authorization.html.erb
	config/routes.rb
	public/javascripts/edu/account.js
	public/javascripts/edu/syllabus.js
2017-08-11 15:20:56 +08:00
daiao a2792a6fda tpi的JS功能优化 2017-08-11 15:07:45 +08:00
XuCheng642 d3a67b42b2 超级管理员相关页面 2017-08-11 11:27:04 +08:00
miss 38fc425b77 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-11 10:39:22 +08:00
daiao d93ef96d66 评测区域代码优化 2017-08-11 10:38:57 +08:00
miss 67a4d2e5d0 修改 2017-08-11 10:38:56 +08:00
daiao f0b4b091b6 评测区域点击事件 2017-08-11 10:08:54 +08:00
daiao a7a9708979 隐藏质量分析 2017-08-11 10:01:23 +08:00
miss e6af828a81 动态加载 2017-08-11 09:24:37 +08:00
cxt 14d7d8fa7a 课程的新建和编辑的下拉框调整 2017-08-10 17:30:53 +08:00
daiao 0f5a29fbb4 TPI优化 2017-08-10 17:05:44 +08:00
daiao 38dd7bc9a0 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI
Conflicts:
	public/javascripts/edu/edu_tpi.js
2017-08-10 16:35:32 +08:00
daiao 8c4b647a04 TPI优化 2017-08-10 16:32:50 +08:00
miss a0ccd59250 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-10 16:24:06 +08:00
miss e2c9a094ff 加载修改 2017-08-10 16:23:12 +08:00
daiao f7841bcfde Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-10 15:42:41 +08:00
daiao a0c2282fba tpi评测优化 2017-08-10 15:42:27 +08:00
miss 03180ed0a9 动态加载修改 2017-08-10 15:41:19 +08:00
daiao 460be95e0e 评测区域优化 2017-08-10 11:17:16 +08:00
daiao dca686ef3a 测试日志 2017-08-10 10:12:08 +08:00
daiao 0cc5137704 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-10 09:44:59 +08:00
daiao ebe121bca7 实训TPI的评测区域 2017-08-10 09:38:22 +08:00
miss b146a2b014 返回值 2017-08-10 09:37:12 +08:00
caishi 4a217fd38a 班级、课程页面改版 2017-08-10 09:21:48 +08:00
daiao f7f7f59586 评测区域优化 2017-08-10 09:14:09 +08:00