 cxt
|
33c19ff949
|
Merge branch 'dev_xucheng' into develop
|
2017-07-27 10:55:33 +08:00 |
 XuCheng642
|
a348d23889
|
超级管理员的实训课程列表bug修复
|
2017-07-27 10:32:55 +08:00 |
|
cxt
|
e9e4b7177e
|
Merge branch 'dev_xucheng' into develop
Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/managements/_shixun_authorization_list.html.erb
|
2017-07-27 09:49:02 +08:00 |
|
XuCheng642
|
0621ceb861
|
超级管理员页面修改
|
2017-07-27 09:45:31 +08:00 |
|
cxt
|
4a0d8ab856
|
实训套件的编辑
|
2017-07-26 19:05:46 +08:00 |
|
cxt
|
a48483ef69
|
实训套件的编辑页面
|
2017-07-26 18:57:08 +08:00 |
|
cxt
|
182dc3f421
|
实训申请发布
|
2017-07-26 15:15:47 +08:00 |
|
cxt
|
faff4c1960
|
Merge branch 'dev_cxt' into dev_cs
|
2017-07-26 14:43:19 +08:00 |
|
cxt
|
f1087cb441
|
实训套件模块的改版
|
2017-07-26 14:42:20 +08:00 |
 daiao
|
607ab2c767
|
添加日志
|
2017-07-25 16:55:52 +08:00 |
|
cxt
|
160e1514ca
|
实训套件新建流程和查看页面布局变更：Step1-增加新建独立页
|
2017-07-25 15:41:36 +08:00 |
|
daiao
|
010ebf29a2
|
实训套件创建数据不对
|
2017-07-24 17:19:25 +08:00 |
|
cxt
|
a8169c4353
|
首页班级数据分页不对
|
2017-07-24 16:54:18 +08:00 |
 caishi
|
6f84d188c6
|
Merge branch 'dev_cs' into develop
|
2017-07-24 16:43:53 +08:00 |
|
daiao
|
a199927172
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-24 16:42:59 +08:00 |
|
daiao
|
8b225ae48c
|
个人主页优化
|
2017-07-24 16:42:46 +08:00 |
|
cxt
|
36626155c6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-24 16:38:58 +08:00 |
|
caishi
|
8908f1279d
|
修复上线问题
|
2017-07-24 16:15:28 +08:00 |
|
cxt
|
4feb3586a7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/subjects_controller.rb
|
2017-07-24 15:09:07 +08:00 |
|
caishi
|
85ad576cfc
|
Merge branch 'dev_daiao' into dev_cs
|
2017-07-24 14:58:34 +08:00 |
|
cxt
|
26f68e019b
|
实训套件首页显示的数据应该包括只创建了套件但是没有添加阶段的数据
|
2017-07-24 14:58:27 +08:00 |
|
daiao
|
eec3e4617b
|
个人主页调整
|
2017-07-24 14:56:29 +08:00 |
|
caishi
|
f7ee05076b
|
Merge branch 'dev_daiao' into dev_cs
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2017-07-24 14:53:43 +08:00 |
|
daiao
|
0892eb1472
|
个人主页调整
|
2017-07-24 14:49:37 +08:00 |
|
caishi
|
d613e45635
|
Merge branch 'develop' into dev_cs
|
2017-07-24 10:58:56 +08:00 |
|
caishi
|
3410002b10
|
Merge branch 'dev_huang' into dev_cs
|
2017-07-24 10:53:36 +08:00 |
 huang
|
6c6b753ede
|
修复500问题
|
2017-07-23 19:33:36 +08:00 |
|
huang
|
e8f28a41cc
|
处理冲突
|
2017-07-23 19:17:29 +08:00 |
|
huang
|
3faff36f9d
|
更正一些统计
|
2017-07-23 19:08:10 +08:00 |
|
huang
|
d18114ea63
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-23 18:50:09 +08:00 |
|
huang
|
5f7774e400
|
实训课堂添加我已创建统计
|
2017-07-23 18:49:51 +08:00 |
|
huang
|
8835df6d28
|
个人主页问题
|
2017-07-23 18:11:02 +08:00 |
|
caishi
|
aabec8b8f0
|
一些修改
|
2017-07-23 16:54:26 +08:00 |
|
cxt
|
293997b2da
|
班级添加学生
|
2017-07-21 20:00:12 +08:00 |
|
cxt
|
879104fd16
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 18:32:50 +08:00 |
|
cxt
|
8a7fb09f4b
|
在题库中选用作业添加成功后，页面没有刷新，数据没有增加
|
2017-07-21 17:29:50 +08:00 |
|
daiao
|
1b55407a87
|
请在阶段详情的右侧增加显示“新建任务”“下一任务”（如果有的话）
|
2017-07-21 16:57:47 +08:00 |
|
XuCheng642
|
dce824cb1a
|
Merge branch 'develop' into dev_xucheng
Conflicts:
config/routes.rb
|
2017-07-21 15:28:29 +08:00 |
|
XuCheng642
|
4691ade586
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/managements_controller.rb
|
2017-07-21 15:27:53 +08:00 |
|
XuCheng642
|
7fd034ef7c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
config/routes.rb
|
2017-07-21 15:27:04 +08:00 |
|
daiao
|
1da8405726
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-21 15:26:28 +08:00 |
|
XuCheng642
|
01cff7d3e4
|
课程实训的管理员申请页面
|
2017-07-21 15:26:07 +08:00 |
|
daiao
|
ac6e9a755c
|
项目实训首页的筛选条件新增“所有状态”
|
2017-07-21 15:24:22 +08:00 |
|
caishi
|
eb58421cd1
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/users/show.html.erb
public/stylesheets/css/edu-common.css
public/stylesheets/css/edu-public.css
|
2017-07-21 15:21:55 +08:00 |
|
huang
|
36af526edb
|
单选答案新建
|
2017-07-21 15:11:20 +08:00 |
|
cxt
|
5118135c7d
|
班级左侧功能入口将作业按照类型分开直接显示
|
2017-07-21 15:01:14 +08:00 |
|
daiao
|
7c02bad6ca
|
查看归档点击后，显示的是归档课程，所以头部的“全部课堂”“我的课堂”最好也联动更新，使整个页面的数据和显示保持一致。返回后恢复
|
2017-07-21 14:27:54 +08:00 |
|
daiao
|
12a2ac8f79
|
个人主页TA的实训进行翻页不成功
|
2017-07-21 14:05:14 +08:00 |
|
daiao
|
0da01c5a33
|
超级管理员的用户列表增加“最后登录”，“创建时间”排序
|
2017-07-21 11:16:10 +08:00 |
|
huang
|
caeba91724
|
完成单选多选新建
|
2017-07-21 10:30:40 +08:00 |