 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 |
 daiao
|
5b6156ff4c
|
editormd开启HTML标签解析
|
2017-08-25 11:19:57 +08:00 |
|
cxt
|
71d8fd4420
|
镜像管理相关
|
2017-08-24 17:32:05 +08:00 |
|
XuCheng642
|
0d4c234d51
|
支撑实训和新增实训页面列表的修改
|
2017-08-24 11:32:48 +08:00 |
 huang
|
c48593f28a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-22 16:50:25 +08:00 |
|
huang
|
de1c18084a
|
gitlab hook路由定义
|
2017-08-22 16:50:07 +08:00 |
|
cxt
|
696545889b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-22 16:27:41 +08:00 |
|
cxt
|
78f1fd3d1d
|
增加试用申请的留言功能
|
2017-08-22 16:27:28 +08:00 |
|
huang
|
b836b09b6f
|
解决Post请求的时候经常莫名跳到个人主页（session失效问题，一段时间内没有请求）
|
2017-08-22 16:08:10 +08:00 |
|
huang
|
ffa69491bc
|
gitlab hook测试
|
2017-08-21 14:56:15 +08:00 |
|
huang
|
78c5559c2d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-21 14:41:47 +08:00 |
|
huang
|
859c6f99d3
|
测试gitlab hoook效果
|
2017-08-21 14:41:33 +08:00 |
|
XuCheng642
|
f4808de686
|
超级管理员页面部门删除
|
2017-08-18 17:57:08 +08:00 |
|
XuCheng642
|
208c21f761
|
超级管理员页面部门修改
|
2017-08-18 16:15:32 +08:00 |
|
XuCheng642
|
a47d2d8536
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 10:51:29 +08:00 |
|
XuCheng642
|
01bc990770
|
超级管理员页面功能修改
|
2017-08-18 09:41:06 +08:00 |
|
daiao
|
6e97c409ff
|
codepedia功能测试
|
2017-08-15 16:11:30 +08:00 |
|
daiao
|
5de3c44a95
|
codepedia登录验证
|
2017-08-15 15:12:16 +08:00 |
|
huang
|
355ffddbd4
|
Merge branch 'develop' into dev_kubernete
|
2017-08-11 20:14:37 +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 |
|
huang
|
1fee1dd7f9
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-11 17:15:39 +08:00 |
|
huang
|
cae49e2075
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-11 17:02:18 +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 |
|
huang
|
d92d4e8ee7
|
Merge branch 'develop' into dev_kubernete
Conflicts:
.idea/dataSources.xml
app/controllers/shixuns_controller.rb
|
2017-08-11 14:52:08 +08:00 |
|
huang
|
d036d6863f
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-11 14:50:56 +08:00 |
|
huang
|
f207d85e8a
|
新框架下已打过的实训数据迁移
|
2017-08-11 14:50:06 +08:00 |
|
cxt
|
2e55fd4a8f
|
请增加实训和实训套件的隐藏 功能
|
2017-08-11 14:43:14 +08:00 |
|
XuCheng642
|
d3a67b42b2
|
超级管理员相关页面
|
2017-08-11 11:27:04 +08:00 |
|
cxt
|
c22443b44f
|
个人成长中心记录功能的上线
|
2017-08-09 17:22:51 +08:00 |
|
huang
|
d1432495ec
|
Merge branch 'develop' into dev_kubernete
|
2017-08-04 20:42:16 +08:00 |
|
huang
|
39f5238080
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-04 20:40:08 +08:00 |
|
cxt
|
e15716ca91
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-04 16:35:13 +08:00 |
|
cxt
|
323ef492fe
|
实名认证和职业认证的后台管理页面
|
2017-08-04 16:34:58 +08:00 |
|
daiao
|
a8891d3d4f
|
Merge branch 'dev_daiao' into develop
Conflicts:
public/stylesheets/css/edu-public.css
|
2017-08-04 14:11:26 +08:00 |
|
cxt
|
c25b584898
|
实名认证和职业认证
|
2017-08-04 11:20:28 +08:00 |
|
daiao
|
397e59e5d1
|
html实训
|
2017-08-04 09:38:10 +08:00 |
|
huang
|
357b28aa13
|
修改启动的时候路由莫名走组织域名的问题
|
2017-08-04 09:16:55 +08:00 |
|
daiao
|
9991c1244a
|
用户关注与粉丝列表
|
2017-08-02 14:24:37 +08:00 |
|
huang
|
4e0dfe4952
|
Merge branch 'develop' into huang_k8s
|
2017-08-01 09:40:47 +08:00 |
|
XuCheng642
|
a24bd77cdc
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/managements/identity_authentication.html.erb
|
2017-07-31 17:43:59 +08:00 |
|
huang
|
33a6b154e6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 17:10:14 +08:00 |
|
huang
|
d8bd851597
|
Merge branch 'dev_xucheng' into develop
|
2017-07-28 17:09:36 +08:00 |
|
XuCheng642
|
f99121a353
|
修改单位列表
|
2017-07-28 17:01:42 +08:00 |
|
cxt
|
8f995d7b46
|
Merge branch 'dev_cxt' into develop
|
2017-07-28 17:00:27 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |