 daiao
|
c728f4caa1
|
Merge branch 'develop' into dev_daiao
|
2017-09-30 22:35:10 +08:00 |
|
daiao
|
0878597cc4
|
贴吧样式冲突
|
2017-09-30 22:34:48 +08:00 |
|
daiao
|
236445e368
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 22:02:25 +08:00 |
|
daiao
|
880f9a7c06
|
还原TPI回复功能
|
2017-09-30 22:02:04 +08:00 |
|
daiao
|
49ffc348e2
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/games/_shixun_comment_list.html.erb
|
2017-09-30 21:40:23 +08:00 |
 huang
|
a3c8e28c52
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 21:40:12 +08:00 |
|
huang
|
a9c5a42594
|
实训修改代码不重置
|
2017-09-30 21:37:43 +08:00 |
|
daiao
|
112f350995
|
帖子回复功能
|
2017-09-30 21:34:57 +08:00 |
|
huang
|
2dd285f6e7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 21:06:25 +08:00 |
 cxt
|
7861ed7499
|
班级动态显示帖子菜单需要与帖子列表中的菜单保持一致
|
2017-09-30 21:02:18 +08:00 |
|
cxt
|
f4ba07cc82
|
学生匿评多次时，应该覆盖上一条评分，且给出提交弹框的内容改为“评分已更新”
|
2017-09-30 20:46:57 +08:00 |
|
daiao
|
e00bb90c23
|
Merge branch 'develop' into dev_daiao
Conflicts:
app/views/games/_shixun_comment_list.html.erb
app/views/layouts/_logined_header.html.erb
|
2017-09-30 19:51:30 +08:00 |
|
daiao
|
7dcc150a25
|
贴吧缺陷修复
|
2017-09-30 19:49:53 +08:00 |
|
huang
|
b2304597b4
|
实训路径文件目录选择
|
2017-09-30 19:25:35 +08:00 |
|
daiao
|
a5289610a3
|
实训TPI的回复
|
2017-09-30 19:23:38 +08:00 |
|
cxt
|
e88c3d97ac
|
在线课堂首页中我管理的数据应该与我的主页一致，显示身为管理员和教师的课堂
|
2017-09-30 19:05:41 +08:00 |
|
huang
|
47439cb94d
|
Merge branch 'develop' into dev_huang
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-09-30 18:43:16 +08:00 |
|
cxt
|
f9a8519cc1
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 18:41:14 +08:00 |
|
huang
|
1f51fa5a82
|
代码同步更新的一些修改
|
2017-09-30 18:39:51 +08:00 |
|
cxt
|
f85f9fe6a3
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 18:35:17 +08:00 |
|
huang
|
e38cee66b8
|
文件目录
|
2017-09-30 18:12:25 +08:00 |
|
cxt
|
b17305f848
|
bug修复
|
2017-09-30 17:38:17 +08:00 |
|
huang
|
2ee93c73f6
|
Merge branch 'dev_new_gitlab_huang' into develop
|
2017-09-30 16:48:40 +08:00 |
|
huang
|
90ade97d88
|
开启挑战的时候将educoder加入到myshixun中
|
2017-09-30 16:38:38 +08:00 |
|
cxt
|
0a5b79739a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 16:34:31 +08:00 |
|
huang
|
5032b368f5
|
数据迁移及发布实训的时候不同步gitlab角色
|
2017-09-30 16:33:59 +08:00 |
|
cxt
|
91ba070ca8
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/messages/_course_show.html.erb
app/views/student_work/index.html.erb
public/stylesheets/css/taskstyle.css
|
2017-09-30 16:33:07 +08:00 |
|
cxt
|
d38a301ca8
|
已发布的实训路径增加“撤销发布”功能
|
2017-09-30 16:30:49 +08:00 |
 miss
|
5afcbb72c6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/controllers/shixuns_controller.rb
# public/stylesheets/css/edu-public.css
|
2017-09-30 16:18:36 +08:00 |
|
huang
|
7588aa39a8
|
0
|
2017-09-30 16:10:37 +08:00 |
|
cxt
|
1b5b77b6c5
|
测验的编辑
|
2017-09-30 16:10:07 +08:00 |
|
huang
|
cba5c75ba0
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-09-30 15:37:01 +08:00 |
|
huang
|
b54362162c
|
Merge branch 'develop' into dev_huang
|
2017-09-30 15:36:48 +08:00 |
|
huang
|
b1e1ffcf80
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 15:33:48 +08:00 |
|
miss
|
c8262cfeaa
|
文件路径的弹框
|
2017-09-30 15:32:27 +08:00 |
|
huang
|
7904f693f0
|
更新代码效果
|
2017-09-30 15:29:46 +08:00 |
 caishi
|
cb16a1b4b7
|
Merge branch 'dev_new_gitlab_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_new_gitlab_huang
Conflicts:
app/controllers/games_controller.rb
|
2017-09-30 14:57:03 +08:00 |
|
caishi
|
f8320101a5
|
TPI遮罩层
|
2017-09-30 14:53:58 +08:00 |
|
cxt
|
799d97d640
|
老师评阅
|
2017-09-30 14:36:17 +08:00 |
|
huang
|
018e24d26e
|
克隆完成后删除代码
|
2017-09-30 14:33:01 +08:00 |
|
huang
|
a7251a950d
|
完成代码同步测试版
|
2017-09-30 11:30:51 +08:00 |
|
miss
|
88b5a20c47
|
分页个数
|
2017-09-30 10:50:12 +08:00 |
|
miss
|
adb0aa3f66
|
文件路径弹框
|
2017-09-30 10:48:43 +08:00 |
|
huang
|
3c19e12081
|
实训版本库代码同步功能
|
2017-09-30 10:42:26 +08:00 |
 XuCheng642
|
fbf3d3f747
|
作业回复链接
|
2017-09-29 21:53:08 +08:00 |
|
miss
|
aa9ab75149
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-29 21:11:25 +08:00 |
|
miss
|
12cebcb252
|
学员统计板块的金币值模块以及其它问题的修改。tip样式的增加与修改
|
2017-09-29 21:10:56 +08:00 |
|
XuCheng642
|
811ea0f324
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/managements/_leave_message_list.html.erb
|
2017-09-29 20:18:23 +08:00 |
|
XuCheng642
|
4617e8d803
|
自动授权学校
|
2017-09-29 18:44:40 +08:00 |
|
XuCheng642
|
231fa0dcf7
|
链接
|
2017-09-29 18:38:21 +08:00 |