Commit Graph

22022 Commits

Author SHA1 Message Date
XuCheng642 1240c50cb5 班级帖子发送样式 2017-09-15 18:17:19 +08:00
XuCheng642 d33e79dc86 Merge branch 'develop' into dev_xucheng
Conflicts:
	app/controllers/managements_controller.rb
2017-09-14 19:30:36 +08:00
XuCheng642 f9e4385226 问题修改2017 09 11 2017-09-14 19:24:47 +08:00
XuCheng642 2a2257e3ed Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-10 11:31:31 +08:00
XuCheng642 3a97d3e112 样式修改 2017-09-10 11:29:34 +08:00
huang a821e0a4b4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-10 11:26:36 +08:00
huang b208907aeb 用户页面排序问题 2017-09-10 11:26:19 +08:00
daiao 79f36d9537 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-10 11:21:29 +08:00
daiao a59393db0e 命令行重新链接,并自动聚焦 2017-09-10 11:21:16 +08:00
huang f09411ef07 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-10 11:09:43 +08:00
huang cdd2fc3deb 管理员界面用户排序问题 2017-09-10 11:09:20 +08:00
daiao 90f4d93e44 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 21:52:12 +08:00
daiao 303eaebda2 我的课堂标签修改 2017-09-08 21:51:57 +08:00
cxt 8a6e2ac0f0 在线课堂的全部课堂数量包含归档的 2017-09-08 21:44:46 +08:00
cxt b2ec209f09 实名认证和职业认证的排序 2017-09-08 21:41:20 +08:00
cxt 975b5eb740 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 21:21:16 +08:00
XuCheng642 857ce098b8 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 21:18:47 +08:00
XuCheng642 81b95162f9 阴影 2017-09-08 21:06:23 +08:00
cxt df83ea5d7f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:58:12 +08:00
cxt 3363e3234a 课堂列表的课程下拉列表 2017-09-08 20:57:56 +08:00
daiao c4f90858f4 缺陷修复 2017-09-08 20:49:25 +08:00
daiao f01fc7a981 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:45:34 +08:00
daiao 04af1c6582 上线缺陷修复 2017-09-08 20:45:18 +08:00
cxt c6a9bf4e10 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:38:11 +08:00
XuCheng642 0dd74a2b6e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 20:37:09 +08:00
XuCheng642 3041176da9 阴影 2017-09-08 20:31:52 +08:00
cxt f457d87755 实训首页的检索 2017-09-08 20:30:25 +08:00
cxt 1d61815e3d 实训作业的查看 2017-09-08 20:11:49 +08:00
daiao 7aa1e4e6ac Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:23:35 +08:00
daiao 02fcc3e9b0 实训头部按钮居中对齐 2017-09-08 19:23:24 +08:00
XuCheng642 b769ab9fc6 Merge branch 'dev_xucheng' into develop
Conflicts:
	public/stylesheets/css/edu-common.css
2017-09-08 19:20:14 +08:00
XuCheng642 c9467bbcb4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/controllers/managements_controller.rb
2017-09-08 19:18:44 +08:00
XuCheng642 a1bc1a4882 超级管理员 2017-09-08 19:13:27 +08:00
XuCheng642 dca722c5dd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into dev_xucheng
Conflicts:
	app/views/syllabuses/index.html.erb
2017-09-08 19:11:24 +08:00
daiao 93ad5e97fb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:02:55 +08:00
daiao 9732d958aa 提交评测报88后,上一关无法点击 2017-09-08 19:02:40 +08:00
cxt ef2c147820 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:01:27 +08:00
cxt f9209db7d2 实训路径删除章节后,后面的章节数字没有实时刷新 2017-09-08 18:59:51 +08:00
XuCheng642 c2f09a4989 issue修改 2017-09-08 18:35:45 +08:00
miss 0e26787d0d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 17:41:26 +08:00
miss 0ba7685bf3 issue修改 2017-09-08 17:41:05 +08:00
cxt f26beb7e18 在线课堂首页的500 2017-09-08 17:21:25 +08:00
cxt d6ae24539b 忘记密码的邮件标题错误 2017-09-08 17:14:08 +08:00
daiao df1e8988b3 实训发送至功能 2017-09-08 17:05:07 +08:00
caishi 8e52be3ddc 作业设置页面的边框 2017-09-08 17:03:19 +08:00
daiao 19c9e52aa4 测试集抛异常则不特殊处理空格 2017-09-08 16:22:51 +08:00
daiao 6ac212a849 Merge branch 'dev_xucheng' into develop 2017-09-08 15:55:18 +08:00
daiao f6f652f64c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:54:58 +08:00
miss 3a874f6cf1 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:53:21 +08:00
huang 2b1516558f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:53:47 +08:00