 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
|
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 |
|
daiao
|
29715236da
|
凡是没有权限的，要判断是否已经登陆
|
2017-09-15 22:30:26 +08:00 |
|
daiao
|
a4ce02dc37
|
我的主页，4个认真icon应该有链接进入想要的页面
|
2017-09-15 22:17:34 +08:00 |
|
daiao
|
ba10e51b6f
|
实训路径的icon数据对应为零，则不显示
|
2017-09-15 22:08:20 +08:00 |
|
daiao
|
6ea28b66b7
|
全部实训的首页，在tab右侧增加显示检索结构数量提示
|
2017-09-15 21:57:03 +08:00 |
|
daiao
|
cee7201934
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 21:42:17 +08:00 |
|
daiao
|
25475693ce
|
实训版本库的提交和分支应该是整块有点击事项，而不是只在数字上
|
2017-09-15 21:42:03 +08:00 |
 miss
|
50ccbbb9de
|
主页tab样式调整
|
2017-09-15 21:28:31 +08:00 |
|
cxt
|
cbef08f099
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 21:25:37 +08:00 |
|
cxt
|
3a394315a4
|
班级头部的学生列表链接更新
|
2017-09-15 21:25:16 +08:00 |
|
daiao
|
92e1a475bc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 21:14:26 +08:00 |
|
daiao
|
d03c4d568b
|
单选多选题缺陷修复
|
2017-09-15 21:14:17 +08:00 |
|
huang
|
5d1388f49d
|
Merge branch 'develop' into dev_cs
|
2017-09-15 21:14:01 +08:00 |
|
huang
|
3fb91e19a7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 21:13:32 +08:00 |
|
huang
|
bfe758be78
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/challenges/_single_or_multiple_question.html.erb
app/views/messages/_common_reply_box.html.erb
app/views/praise_tread/_edu_praise.html.erb
app/views/student_work/_common_reply_box.html.erb
|
2017-09-15 21:13:14 +08:00 |
|
huang
|
45e9155eb9
|
Merge branch 'dev_cs' into develop
|
2017-09-15 21:08:48 +08:00 |
|
cxt
|
be1e82a52b
|
gemfile
|
2017-09-15 21:07:47 +08:00 |
|
huang
|
17886c7313
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-09-15 21:06:59 +08:00 |
|
huang
|
04d2067b0e
|
解决版本库500问题
|
2017-09-15 21:06:42 +08:00 |