Commit Graph

22226 Commits

Author SHA1 Message Date
cxt c8a484f109 删除分班后,左侧菜单栏没有刷新 2017-09-18 14:25:42 +08:00
cxt 0023e8b32f 在线课堂-作业挂起时请显示设置的发布时间 2017-09-18 10:42:30 +08:00
cxt 99922379a3 没有分班时,不会显示“未分班” 2017-09-18 10:00:23 +08:00
cxt d4a446db56 Merge branch 'develop' into dev_cxt 2017-09-18 09:42:28 +08:00
daiao 09b3e5dc46 测试集特殊字符匹配 2017-09-18 08:44:08 +08:00
daiao a44a8cf69a TPI评论数字为0不显示 2017-09-17 17:30:23 +08:00
daiao 7454ce85b7 实训测试集 2017-09-17 16:43:36 +08:00
daiao 752210f0fc 实际输出 2017-09-17 16:31:17 +08:00
daiao 068cb7b492 测试集匹配 2017-09-17 16:22:04 +08:00
daiao 41fa772329 TPI测试集 2017-09-17 16:12:57 +08:00
miss 19801dc7f4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 15:13:08 +08:00
miss 5ee33d6f8e 前端测试集的显示语提示语 2017-09-17 15:12:38 +08:00
caishi c5f4e729d9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 14:35:15 +08:00
caishi 9672076697 Merge branch 'dev_cs' into develop 2017-09-17 14:34:15 +08:00
caishi 349e2bed09 帖子详情回复 2017-09-17 14:33:45 +08:00
daiao dcc8fed7ec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 11:25:11 +08:00
daiao 055a254811 测试集样式修改 2017-09-17 11:24:57 +08:00
XuCheng642 a4480cf2ce Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 11:20:26 +08:00
XuCheng642 4bc4225681 实名认证和职业认证搜索 2017-09-17 11:19:59 +08:00
daiao 491076e8ae Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 11:08:41 +08:00
daiao 39064be34b 刷新测试集提示样式修改 2017-09-17 11:08:03 +08:00
caishi 152fce9d12 Merge branch 'develop' into dev_cs 2017-09-17 11:07:06 +08:00
caishi c465776416 帖子详情 2017-09-17 11:06:22 +08:00
daiao 738fd2f23e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 09:42:07 +08:00
daiao a6b99d1a90 实训添加合作者的身份不正确 2017-09-17 09:41:06 +08:00
cxt 0f3034e6c7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:31:35 +08:00
cxt 1f1fbbfb27 发送帖子失败 2017-09-15 23:31:22 +08:00
huang 6396517acb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:16:24 +08:00
huang aecf8bd3eb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:15:42 +08:00
huang a696e9d56d 解决实训发送只课堂500问题 2017-09-15 23:15:24 +08:00
caishi 8a330e0b04 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:14:55 +08:00
caishi 27645d172d 个人成长记录中心-金币 2017-09-15 23:14:17 +08:00
XuCheng642 2331dee38b Merge branch 'dev_xucheng' into develop 2017-09-15 23:13:58 +08:00
XuCheng642 50b1d6f5ed bug修复 2017-09-15 23:13:02 +08:00
huang 53bd0be8da Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:02:01 +08:00
cxt d3002e927e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:00:32 +08:00
cxt 292ea6f53c 火狐浏览器上传资源未刷新 2017-09-15 23:00:20 +08:00
caishi 20c816cab0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 22:59:24 +08:00
caishi efdf12c5f7 发送资源 2017-09-15 22:58:56 +08:00
cxt a412a42976 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/helpers/courses_helper.rb
2017-09-15 22:53:47 +08:00
cxt a6d393d3af 试用申请弹框修改 2017-09-15 22:51:32 +08:00
daiao fe26d183ab Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 22:48:58 +08:00
daiao 491d92848e 评论需要显示数目 2017-09-15 22:48:42 +08:00
caishi 174cca8e6d Merge branch 'dev_cs' into develop 2017-09-15 22:46:13 +08:00
caishi 9a7af9a50a Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 22:45:05 +08:00
caishi a4d0c65cad 课堂样式 2017-09-15 22:44:36 +08:00
cxt 9b52184106 我的题库页面的搜索,回车无效 2017-09-15 22:44:17 +08:00
huang 0dd61a03cd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 22:39:44 +08:00
huang 3a919c36d6 解决分班中导入数据点击没反应的问题 2017-09-15 22:39:27 +08:00
cxt 61f1d9bd10 课堂相关修改 2017-09-15 22:35:36 +08:00