 cxt
|
ab8a8bfebc
|
发布实训作业时，点击确认按钮后弹框没有消失导致可以点击无数次，生成多条一样的数据
|
2017-09-30 16:49:24 +08:00 |
|
cxt
|
0a5b79739a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 16:34:31 +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
|
05f4fff34f
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
|
2017-09-30 16:31:18 +08:00 |
|
cxt
|
d38a301ca8
|
已发布的实训路径增加“撤销发布”功能
|
2017-09-30 16:30:49 +08:00 |
 caishi
|
7771a83ea9
|
删除选项
|
2017-09-30 16:30:43 +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 |
|
miss
|
48cbae56a3
|
fork按钮的位置问题
|
2017-09-30 16:13:45 +08:00 |
|
cxt
|
1b5b77b6c5
|
测验的编辑
|
2017-09-30 16:10:07 +08:00 |
 huang
|
8855b87aef
|
更新提示添加判断
|
2017-09-30 15:34:52 +08:00 |
|
huang
|
b1e1ffcf80
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 15:33:48 +08:00 |
|
huang
|
44c4f4a3a9
|
Merge branch 'dev_new_gitlab_huang' into develop
|
2017-09-30 15:33:34 +08:00 |
|
huang
|
7904f693f0
|
更新代码效果
|
2017-09-30 15:29:46 +08:00 |
|
caishi
|
5734398b38
|
去掉讨论-帖子列表里面的帖子总数
|
2017-09-30 15:07:33 +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
|
3b25304329
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/exercise/student_exercise_list.html.erb
|
2017-09-30 14:38:16 +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
|
4da74f872c
|
TPM的tip
|
2017-09-30 11:29:30 +08:00 |
|
miss
|
88b5a20c47
|
分页个数
|
2017-09-30 10:50:12 +08:00 |
|
huang
|
3c19e12081
|
实训版本库代码同步功能
|
2017-09-30 10:42:26 +08:00 |
|
caishi
|
25691d9c65
|
论坛帖子详情显示
|
2017-09-30 09:33:38 +08:00 |
|
caishi
|
2266ff1eae
|
动态新建
|
2017-09-29 22:04:47 +08:00 |
|
caishi
|
9f8a01aa0a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-29 22:02:26 +08:00 |
|
caishi
|
ca2ddbb90c
|
动态新建
|
2017-09-29 22:01:56 +08:00 |
 XuCheng642
|
2689e95638
|
Merge branch 'dev_xucheng' into develop
|
2017-09-29 21:57:09 +08:00 |
|
XuCheng642
|
2e8151b123
|
Merge branch 'develop' into dev_xucheng
|
2017-09-29 21:56:46 +08:00 |
|
XuCheng642
|
3424b03f77
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-29 21:56:16 +08:00 |
|
XuCheng642
|
39c2e4ee18
|
Merge branch 'dev_xucheng' into develop
|
2017-09-29 21:55:48 +08:00 |
|
XuCheng642
|
368d19fc73
|
Merge branch 'develop' into dev_xucheng
|
2017-09-29 21:55:26 +08:00 |
|
XuCheng642
|
601ddd46f6
|
Merge branch 'dev_xucheng' into develop
|
2017-09-29 21:54:55 +08:00 |
|
caishi
|
4ee161c720
|
新建话题回车事件
|
2017-09-29 21:53:20 +08:00 |
|
XuCheng642
|
fbf3d3f747
|
作业回复链接
|
2017-09-29 21:53:08 +08:00 |
|
caishi
|
246783284c
|
Merge branch 'dev_daiao' into develop
|
2017-09-29 21:49:33 +08:00 |
|
caishi
|
0e933e3393
|
Merge branch 'dev_cs' into develop
|
2017-09-29 21:48:30 +08:00 |
|
caishi
|
3e6bc1894a
|
论坛列表
|
2017-09-29 21:46:49 +08:00 |
|
caishi
|
a0de6028e7
|
合作者弹框
|
2017-09-29 21:35:43 +08:00 |
|
caishi
|
82890205c5
|
Merge branch 'develop' into dev_cs
|
2017-09-29 21:23:27 +08:00 |
|
caishi
|
bb5dc3af6f
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/messages/_common_reply_box.html.erb
|
2017-09-29 21:18:50 +08:00 |
|
caishi
|
7f489fddc8
|
问吧样式、链接修改
|
2017-09-29 21:15:48 +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
|
50f72b6f96
|
Merge branch 'develop' into dev_xucheng
|
2017-09-29 20:26:18 +08:00 |
|
XuCheng642
|
7738fe021a
|
Merge branch 'dev_xucheng' into develop
|
2017-09-29 20:24:58 +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 |
|
caishi
|
cd3c25d600
|
编辑试卷
|
2017-09-29 19:25:06 +08:00 |
|
XuCheng642
|
917b41ac0f
|
Fork功能缺陷修复
|
2017-09-29 19:22:54 +08:00 |
|
XuCheng642
|
4617e8d803
|
自动授权学校
|
2017-09-29 18:44:40 +08:00 |