guange
|
e04f29aa44
|
json
|
6 years ago |
|
guange
|
7e35e1af0d
|
json
|
6 years ago |
|
guange
|
0a176e78ad
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
guange
|
5c0e656dd3
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
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 |
