Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,715 Commits 2 Branches 0 Tags 163 MiB
Commit Graph

84 Commits

Author SHA1 Message Date
daiao d417ca0cf3 超级管理员的试用授权列表手动授权不应该在审批页面新增申请记录 2017-08-31 15:17:16 +08:00
daiao 4e35f0adf5 专业列表 2017-08-29 09:15:28 +08:00
daiao f3a4ca2a51 Merge branch 'dev_xucheng' into dev_daiao 
Conflicts:
	app/controllers/managements_controller.rb
	app/views/student_work/index.html.erb
	public/stylesheets/css/edu-common.css
 2017-08-29 09:14:22 +08:00
cxt 56f3259eb1 留言列表的序号显示 2017-08-28 18:37:17 +08:00
XuCheng642 e23dfaa2f8 issue解决 2017-08-28 17:00:44 +08:00
cxt a016624115 实训留言 2017-08-28 16:58:10 +08:00
cxt 088f12befe Merge branch 'dev_cxt' into develop 
Conflicts:
	config/routes.rb
 2017-08-28 16:29:50 +08:00
cxt 6b8d4079a2 实训留言列表 2017-08-28 16:27:46 +08:00
daiao 7e03296bea 管理员只看支撑实训 2017-08-27 11:18:18 +08:00
cxt 07b2c0319e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-25 20:21:02 +08:00
cxt 94a4bd8001 镜像管理的调整 2017-08-25 20:19:32 +08:00
XuCheng642 d0181f80b7 Merge branch 'dev_xucheng' into develop 2017-08-25 16:25:12 +08:00
cxt a944456e57 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/subjects/_subject_list.html.erb
 2017-08-25 16:13:46 +08:00
XuCheng642 f54453f32c 管理员界面新增专业 2017-08-25 16:11:35 +08:00
cxt 20b509a985 镜像管理的删除 2017-08-25 15:50:00 +08:00
cxt 71d8fd4420 镜像管理相关 2017-08-24 17:32:05 +08:00
XuCheng642 0d4c234d51 支撑实训和新增实训页面列表的修改 2017-08-24 11:32:48 +08:00
XuCheng642 bf01c1b4a8 issue的修改 2017-08-23 09:24:32 +08:00
XuCheng642 f4808de686 超级管理员页面部门删除 2017-08-18 17:57:08 +08:00
XuCheng642 208c21f761 超级管理员页面部门修改 2017-08-18 16:15:32 +08:00
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