Commit Graph

272 Commits

Author SHA1 Message Date
cxt 55ec4c32c8 题库新建实训作业的弹框调整、创建实训作业选择实训的导师姓名更改为“创建者” 2017-06-29 15:05:14 +08:00
cxt f7cb691c0f 申请发布按钮问题 2017-06-28 17:24:11 +08:00
cxt f6bd9846ec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-28 15:23:36 +08:00
cxt 5508cedb45 实训作业 2017-06-28 15:23:09 +08:00
cxt 83bc0cd443 已经身份认证的用户,基本资料页的相关项应该禁止修改 2017-06-27 10:43:49 +08:00
cxt dd4073cfbd 超级管理员的实训审批页面显示调整 2017-06-26 17:35:55 +08:00
daiao 700063fbac 顶部导航栏和课堂首页的文字变更 2017-06-26 11:07:05 +08:00
daiao e2c15578c4 Merge branch 'dev_daiao' into develop
Conflicts:
	app/controllers/managements_controller.rb
	config/routes.rb
2017-06-23 11:20:15 +08:00
daiao f59e7952b3 实训TPI的全部任务页面,关卡状态显示不够明显 2017-06-23 09:56:31 +08:00
cxt 0f804a7588 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/controllers/shixuns_controller.rb
	app/models/shixun.rb
2017-06-22 09:52:20 +08:00
daiao faf2a1300b Merge branch 'develop' into dev_daiao 2017-06-22 09:32:38 +08:00
daiao 6c95a2732a 用户授权列表 2017-06-22 09:31:08 +08:00
cxt 7dee11fe66 实训的流程更改 2017-06-21 17:26:49 +08:00
cxt 0aaf478ed2 课程资源库和题库的权限调整 2017-06-19 17:11:10 +08:00
cxt d1637b3cde 个人主页的tab样式与“我的实训”保持一致 2017-06-16 19:07:31 +08:00
cxt 44ce372cf4 智能课堂首页所有课程下拉选项需要向左边移一点,让两个所有课程对齐 2017-06-16 16:03:37 +08:00
cxt 3873223089 找回密码页面没有对齐 2017-06-16 15:59:22 +08:00
daiao 4584276cbd Merge branch 'dev_daiao' into develop 2017-06-16 15:33:31 +08:00
daiao b000a6ab77 editormd加入行内公式与多行公式。修复部分latex公式报错问题 2017-06-16 15:27:42 +08:00
cxt 1aa0ce78c3 新版题库 2017-06-16 15:18:41 +08:00
cxt 72369ff2fd 班级作业的设置和列表变更 2017-06-14 15:01:44 +08:00
cxt cb12147d11 作品补交、补交附件 2017-06-14 09:25:09 +08:00
daiao 7e8eb7eae5 我的留言页面去掉左侧栏,把留言提上来,1200宽 2017-06-13 14:45:11 +08:00
cxt a57b533be8 导入资源的页面,cheekbox和资源名称没有对齐 2017-06-12 14:29:36 +08:00
cxt 24364118af tab的样式调整 2017-06-12 11:04:12 +08:00
cxt e8ad9326ea Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-09 21:01:41 +08:00
cxt 6d9d66d2d5 在作业详情页面中多层回复的点赞回复操作应该隐藏,只有鼠标移动上去时才出现,效果见班级动态的回复 2017-06-09 18:09:31 +08:00
daiao d20693ecdb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-09 17:25:13 +08:00
daiao cf73698051 实训TPI参考答案与过关任务无法进行复制 2017-06-09 17:24:49 +08:00
huang 3b57616986 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/edu-class.css
2017-06-09 16:55:22 +08:00
huang 809a580cca 添加我的实训功能 2017-06-09 16:17:31 +08:00
daiao 6c3b482869 样式调整 2017-06-09 16:04:04 +08:00
cxt 1f04cd1285 作品评分 2017-06-08 17:39:29 +08:00
huang d888e3f140 热证一些修改 2017-06-08 11:17:29 +08:00
huang aaf1135e35 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/edu-common.css
2017-06-07 17:43:52 +08:00
huang 87071cacce 认证 2017-06-07 17:39:24 +08:00
Linda 5b6522b9c6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/courses.css
	public/stylesheets/css/public.css
2017-06-07 16:58:41 +08:00
Linda e2584d8293 班级资源页面的查询栏需要拉长,让导入和上传按钮置在右侧 2017-06-07 16:54:13 +08:00
cxt 25c0c9cab7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-07 16:19:48 +08:00
cxt f58ddd65a6 班级资源的导入资源改版 2017-06-07 16:19:23 +08:00
daiao f3d05b1ba6 试用授权相关的遮罩页面 2017-06-07 14:56:46 +08:00
cxt 077168328c 班级资源更新版本的弹框改版 2017-06-07 11:16:09 +08:00
huang db35db4378 身份认证 2017-06-06 17:38:10 +08:00
cxt 75b37651fa 班级资源页面的发送点击无效,应该与课程的选用按钮相类似 2017-06-06 17:20:33 +08:00
Linda c754bdd577 班级成员页、作业等页面的标题显示块不应该是灰色字体 2017-06-06 14:48:35 +08:00
Linda 435b291935 按照尹老师的意思是,换成2行,降低头部框子的整体高度 2017-06-06 14:43:04 +08:00
cxt ee536468f3 作业页面新建作业,没有选择类别就进行确定,给出的提示做一行显示在作业类别上方 2017-06-06 11:07:06 +08:00
daiao 5c39cd4836 实训列表与智慧课堂列表显示调整 2017-06-02 20:15:32 +08:00
daiao 9aa4471202 智能课堂首页的块状显示信息有误 2017-06-02 19:45:45 +08:00
Linda cb07526440 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-02 16:38:42 +08:00