 caishi
|
8908f1279d
|
修复上线问题
|
2017-07-24 16:15:28 +08:00 |
|
caishi
|
85ad576cfc
|
Merge branch 'dev_daiao' into dev_cs
|
2017-07-24 14:58:34 +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 |
|
daiao
|
1da8405726
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-21 15:26:28 +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 |
|
daiao
|
06f73b6c82
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/shixuns/_form.html.erb
|
2017-07-21 10:00:45 +08:00 |
|
daiao
|
8f5111c3a0
|
5个tab
|
2017-07-21 09:12:42 +08:00 |
|
huang
|
0bb0ac1774
|
讨论区列表页面功能完善
|
2017-07-20 17:51:31 +08:00 |
|
huang
|
b83a333a9d
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/shixuns/index.html.erb
|
2017-07-20 17:19:46 +08:00 |
|
daiao
|
c1933b5608
|
项目实训的阶段内容划分5个tab进行编辑
|
2017-07-20 16:25:44 +08:00 |
|
cxt
|
9185ec12ff
|
课程实训的申请发布功能请补上
|
2017-07-20 15:51:55 +08:00 |
|
caishi
|
f3fd5a521d
|
班级讨论区页面
|
2017-07-20 15:48:49 +08:00 |
|
cxt
|
97b303fa99
|
将我的题库中的数据设为公开，点击确定后跳转500
|
2017-07-20 14:17:03 +08:00 |
|
cxt
|
24a3fdc453
|
个人资料的真实姓名增加“隐藏真实姓名”选项
|
2017-07-20 11:14:46 +08:00 |
|
cxt
|
482022a58a
|
TPI评论区操作按钮的显隐
|
2017-07-20 09:21:12 +08:00 |
|
cxt
|
b86b465a76
|
TPI的问题反馈更新为“评论”，直接在TPI中显示评论tab
|
2017-07-19 17:26:22 +08:00 |
|
daiao
|
3aa8f4344e
|
在实训配置页面点击继续实战，跳转的页面给出页面已删除
|
2017-07-19 11:59:00 +08:00 |
|
daiao
|
7051b5f912
|
项目实训最热排名应该按人数进行降序排列
|
2017-07-19 10:13:36 +08:00 |
|
daiao
|
75930637c0
|
个人主页列表细分tab显示
|
2017-07-18 15:24:12 +08:00 |
|
cxt
|
816e6d605e
|
基本资料增加“昵称”，个人主页显示“昵称”
|
2017-07-18 14:47:50 +08:00 |
|
cxt
|
9f1ee5e5da
|
first_level_discipline_id
|
2017-07-18 09:31:56 +08:00 |
|
daiao
|
65331b99f5
|
课程实训首页的“查看归档”功能
|
2017-07-17 16:14:09 +08:00 |
|
cxt
|
f110f7b7b5
|
班级设置页面添加学生点击搜索按钮无数据显示
|
2017-07-17 15:29:24 +08:00 |
|
cxt
|
c25255dfd6
|
删除实训时关联删除课程实训
|
2017-07-17 10:51:37 +08:00 |
|
cxt
|
a513ad0b5a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 17:03:41 +08:00 |
|
cxt
|
4068a9e952
|
班级作业从题库选用，都选后导入的是多个同一作业
|
2017-07-14 15:53:26 +08:00 |
|
cxt
|
60eab2a755
|
用户试用被拒绝后，重新申请可以一直申请，且超级管理员审批页面没有收到申请信息、试用授权的审批页面，点击同意后没有刷新
|
2017-07-14 15:41:31 +08:00 |
|
daiao
|
c7999cb682
|
缺陷修复
|
2017-07-14 15:39:27 +08:00 |