 XuCheng642
|
efac20f6a6
|
单位搜索剔除当前
|
2017-10-13 18:49:10 +08:00 |
|
XuCheng642
|
ee9dc6c6aa
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/managements_controller.rb
app/views/users/show.html.erb
|
2017-10-12 17:01:44 +08:00 |
|
XuCheng642
|
c72c4d2076
|
单位修改
|
2017-10-12 16:53:00 +08:00 |
 daiao
|
424e8b2d34
|
实训管理员界面重置策略更换
|
2017-10-11 17:35:10 +08:00 |
 cxt
|
c69f9c9d9f
|
课程列表数据混乱，educoder创建的C++程序设计课程有多条记录
|
2017-10-10 15:59:52 +08:00 |
|
XuCheng642
|
ef6c3a443a
|
回复和点赞样式修改
|
2017-10-09 15:16:34 +08:00 |
|
cxt
|
aac531ca54
|
超级管理员的实训审批
|
2017-09-30 23:12:39 +08:00 |
 huang
|
2ee93c73f6
|
Merge branch 'dev_new_gitlab_huang' into develop
|
2017-09-30 16:48:40 +08:00 |
|
huang
|
5032b368f5
|
数据迁移及发布实训的时候不同步gitlab角色
|
2017-09-30 16:33:59 +08:00 |
|
XuCheng642
|
fbf3d3f747
|
作业回复链接
|
2017-09-29 21:53:08 +08:00 |
|
XuCheng642
|
811ea0f324
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/managements/_leave_message_list.html.erb
|
2017-09-29 20:18:23 +08:00 |
|
XuCheng642
|
d679111b41
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/shixuns/_shixun_top.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-29 16:35:44 +08:00 |
|
XuCheng642
|
cbb648dd40
|
自动授权列表
|
2017-09-29 16:18:41 +08:00 |
|
daiao
|
539902fa79
|
超级管理员导出EXCEL
|
2017-09-25 08:56:51 +08:00 |
|
XuCheng642
|
6f17f97c4d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:26:43 +08:00 |
|
XuCheng642
|
6a142641b6
|
管理员界面消息列表
|
2017-09-22 20:24:43 +08:00 |
|
huang
|
fddf4b302a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:04:49 +08:00 |
|
huang
|
a95cef0599
|
实训发布改成除了超级管理员外，其他成员不允许修改
|
2017-09-22 20:04:09 +08:00 |
|
XuCheng642
|
00eba5cc70
|
单位部门列表创建修改
|
2017-09-22 19:31:07 +08:00 |
|
XuCheng642
|
5cd22581ba
|
管理员界面修改
|
2017-09-22 18:40:22 +08:00 |
|
XuCheng642
|
ad993b64d1
|
管理员界面消息列表
|
2017-09-21 20:59:39 +08:00 |
|
XuCheng642
|
9791cec004
|
管理员界面issue解决
|
2017-09-18 15:38:59 +08:00 |
|
XuCheng642
|
4bc4225681
|
实名认证和职业认证搜索
|
2017-09-17 11:19:59 +08:00 |
|
XuCheng642
|
ac28f83271
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/controllers/managements_controller.rb
app/helpers/application_helper.rb
app/views/subjects/_subject_list.html.erb
config/routes.rb
|
2017-09-15 18:35:37 +08:00 |
|
daiao
|
0204232e49
|
导出excel
|
2017-09-15 10:39:07 +08:00 |
|
XuCheng642
|
d33e79dc86
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/controllers/managements_controller.rb
|
2017-09-14 19:30:36 +08:00 |
|
XuCheng642
|
f9e4385226
|
问题修改2017 09 11
|
2017-09-14 19:24:47 +08:00 |
|
cxt
|
d458bca09c
|
超级管理员的课堂列表的搜索修改
|
2017-09-12 16:31:56 +08:00 |
|
huang
|
f6a8a0f959
|
授权排序问题
|
2017-09-10 11:41:44 +08:00 |
|
huang
|
b208907aeb
|
用户页面排序问题
|
2017-09-10 11:26:19 +08:00 |
|
huang
|
f09411ef07
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-10 11:09:43 +08:00 |
|
huang
|
cdd2fc3deb
|
管理员界面用户排序问题
|
2017-09-10 11:09:20 +08:00 |
|
cxt
|
b2ec209f09
|
实名认证和职业认证的排序
|
2017-09-08 21:41:20 +08:00 |
|
cxt
|
3363e3234a
|
课堂列表的课程下拉列表
|
2017-09-08 20:57:56 +08:00 |
|
XuCheng642
|
a1bc1a4882
|
超级管理员
|
2017-09-08 19:13:27 +08:00 |
|
XuCheng642
|
c2f09a4989
|
issue修改
|
2017-09-08 18:35:45 +08:00 |
|
XuCheng642
|
d8974ef184
|
issue修改
|
2017-09-06 09:26:19 +08:00 |
|
XuCheng642
|
ce440ce6ec
|
修改
|
2017-09-03 14:08:44 +08:00 |
|
XuCheng642
|
ed8a1e4510
|
Merge branch 'dev_xucheng' into develop
Conflicts:
app/controllers/managements_controller.rb
app/views/courses/new.html.erb
app/views/users/show.html.erb
config/routes.rb
|
2017-09-01 19:44:19 +08:00 |
|
XuCheng642
|
bb9fb39396
|
缺陷修复
|
2017-09-01 19:37:09 +08:00 |
|
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 |