 cxt
|
0d6746b5c2
|
Merge branch 'dev_xucheng' into develop
|
2017-08-18 14:01:10 +08:00 |
|
cxt
|
f25324e23d
|
Merge branch 'dev_cxt' into develop
|
2017-08-18 14:00:11 +08:00 |
 XuCheng642
|
bb4e90ca7b
|
部门的审批
|
2017-08-18 10:50:35 +08:00 |
|
XuCheng642
|
01bc990770
|
超级管理员页面功能修改
|
2017-08-18 09:41:06 +08:00 |
 huang
|
1344f4aa82
|
修复一次性添加多个合作者，部分合作者不成功问题
|
2017-08-18 09:25:51 +08:00 |
|
huang
|
7ec2cf834f
|
删除组员的时候同步gitlab数据
|
2017-08-17 17:27:35 +08:00 |
|
huang
|
f2fe59ed0f
|
添加实训合作者，数据同步github
|
2017-08-17 17:18:30 +08:00 |
|
huang
|
90c01ff9d8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-17 16:09:06 +08:00 |
|
huang
|
62aa1e28c6
|
实训合作者添加按”login“”mail“搜索结果
|
2017-08-17 16:08:48 +08:00 |
|
cxt
|
ecfee445c3
|
复选框列表在翻页后原来页的选择被丢掉了
|
2017-08-16 17:34:25 +08:00 |
|
cxt
|
b4e454dc8b
|
技能标签的翻页有问题
|
2017-08-16 15:41:56 +08:00 |
 daiao
|
59c39f8c10
|
测试
|
2017-08-15 17:36:19 +08:00 |
|
daiao
|
504f220382
|
codepedia测试
|
2017-08-15 17:24:39 +08:00 |
|
daiao
|
41d38ac4e5
|
codepedia测试
|
2017-08-15 17:09:50 +08:00 |
|
daiao
|
f2161e83e5
|
codepedia测试
|
2017-08-15 17:00:30 +08:00 |
|
daiao
|
6e97c409ff
|
codepedia功能测试
|
2017-08-15 16:11:30 +08:00 |
|
daiao
|
5de3c44a95
|
codepedia登录验证
|
2017-08-15 15:12:16 +08:00 |
|
cxt
|
e00c4363d9
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-15 10:33:27 +08:00 |
|
cxt
|
a95d86f3c7
|
不包含实践任务的实训在点击模拟实战时报错
|
2017-08-15 10:14:01 +08:00 |
|
daiao
|
11325d3e9b
|
新建实训需要先绑定邮箱
|
2017-08-15 09:57:03 +08:00 |
|
cxt
|
f6cc62dec0
|
已经职业认证了，点击重新认证，在部门中进行添加新的部门，但是没有点击确认提交，刷新页面后部门修改成新添加的部门
|
2017-08-15 09:55:44 +08:00 |
|
daiao
|
4e5f9ab43e
|
新建实训需要绑定邮箱
|
2017-08-15 09:15:09 +08:00 |
|
huang
|
771863e009
|
修改实训post中间层uri转换方式
|
2017-08-13 10:48:05 +08:00 |
|
huang
|
7a73f13441
|
实训评测
|
2017-08-11 22:50:24 +08:00 |
|
huang
|
11088c8eb0
|
Merge branch 'dev_kubernete' into develop
|
2017-08-11 22:13:27 +08:00 |
|
daiao
|
d1984b226b
|
金币、经验值的局部刷新
|
2017-08-11 22:03:25 +08:00 |
|
huang
|
86ba839bd5
|
Merge branch 'develop' into dev_kubernete
|
2017-08-11 20:47:26 +08:00 |
|
huang
|
5db74ddee4
|
webssh与中间层对接
|
2017-08-11 20:45:51 +08:00 |
|
daiao
|
0a20e01e02
|
评测后实训最终得分没变
|
2017-08-11 20:30:14 +08:00 |
|
huang
|
355ffddbd4
|
Merge branch 'develop' into dev_kubernete
|
2017-08-11 20:14:37 +08:00 |
|
daiao
|
d37bb1c131
|
实训单选多选题评测报错
|
2017-08-11 20:10:45 +08:00 |
|
huang
|
cbc342ad23
|
实训迁移增加可定义字段及超级管理员权限
|
2017-08-11 20:03:33 +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
|
a0453dadd0
|
实训关卡调整
|
2017-08-11 19:56:27 +08:00 |
|
daiao
|
6bf0a8658e
|
实训更新排序不对
|
2017-08-11 19:29:44 +08:00 |
|
huang
|
572b367218
|
解决上线文件报错问题
|
2017-08-11 17:21:25 +08:00 |
|
huang
|
1fee1dd7f9
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-11 17:15:39 +08:00 |
|
cxt
|
009761abde
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/controllers/shixuns_controller.rb
app/views/challenges/_content_list.html.erb
|
2017-08-11 16:29:30 +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 |
|
huang
|
54aa793385
|
实训迁移完整版
|
2017-08-11 15:15:07 +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
|
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 |
|
huang
|
62029067e6
|
url中间层添加encode安全传送
|
2017-08-10 16:53:32 +08:00 |
|
huang
|
f0dcd2a175
|
game评测的时候异常打印
|
2017-08-10 16:29:16 +08:00 |
|
huang
|
2fe2b9a825
|
Merge branch 'develop' into dev_kubernete
Conflicts:
app/controllers/shixuns_controller.rb
|
2017-08-10 16:19:03 +08:00 |