 caishi
|
2cd6edbcdc
|
无论用户是否创建了实训，均可以新建实训套件 (新页面)
|
2017-07-25 09:19:35 +08:00 |
|
caishi
|
947c274ac5
|
作业设置阴影
|
2017-07-24 16:30:34 +08:00 |
|
caishi
|
8908f1279d
|
修复上线问题
|
2017-07-24 16:15:28 +08:00 |
|
caishi
|
17060561d6
|
个人主页样式修改
|
2017-07-24 15:34:18 +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 |
|
caishi
|
ae432bf679
|
各模块首页的显示文字微调
顶部导航栏文字修整
|
2017-07-24 14:50:46 +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 |
|
caishi
|
5d958c6207
|
公开班级中的邀请码提示语的位置需与班级的邀请码提示语位置一致
|
2017-07-24 10:15:57 +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
|
bcd1eb13e9
|
隐藏数据
|
2017-07-23 18:56:24 +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 |
|
caishi
|
1c1e8ae0cb
|
显示问题
|
2017-07-23 18:47:52 +08:00 |
|
caishi
|
59d74ad33b
|
显示错误
|
2017-07-23 18:43:43 +08:00 |
|
huang
|
13eba36519
|
0
|
2017-07-23 18:35:22 +08:00 |
|
huang
|
441b98b0e1
|
样式问题
|
2017-07-23 18:30:42 +08:00 |
|
huang
|
9bb0d45821
|
yangshi
|
2017-07-23 18:18:33 +08:00 |
|
huang
|
d1a6367b17
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-23 18:16:00 +08:00 |
|
huang
|
8835df6d28
|
个人主页问题
|
2017-07-23 18:11:02 +08:00 |
|
caishi
|
73c25ffe3e
|
样式修改
|
2017-07-23 17:20:58 +08:00 |
|
caishi
|
5d3637a25b
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/courses/index.html.erb
app/views/layouts/_unlogin_header.html.erb
|
2017-07-23 16:56:35 +08:00 |
|
caishi
|
aabec8b8f0
|
一些修改
|
2017-07-23 16:54:26 +08:00 |
|
caishi
|
03e9580dc5
|
班级添加学生弹框样式问题
|
2017-07-23 09:17:46 +08:00 |
|
caishi
|
a536e03d1a
|
新建实训里面提示信息的及时隐藏
|
2017-07-23 08:50:52 +08:00 |
|
daiao
|
f0ba2272fc
|
webssh上线
|
2017-07-22 10:59:42 +08:00 |
 miss
|
e7d07cd366
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 21:55:58 +08:00 |
|
miss
|
3e4d4a7ce0
|
拖拽效果的增加
|
2017-07-21 21:50:50 +08:00 |
 cxt
|
0d4c954bc2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 21:33:17 +08:00 |
|
caishi
|
141f648687
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 21:32:56 +08:00 |
|
caishi
|
962b796816
|
课程下拉框加阴影
|
2017-07-21 21:32:15 +08:00 |
|
cxt
|
9a3fca4507
|
添加学生报500
|
2017-07-21 21:31:32 +08:00 |
|
daiao
|
23da44f766
|
分班学生搜素
|
2017-07-21 21:17:14 +08:00 |
|
caishi
|
d7ca578d46
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 20:43:08 +08:00 |
|
cxt
|
d5fd92ffe4
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 20:41:43 +08:00 |
|
daiao
|
23c3e71062
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 20:41:29 +08:00 |
|
daiao
|
4d6c8c9316
|
阶段详情页面
|
2017-07-21 20:41:13 +08:00 |
|
caishi
|
a4dd6fea5a
|
及时隐藏提示信息
|
2017-07-21 20:34:42 +08:00 |
|
cxt
|
09fabcc998
|
课堂教学改为实训课堂
|
2017-07-21 20:29:39 +08:00 |
|
caishi
|
7de61c528d
|
Merge branch 'develop' into dev_cs
|
2017-07-21 20:21:05 +08:00 |
|
caishi
|
30b11f244e
|
搜索icon的颜色
|
2017-07-21 20:20:04 +08:00 |
|
cxt
|
5efbc2cb20
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 20:00:25 +08:00 |
|
cxt
|
293997b2da
|
班级添加学生
|
2017-07-21 20:00:12 +08:00 |
|
daiao
|
5914cf35f1
|
Merge branch 'dev_cs' into develop
|
2017-07-21 19:59:55 +08:00 |
|
caishi
|
462a5b3cd6
|
样式修改以及新建实训阶段部分的修改
|
2017-07-21 19:48:49 +08:00 |