 XuCheng642
|
bb4e90ca7b
|
部门的审批
|
2017-08-18 10:50:35 +08:00 |
|
XuCheng642
|
01bc990770
|
超级管理员页面功能修改
|
2017-08-18 09:41:06 +08:00 |
|
XuCheng642
|
541573fd2a
|
超级管理员页面的调整
|
2017-08-11 20:03:16 +08:00 |
|
XuCheng642
|
976c7f405a
|
Merge branch 'develop' into dev_xucheng
|
2017-08-11 20:00:01 +08:00 |
|
XuCheng642
|
22387dfdcf
|
添加专业
|
2017-08-11 19:59:19 +08:00 |
 cxt
|
139a0597d8
|
Merge branch 'dev_xucheng' into develop
Conflicts:
app/views/layouts/base_management.html.erb
app/views/managements/_class_shixuns_list.html.erb
app/views/managements/_users_authorization_list.html.erb
app/views/managements/identity_authentication.html.erb
app/views/managements/shixun_authorization.html.erb
app/views/managements/subject_authorization.html.erb
config/routes.rb
public/javascripts/edu/account.js
public/javascripts/edu/syllabus.js
|
2017-08-11 15:20:56 +08:00 |
|
XuCheng642
|
5d202914a6
|
增加实训适用课程弹框
|
2017-08-11 15:04:14 +08:00 |
|
cxt
|
2e55fd4a8f
|
请增加实训和实训套件的隐藏 功能
|
2017-08-11 14:43:14 +08:00 |
|
XuCheng642
|
d3a67b42b2
|
超级管理员相关页面
|
2017-08-11 11:27:04 +08:00 |
|
cxt
|
323ef492fe
|
实名认证和职业认证的后台管理页面
|
2017-08-04 16:34:58 +08:00 |
|
XuCheng642
|
ca20c827f6
|
超级管理员页面
|
2017-07-31 17:41:42 +08:00 |
|
XuCheng642
|
f99121a353
|
修改单位列表
|
2017-07-28 17:01:42 +08:00 |
|
XuCheng642
|
67dd627a2d
|
超级管理员清除功能
|
2017-07-28 15:27:34 +08:00 |
|
XuCheng642
|
a348d23889
|
超级管理员的实训课程列表bug修复
|
2017-07-27 10:32:55 +08:00 |
|
XuCheng642
|
0621ceb861
|
超级管理员页面修改
|
2017-07-27 09:45:31 +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
|
01cff7d3e4
|
课程实训的管理员申请页面
|
2017-07-21 15:26:07 +08:00 |
 daiao
|
0da01c5a33
|
超级管理员的用户列表增加“最后登录”，“创建时间”排序
|
2017-07-21 11:16:10 +08:00 |
|
XuCheng642
|
f11a305ecb
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/models/syllabus.rb
app/views/managements/shixuns.html.erb
|
2017-07-20 14:37:28 +08:00 |
|
XuCheng642
|
b97e935cf8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/managements_controller.rb
config/routes.rb
|
2017-07-20 14:36:24 +08:00 |
|
XuCheng642
|
ba4910c33d
|
管理员相关界面
|
2017-07-20 14:34:44 +08:00 |
|
XuCheng642
|
a8fc640b2e
|
管理员界面实训课堂相关页面html
|
2017-07-18 14:45:23 +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
|
60eab2a755
|
用户试用被拒绝后，重新申请可以一直申请，且超级管理员审批页面没有收到申请信息、试用授权的审批页面，点击同意后没有刷新
|
2017-07-14 15:41:31 +08:00 |
|
daiao
|
c7999cb682
|
缺陷修复
|
2017-07-14 15:39:27 +08:00 |
|
XuCheng642
|
fd9dd1b3df
|
Merge branch 'develop' into dev_xucheng
Conflicts:
public/stylesheets/css/edu-admin.css
|
2017-07-14 15:28:23 +08:00 |
|
XuCheng642
|
ae5df8e76b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/managements_controller.rb
app/views/layouts/base_management.html.erb
config/routes.rb
|
2017-07-14 15:25:13 +08:00 |
|
XuCheng642
|
bbf694b5bb
|
管理员界面部门相关界面
|
2017-07-14 15:22:35 +08:00 |
|
XuCheng642
|
0efc59e580
|
管理员 单位界面
|
2017-07-13 15:05:10 +08:00 |
|
daiao
|
49277f39a1
|
超级管理员的实训菜单“已关闭实训
|
2017-07-13 09:48:17 +08:00 |
|
daiao
|
f8095f5bcc
|
超级管理员的实训菜单“已发布实训”
|
2017-07-12 16:23:57 +08:00 |
|
daiao
|
096b44e350
|
管理员实训列表
|
2017-07-10 16:41:15 +08:00 |
|
daiao
|
2a2dd216b7
|
webssh+管理员实训页面
|
2017-07-10 15:13:11 +08:00 |
 huang
|
535e8b7da9
|
管理员界面添加webssh选中功能
|
2017-07-07 17:22:50 +08:00 |
|
huang
|
f0bfcd9a16
|
管理员界面添加实训功能
|
2017-07-07 16:02:55 +08:00 |
|
huang
|
65302fbc1d
|
Merge branch 'develop' into dev_cs
|
2017-07-07 15:43:49 +08:00 |
|
huang
|
d4c5d8b10e
|
admin 添加认证
|
2017-07-07 15:41:02 +08:00 |
|
daiao
|
e2ccab60d6
|
管理员用户列表
|
2017-07-04 10:40:17 +08:00 |
|
daiao
|
0bdd38d264
|
管理员用户列表页面
|
2017-07-04 09:51:51 +08:00 |
|
huang
|
414c0870ce
|
实训审批排序
|
2017-06-30 15:35:30 +08:00 |
|
cxt
|
bf599d6767
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-30 14:10:01 +08:00 |
|
cxt
|
0685feaf68
|
申请发布被超级管理员拒绝时，因系统消息未上，请将拒绝原因以留言的形式发送给整个合作团队的成员
|
2017-06-30 10:17:44 +08:00 |
|
daiao
|
289ff1a329
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/users/_my_homepage_shixuns_list.html.erb
|
2017-06-30 09:54:09 +08:00 |
|
cxt
|
7188f24d56
|
超级管理员实现发布审批页，点击审批操作后，页面没有刷新列表
|
2017-06-29 10:43:05 +08:00 |
|
cxt
|
0dd677602d
|
超级管理员身份认证，待审批和已审批不能正常切换
|
2017-06-29 09:59:59 +08:00 |
|
cxt
|
5508cedb45
|
实训作业
|
2017-06-28 15:23:09 +08:00 |
|
cxt
|
dd4073cfbd
|
超级管理员的实训审批页面显示调整
|
2017-06-26 17:35:55 +08:00 |
|
daiao
|
b513a17858
|
试用授权的已审批页面请按照审批时间倒序显示，15条翻页
|
2017-06-26 15:42:17 +08:00 |
|
daiao
|
4ecb40e483
|
管理员界面手机用户搜索
|
2017-06-23 16:27:56 +08:00 |