guange
|
6f15d83b87
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
 huang
|
0e445b3209
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
0f4886906a
|
ecloud授权和取消授权的一些修改
|
6 years ago |
 cxt
|
b0386586c9
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
d52fec1f51
|
超级管理员的课堂列表导出时会有部分数据缺失
|
6 years ago |
|
huang
|
f1a3459a83
|
.
|
6 years ago |
|
huang
|
7e6c250e7b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
5113d5cb36
|
ecloud_user添加status标记
|
6 years ago |
 caishi
|
66b12ec493
|
实训报告页面-图形统计页
|
6 years ago |
|
caishi
|
2627a5da13
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
fab470bc0a
|
实训报告页面
|
6 years ago |
|
huang
|
7e168f42a6
|
测试
|
6 years ago |
|
huang
|
d6a20f1cae
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
e7298c7d6f
|
ecloud
|
6 years ago |
|
cxt
|
f1e0510b3b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
618fc93c80
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
guange
|
166332c936
|
.
|
6 years ago |
|
huang
|
6121b985f0
|
ecloud一些修改
|
6 years ago |
|
cxt
|
de3c5e6d42
|
查看成绩，关卡耗时错误
|
6 years ago |
|
cxt
|
1f6da8629f
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
Conflicts:
app/views/common/index.html.erb
public/react/build/asset-manifest.json
public/react/build/index.html
public/react/build/service-worker.js
public/react/build/static/js/12.db6c3c0e.chunk.js
public/react/build/static/js/12.db6c3c0e.chunk.js.map
public/react/build/static/js/17.45b7dec5.chunk.js
public/react/build/static/js/17.45b7dec5.chunk.js.map
public/react/build/static/js/main.32605315.js.map
public/react/build/static/js/main.a9947884.js.map
public/react/build/static/js/main.ea3ca4b2.js
public/react/build/static/js/main.ea3ca4b2.js.map
|
6 years ago |
|
cxt
|
7e3a4ea2b6
|
合并
|
6 years ago |
 杨树明
|
7c36bbc0fa
|
build
|
6 years ago |
 hjm
