 cxt
|
1028e153fc
|
实名认证审批后刷新显示了其它用户的职业认证申请信息
|
2017-08-30 17:26:44 +08:00 |
|
cxt
|
c6cb7b8749
|
通过身份认证后，试用申请的弹框没有留言框了，且申请不成功，超级管理员页面没有收到申请，资料页面也没有申请提示
|
2017-08-30 17:02:29 +08:00 |
|
cxt
|
09f811ec7b
|
实训路径的教师团队当前用户可编辑自己的简介
|
2017-08-30 16:43:08 +08:00 |
|
cxt
|
75522ab120
|
在线课堂删除课程的联动更新：题库新建的tip和适用课程的输入可选列表，题库只显示普通和实训的作业
|
2017-08-30 14:39:44 +08:00 |
|
cxt
|
13d39379f8
|
Merge branch 'develop' into dev_cxt
|
2017-08-30 10:50:43 +08:00 |
|
cxt
|
07fad67259
|
在线课堂首页查看归档处，刷新页面后是没有归档的课堂，但是查询后就又跳到归档页面
|
2017-08-30 10:49:47 +08:00 |
 miss
|
1cab491884
|
样式的调整，部分issue
|
2017-08-29 18:52:20 +08:00 |
|
cxt
|
43eafaf095
|
新建课堂修删除专业等信息，简洁化
|
2017-08-29 17:31:28 +08:00 |
|
miss
|
9b84d664e5
|
平台tip的一些问题修改
|
2017-08-29 14:44:29 +08:00 |
|
cxt
|
bacf660f9a
|
Merge branch 'develop' into dev_cxt
|
2017-08-29 10:00:38 +08:00 |
|
miss
|
a280e2cc32
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-29 09:14:54 +08:00 |
|
miss
|
4c25c08ad4
|
调整
|
2017-08-29 09:14:14 +08:00 |
|
cxt
|
a21396e87b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 18:52:40 +08:00 |
 caishi
|
eacd5fcba6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 18:52:01 +08:00 |
|
caishi
|
ef6a8b0750
|
实训路径调整
|
2017-08-28 18:51:41 +08:00 |
|
cxt
|
56f3259eb1
|
留言列表的序号显示
|
2017-08-28 18:37:17 +08:00 |
|
cxt
|
800fe68a3a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 18:30:39 +08:00 |
|
caishi
|
b8378a9dad
|
Merge branch 'dev_cs' into develop
|
2017-08-28 18:30:00 +08:00 |
|
caishi
|
8f784e0f2f
|
实训课程样式
|
2017-08-28 18:28:29 +08:00 |
|
cxt
|
2e2b588eab
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 17:34:03 +08:00 |
|
miss
|
d24d927d8d
|
部分页面的鼠标样式的修改
|
2017-08-28 17:23:24 +08:00 |
|
cxt
|
f5035426c3
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 16:58:21 +08:00 |
|
cxt
|
a016624115
|
实训留言
|
2017-08-28 16:58:10 +08:00 |
|
caishi
|
69228ae935
|
Merge branch 'develop' into dev_cs
|
2017-08-28 16:57:59 +08:00 |
|
caishi
|
055636c8b3
|
技能标签
|
2017-08-28 16:56:31 +08:00 |
|
miss
|
2064a60464
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 16:55:35 +08:00 |
|
miss
|
9d94c7c34a
|
实训课程的间距和显示调整
|
2017-08-28 16:54:56 +08:00 |
|
miss
|
2166130469
|
间距调整
|
2017-08-28 16:39:42 +08:00 |
|
cxt
|
088f12befe
|
Merge branch 'dev_cxt' into develop
Conflicts:
config/routes.rb
|
2017-08-28 16:29:50 +08:00 |
|
cxt
|
ead24fad89
|
Merge branch 'dev_cs' into develop
|
2017-08-28 16:28:28 +08:00 |
|
cxt
|
6b8d4079a2
|
实训留言列表
|
2017-08-28 16:27:46 +08:00 |
|
caishi
|
41290a726c
|
实训留言
|
2017-08-28 16:26:26 +08:00 |
|
cxt
|
baa512e4d7
|
作业设置的相关修改
|
2017-08-28 15:02:54 +08:00 |
|
cxt
|
9927481c4a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 14:37:29 +08:00 |
 daiao
|
50b7656f41
|
我的实训页面已参与的时间排序不正确，与主页中我的实训排序不一致
|
2017-08-28 11:27:35 +08:00 |
|
caishi
|
1769dc856c
|
"已保存"tip
|
2017-08-28 11:15:33 +08:00 |
|
daiao
|
3796777e2d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 11:12:02 +08:00 |
|
daiao
|
e1f3ad3489
|
技能标签失去焦点保存
|
2017-08-28 11:11:49 +08:00 |
|
miss
|
eb2b736c45
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 11:10:44 +08:00 |
|
miss
|
4c0b2fc3a8
|
实训课程的学习须知，底部间距与头部间距保持一致 ，平台首页的相关tip更换新样式
|
2017-08-28 11:10:17 +08:00 |
|
cxt
|
f012b27751
|
只绑定了手机号码，实训首页新建实训时给出去绑定邮箱的提示后需要新开窗口
|
2017-08-28 10:47:45 +08:00 |
|
daiao
|
18b4055ef7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 10:47:18 +08:00 |
|
daiao
|
883e249ec7
|
我的主页中实训完成情况和左侧菜单栏中的“我的实训”完成情况都与实训tpm页面的完成情况不一致
|
2017-08-28 10:47:03 +08:00 |
|
caishi
|
61f2749d1b
|
Merge branch 'dev_cs' into develop
|
2017-08-28 10:02:45 +08:00 |
|
caishi
|
5789a6bea5
|
底部距离
|
2017-08-28 10:01:48 +08:00 |
|
caishi
|
432faaeb30
|
Merge branch 'dev_cs' into develop
|
2017-08-28 09:58:45 +08:00 |
|
caishi
|
42f8b944a8
|
去掉老师职称
|
2017-08-28 09:57:38 +08:00 |
|
cxt
|
30e316f56b
|
实训路径增加合作成员
|
2017-08-28 09:49:51 +08:00 |
|
cxt
|
c39473f94e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-28 09:39:07 +08:00 |
|
caishi
|
ac293a3fdb
|
Merge branch 'develop' into dev_cs
|
2017-08-28 09:39:00 +08:00 |