Commit Graph

745 Commits

Author SHA1 Message Date
miss 9e3f46dc36 body的高度不足100%的问题以及无滚动内容出现滚动条的问题 2017-08-27 16:50:34 +08:00
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 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 0f3c884f0a 课程实训点击事件 2017-08-25 21:38:07 +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 efab84a950 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-25 19:56:33 +08:00
daiao ef0da2ebf6 修改上传附件删除按钮的位置 2017-08-25 19:56:17 +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
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 4d1ebe698d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-25 15:31:55 +08:00
daiao c87c73d2ee 实训添加合作者报500 2017-08-25 15:29:49 +08:00
miss d2ebf3281a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-25 15:20:57 +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
daiao 5b6156ff4c editormd开启HTML标签解析 2017-08-25 11:19:57 +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 49bbd36c12 实训套件的改版 2017-08-24 20:01:34 +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
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 0e456edf98 实训tpi页面,点击评测,在等待时间中点击全部任务,然后关闭弹出通过成功的提示,页面会有点样式性问题,点击网页后又恢复正常 2017-08-24 14:38:43 +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 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
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