Commit Graph

354 Commits

Author SHA1 Message Date
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
daiao 91d3bc04b5 个人主页的课堂列表和实训列表底部的“点击查看全部”更换成换页 2017-06-14 10:27:49 +08:00
cxt cb12147d11 作品补交、补交附件 2017-06-14 09:25:09 +08:00
daiao 5c071fe236 实训首页的搜索框删除关键字后点击搜索页面不刷新 2017-06-13 17:22:42 +08:00
daiao 7e8eb7eae5 我的留言页面去掉左侧栏,把留言提上来,1200宽 2017-06-13 14:45:11 +08:00
daiao fcb4289c5b 关卡查看页的编辑入口请变更为醒目的按钮样式 2017-06-13 10:14:11 +08:00
cxt f77b829fdc 作业详情页面的头部样式需和我的实训页面样式一样 2017-06-12 17:33:28 +08:00
cxt da87db878b 邮箱注册的调整 2017-06-12 16:02:07 +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 b00818d427 作业评分设置的完善 2017-06-09 20:45:04 +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 ac843971a0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-09 16:55:56 +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
cxt 0981868aaa Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-09 16:54:51 +08:00
huang 809a580cca 添加我的实训功能 2017-06-09 16:17:31 +08:00
daiao 6c3b482869 样式调整 2017-06-09 16:04:04 +08:00
cxt a86d2bf7fe 作业列表页面除了提交状态的可以导出作品,其他状态的点击导出作品无效果 2017-06-09 15:21:05 +08:00
cxt 6a4ba18126 作业设置的完善 2017-06-09 11:19:14 +08:00
cxt 1f04cd1285 作品评分 2017-06-08 17:39:29 +08:00
cxt 9e9772b24d 去掉课程名称的前后空白符 2017-06-08 15:03:13 +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
cxt be5ba44a5a 班级资源的上传资源弹框改版 2017-06-07 15:24:19 +08:00
daiao f3d05b1ba6 试用授权相关的遮罩页面 2017-06-07 14:56:46 +08:00
cxt 077168328c 班级资源更新版本的弹框改版 2017-06-07 11:16:09 +08:00
daiao 9ea224a01c 试用授权相关的遮罩页面 2017-06-07 10:19:55 +08:00
huang db35db4378 身份认证 2017-06-06 17:38:10 +08:00
cxt 75b37651fa 班级资源页面的发送点击无效,应该与课程的选用按钮相类似 2017-06-06 17:20:33 +08:00
daiao 7bd26663e1 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-06 15:33:03 +08:00
daiao 90ff5f1b33 codemirror自动补全功能 2017-06-06 15:32:40 +08:00
Linda cfe9d64181 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-06 14:52:00 +08:00
Linda c754bdd577 班级成员页、作业等页面的标题显示块不应该是灰色字体 2017-06-06 14:48:35 +08:00
Linda 435b291935 按照尹老师的意思是,换成2行,降低头部框子的整体高度 2017-06-06 14:43:04 +08:00
daiao 61b759e0ff Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-06 14:18:12 +08:00
daiao 9c2180c97f codemirror加入自动补全功能 2017-06-06 14:17:07 +08:00
Linda b6f5a1bdaa 身份认证的认证中状态需要与其它状态区分显示 2017-06-06 11:30:11 +08:00
cxt ee536468f3 作业页面新建作业,没有选择类别就进行确定,给出的提示做一行显示在作业类别上方 2017-06-06 11:07:06 +08:00
cxt 6fc34f0ad0 班级设置中的班级名称,框内例子与框外提示不一致,请按第二张图进行修改 2017-06-05 16:45:00 +08:00