|
fd6195b9c8
|
b
|
6 years ago |
|
hjm
|
e69de3d59b
|
2.“课堂”→“翻转课堂”
3.“精选实训”→“开发社区”
|
6 years ago |
|
杨树明
|
d03e256822
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
6808284192
|
build
|
6 years ago |
|
cxt
|
e1e02682d7
|
隐藏学年的导出
|
6 years ago |
|
cxt
|
84b16ed361
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
1d71d9ddff
|
调整
|
6 years ago |
|
杨树明
|
35b3872b51
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
9b37e699d0
|
build
|
6 years ago |
|
cxt
|
02c008f696
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
febf6555a9
|
调整
|
6 years ago |
|
杨树明
|
6ad7734813
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
7047360b63
|
build
|
6 years ago |
|
cxt
|
c595ef49b3
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
bbc2c6c387
|
权限调整
|
6 years ago |
|
杨树明
|
5edaa19761
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
1193340214
|
build
|
6 years ago |
|
cxt
|
8470090933
|
调整
|
6 years ago |
|
cxt
|
28aca2571a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
f588b0d765
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
e274be5924
|
sign验证
|
6 years ago |
|
cxt
|
e58d7693ec
|
调整
|
6 years ago |
|
huang
|
e816387170
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
b72c93074a
|
ecloud相关接口修正
|
6 years ago |
|
杨树明
|
81c0906734
|
build
|
6 years ago |
|
cxt
|
649e2a7ba6
|
调整
|
6 years ago |
|
cxt
|
81ab00f482
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
e40adab480
|
调整
|
6 years ago |
|
杨树明
|
e4caf5da9d
|
build
|
6 years ago |
|
cxt
|
5adf21dffc
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
a3c7087a48
|
调整
|
6 years ago |
|
jingquan huang
|
5fee87148a
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
ec87aef778
|
认证
|
6 years ago |
|
cxt
|
7970754e84
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
a9c5b791b5
|
调整
|
6 years ago |
|
杨树明
|
f57f7813bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
afe9158b0f
|
工程认证权限调整
|
6 years ago |
|
jingquan huang
|
d1925971f7
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
82a1a21993
|
签名认证
|
6 years ago |
|
cxt
|
1fb0c4771a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
f9351e259d
|
调整
|
6 years ago |
|
jingquan huang
|
91c95a7988
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
9f0e30676c
|
ecloud认证
|
6 years ago |
daiao
|
d97281b04d
|
Merge branch 'educoder' into develop
|
6 years ago |
|
daiao
|
7d6c48e86c
|
【认证】工程认证的界别复制，没有复制毕业要求 vs 培养目标和 毕业要求 vs 通用标准两个矩阵
|
6 years ago |
|
cxt
|
4859ce7046
|
权限调整
|
6 years ago |
|
cxt
|
2fcc555ada
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
a05f1f4739
|
访问权限的判断
|
6 years ago |
|
cxt
|
b1a79f27ca
|
Merge branch 'educoder' into develop
|
6 years ago |
|
daiao
|
eb6f911df5
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
hjm
|
6d92d7700a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
bcdbd5a74d
|
工程认证问题
|
6 years ago |
|
hjm
|
916b27d3ca
|
b
|
6 years ago |
|
cxt
|
2f9860d05c
|
专业管理员无删除权限
|
6 years ago |
|
cxt
|
a17d9f2126
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
eab8ccec8b
|
权限调整
|
6 years ago |
|
guange
|
e5252fa87e
|
获取用户信息
|
6 years ago |
|
hjm
|
280d1c8d24
|
b
|
6 years ago |
|
guange
|
2cd1ce8171
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
325f5c9b15
|
获取用户信息
|
6 years ago |
|
hjm
|
6885ce6cdf
|
b
|
6 years ago |
|
guange
|
ddba3d844d
|
获取用户信息
|
6 years ago |
|
guange
|
9fd268b7d8
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
d2f8f13237
|
增加签名
|
6 years ago |
|
huang
|
4d5716ea97
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
19ece63edb
|
移动云联调相关
|
6 years ago |
|
guange
|
cfcd3fef14
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
杨树明
|
3097a01b7b
|
工程认证
|
6 years ago |
|
guange
|
9d349fe567
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
defbbe1c84
|
ecloud oauth2认证
|
6 years ago |
|
杨树明
|
71b3b1ce4a
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
97179ce628
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
afa8d8f1f3
|
调整
|
6 years ago |
|
jingquan huang
|
befe1381c5
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
8267a5645e
|
企业开通
|
6 years ago |
|
daiao
|
4fa4e2d199
|
在接口里增加指示点内容 （后端增加参数）
|
6 years ago |
|
cxt
|
3bd2a00768
|
重置myshixun时更新用户关联的作业
|
6 years ago |
|
caishi
|
ff0115675c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
3957f5b94c
|
课程体系列表-评价结果显示错误
|
6 years ago |
|
jingquan huang
|
cb73a97425
|
接口调试
|
6 years ago |
jasder duan
|
354d51ce1a
|
Merge
|
6 years ago |
|
jasder duan
|
9ed8741829
|
FIX 解决冲突文件
|
6 years ago |
|
jingquan huang
|
3afe376f94
|
ecloud表结构调整
|
6 years ago |
|
huang
|
784172afcb
|
..
|
6 years ago |
|
huang
|
a49e220b1c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
265a928109
|
ecloud相关表结构
|
6 years ago |
|
daiao
|
4aadc998b9
|
允许跳关的实训参数调整
|
6 years ago |
|
daiao
|
1d53060af9
|
工程认证相关任务
|
6 years ago |
|
caishi
|
54061e6a7a
|
工程认证首页列表-专业列表的点击事件
|
6 years ago |
|
hjm
|
9d245f3922
|
b
|
6 years ago |
|
daiao
|
cb4ecb8a0f
|
调试问题
|
6 years ago |
|
jingquan huang
|
528996f57d
|
业务开通接口
|
6 years ago |
|
jingquan huang
|
d58ddee8d3
|
ecloud params
|
6 years ago |
|
jingquan huang
|
9cf02eaf28
|
oauth test
|
6 years ago |
|
daiao
|
b136a7a13d
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
582e8921db
|
通关却没有获得金币
|
6 years ago |
|
jingquan huang
|
c8e7166d02
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
045b8f7655
|
单点登录初步
|
6 years ago |
|
jingquan huang
|
f59338005b
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
fa1af83d6d
|
参考答案前端显示问题
|
6 years ago |
|
daiao
|
d26c4a62ba
|
通过却没有得到金币奖励
|
6 years ago |
|
jingquan huang
|
da14bbed6f
|
通关没加金币的问题
|
6 years ago |
|
jingquan huang
|
bdbb982cf1
|
金币
|
6 years ago |
|
jingquan huang
|
6d944721a8
|
答案问题
|
6 years ago |
|
jingquan huang
|
a95dc01665
|
ecloud
|
6 years ago |
|
jingquan huang
|
acf3296533
|
Merge branch 'develop'
|
6 years ago |
|
jingquan huang
|
7293589da5
|
ecloud
|
6 years ago |
|
cxt
|
bc0c8e5171
|
调整
|
6 years ago |
|
cxt
|
a3caf72e24
|
调整
|
6 years ago |
|
cxt
|
1208818c9d
|
优化
|
6 years ago |
|
cxt
|
dd4513f66c
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
14ef994d84
|
优化
|
6 years ago |
|
daiao
|
7e4bdd51ab
|
实训路径到处增加课程体系和实训的发布时间
|
6 years ago |
|
daiao
|
4fe0bdb620
|
实训首页无权限
|
6 years ago |
|
daiao
|
b2db87cb02
|
实训首页问题
|
6 years ago |
|
daiao
|
3f09af9dbb
|
实训课程首页权限控制
|
6 years ago |
|
daiao
|
68301f5d4e
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
5e029c5e67
|
实训路径权限问题
|
6 years ago |
|
huang
|
61dbb622d6
|
500问题
|
6 years ago |
|
daiao
|
729c079738
|
删除gpid为空的myshixun
|
6 years ago |
|
cxt
|
93f6a3e187
|
Merge branch 'develop' into educoder
|
6 years ago |
|
cxt
|
a64df6da3b
|
课堂继续实战按钮的调整
|
6 years ago |
|
cxt
|
fa54a0be3d
|
课堂继续挑战实训的链接调整
|
6 years ago |
|
cxt
|
57dfad1799
|
调整
|
6 years ago |
|
cxt
|
d6384b7313
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
e5165d1e28
|
增加删除弹框提示
|
6 years ago |
|
daiao
|
cca7aabf84
|
实训课程关联课程体系
|
6 years ago |
|
daiao
|
08a4357405
|
实训课程等级系统页面
|
6 years ago |
|
cxt
|
49a794f11a
|
现在版-在线课堂的实训作业子目录增加删除功能-本周上线
|
6 years ago |
|
cxt
|
39c6daf466
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
dbddd9ddc8
|
（超级管理员）系统升级通知的页面调整
|
6 years ago |
|
huang
|
c9d91b02d3
|
averge_star问题
|
6 years ago |
|
huang
|
480e9724f2
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
8478f9c3b4
|
member_count问题
|
6 years ago |
|
caishi
|
073d9dc523
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
1ca34ce817
|
超级管理员实训课程配置--添加等级体系的配置
|
6 years ago |
|
huang
|
4c8ac8a8b6
|
..
|
6 years ago |
|
caishi
|
5191b8524c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
92af24b8e3
|
镜像区分主次
|
6 years ago |
|
caishi
|
0b23356298
|
超级管理员实训课程等级体系
|
6 years ago |
|
huang
|
b1c0c19265
|
门户首页优化
|
6 years ago |
|
huang
|
4e6e724dca
|
个人主页性能优化
|
6 years ago |
|
cxt
|
739e560a40
|
调整
|
6 years ago |
|
cxt
|
d23e266f58
|
调整
|
6 years ago |
|
caishi
|
7c25621ddc
|
系统通知页面位置
|
6 years ago |
|
caishi
|
e4f786fecf
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
f3a3ebe543
|
系统升级通知页面
|
6 years ago |
|
cxt
|
e7205ddc5a
|
鹏程访问实训页面
|
6 years ago |
|
杨树明
|
54bb513255
|
工程认证输入框的样式问题修复
|
6 years ago |
|
caishi
|
f9354923a5
|
实训配置编辑评测脚本超出范围
|
6 years ago |
|
daiao
|
ce12c48584
|
无法注册用户
|
6 years ago |
 daiao
|
29e661019b
|
解决线上冲突
|
6 years ago |
|
daiao
|
db1f99cb13
|
第一次上线
|
6 years ago |
|
daiao
|
7b1f61a514
|
第一次版本
|
6 years ago |
