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
|
33071e6cb4
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
66b12ec493
|
实训报告页面-图形统计页
|
6 years ago |
daiao
|
33e49c039b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
c267b69fea
|
迁移实训通关后没得分的记录
|
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
|
2f83f54915
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
de3c5e6d42
|
查看成绩，关卡耗时错误
|
6 years ago |
 杨树明
|
09f52a4a1b
|
build
|
6 years ago |
|
cxt
|
6411e81440
|
Merge branch 'educoder' into develop
|
6 years ago |
|
cxt
|
9fa4ac729f
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
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 |
|
guange
|
456ec13058
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
b7d2d9d189
|
remove index
|
6 years ago |
|
cxt
|
7e3a4ea2b6
|
合并
|
6 years ago |
|
cxt
|
519bee1851
|
调整
|
6 years ago |
|
杨树明
|
7c36bbc0fa
|
build
|
6 years ago |
|
杨树明
|
815d64936c
|
认证权限调整
|
6 years ago |
 hjm
|
731cf53ce1
|
Merge branch 'develop' into educoder
|
6 years ago |
|
hjm
|
fd6195b9c8
|
b
|
6 years ago |
|
hjm
|
e69de3d59b
|
2.“课堂”→“翻转课堂”
3.“精选实训”→“开发社区”
|
6 years ago |
|
杨树明
|
dcc04f5448
|
Merge branch 'develop' into educoder
|
6 years ago |
|
杨树明
|
d03e256822
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
6808284192
|
build
|
6 years ago |
|
cxt
|
f925960655
|
调整
|
6 years ago |
|
cxt
|
008a1412f1
|
Merge branch 'develop' into educoder
|
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 |
