 hjm
|
636d279656
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
b97bd045b8
|
注释
|
5 years ago |
|
hjm
|
ea64ba76ec
|
cdn
|
5 years ago |
|
hjm
|
ddef6b35d3
|
注释
|
5 years ago |
 杨树林
|
cbce386722
|
调整
|
5 years ago |
|
杨树林
|
975d721a07
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
0916cfe2de
|
调整
|
5 years ago |
 杨树明
|
1104f3cb2c
|
Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
|
5 years ago |
|
hjm
|
33287076d2
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
a1e96441fa
|
注释
|
5 years ago |
|
杨树明
|
38f2d849d0
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
60282764cf
|
调整竞赛不同状态下的提示
|
5 years ago |
|
hjm
|
22948e1f5e
|
左边被替换成了右边的内容
|
5 years ago |
|
杨树明
|
3815b70c79
|
qq登录
|
5 years ago |
|
hjm
|
d4a5e3d8f4
|
注释
|
5 years ago |
|
hjm
|
3754c78ffb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
4c7ba138af
|
层次结构
|
5 years ago |
|
杨树明
|
a671ce6699
|
调整实训配置的输入
|
5 years ago |
|
杨树明
|
6f154c0cc5
|
调整下载方式
|
5 years ago |
|
杨树明
|
ffb5a6835f
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
88f9b0897b
|
调整下载方式
|
5 years ago |
|
杨树明
|
04d20727ea
|
qq登录start
|
5 years ago |
|
杨树林
|
f001f9af33
|
调整竞赛
|
5 years ago |
|
杨树林
|
19b7b1f487
|
调整
|
5 years ago |
|
杨树林
|
b73478fff9
|
调整
|
5 years ago |
|
杨树林
|
c58bfe7a86
|
调整筛选条件
|
5 years ago |
|
杨树林
|
e6b489b6ca
|
调整
|
5 years ago |
 caishi
|
97b4eb8f38
|
Merge branch 'dev_auth' into dev_aliyun
|
5 years ago |
|
caishi
|
867e43149c
|
实名认证
|
5 years ago |
|
杨树林
|
3433cb4556
|
调整
|
5 years ago |
|
caishi
|
ec60699406
|
bug
|
5 years ago |
|
杨树明
|
d8815e40d8
|
Merge branches 'dev_aliyun' and 'dev_auth' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_auth
|
5 years ago |
|
杨树明
|
915dcbc374
|
调整
|
5 years ago |
|
杨树林
|
3fbd9511c6
|
调整
|
5 years ago |
|
杨树林
|
ce8f8eb217
|
Merge branch 'dev_auth' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_auth
|
5 years ago |
|
杨树林
|
b89f7c47c9
|
调整
|
5 years ago |
|
杨树明
|
0260362cf9
|
Merge remote-tracking branch 'origin/dev_auth' into dev_auth
|
5 years ago |
|
杨树明
|
1de0ede17d
|
调整
|
5 years ago |
|
杨树林
|
ccb72936eb
|
调整
|
5 years ago |
|
杨树林
|
fde9accae5
|
Merge branch 'dev_auth' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_auth
|
5 years ago |
|
杨树林
|
855a148f87
|
调整
|
5 years ago |
|
杨树明
|
dd74208183
|
Merge branch 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_auth
# Conflicts:
# public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js
# public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
|
5 years ago |
|
杨树明
|
936922ba6b
|
调整竞赛证书下载
|
5 years ago |
|
杨树林
|
cacd3e0788
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_auth
|
5 years ago |
|
杨树明
|
be0dabc7ec
|
实践课程增加二维码配置
|
5 years ago |
|
杨树林
|
65c7eecc25
|
调整
|
5 years ago |
|
杨树林
|
df6f4aeb09
|
调整
|
5 years ago |
|
杨树林
|
37f3fae030
|
合并
|
5 years ago |
|
杨树林
|
30e0c87fdd
|
合并
|
5 years ago |
|
杨树林
|
e5621720a8
|
合并
|
5 years ago |
|
杨树林
|
0973110722
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_auth
|
5 years ago |
|
杨树明
|
04943a2b2c
|
调整
|
5 years ago |
|
杨树明
|
210da882e2
|
调整
|
5 years ago |
|
杨树明
|
7b7c44fd18
|
竞赛报名调整
|
5 years ago |
|
杨树明
|
de8e126bf8
|
Merge branches 'dev_ysm' and 'jingsai01ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
|
5 years ago |
|
杨树明
|
ab502dbaf3
|
竞赛调整
|
5 years ago |
|
杨树明
|
4761a7fe23
|
Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
|
5 years ago |
|
杨树林
|
b7bedb5da8
|
竞赛个人信息完善实现
|
5 years ago |
|
caishi
|
ff0e5eff8a
|
admin-build
|
5 years ago |
|
杨树明
|
4ebb8306b9
|
调整导出
|
5 years ago |
|
杨树明
|
627d33453f
|
调整
|
5 years ago |
|
杨树明
|
9ff48085b0
|
调整
|
5 years ago |
|
杨树明
|
4210f684a4
|
调整
|
5 years ago |
|
杨树明
|
d615be0346
|
竞赛调整
|
5 years ago |
|
caishi
|
e0d518bd77
|
Merge branch 'dev_aliyun' into dev_auth
|
5 years ago |
|
caishi
|
b3f43afa43
|
实名认证和职业认证
|
5 years ago |
|
杨树明
|
aa63b997dd
|
获奖证书调整
|
5 years ago |
|
杨树明
|
a5c43f94b8
|
Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
|
5 years ago |
|
hjm
|
1d85f75471
|
tip
|
5 years ago |
|
杨树林
|
822bb8d0f5
|
合并其他分支
|
5 years ago |
|
杨树明
|
4892d4f987
|
调整
|
5 years ago |
|
杨树明
|
3a0bf1ab44
|
调整
|
5 years ago |
|
hjm
|
26c2b47dac
|
w
|
5 years ago |
|
杨树林
|
27bd2299c0
|
调整
|
5 years ago |
|
杨树明
|
9ac8efcc1f
|
Merge branches 'dev_ysm' and 'jingsai01ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
|
5 years ago |
|
杨树林
|
13c6ac08a8
|
Merge branch 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into jingsai01ysl
|
5 years ago |
|
杨树明
|
e1108f0f78
|
调整
|
5 years ago |
|
杨树林
|
783e7d1148
|
Merge branches 'dev_aliyun' and 'jingsai01ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into jingsai01ysl
|
5 years ago |
|
杨树明
|
3e2551e8b6
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
d067a5a67f
|
调整
|
5 years ago |
|
杨树林
|
bc4632b3f4
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
ffb297d2bb
|
调整参数
|
5 years ago |
|
杨树明
|
f0e2f17b17
|
调整
|
5 years ago |
|
杨树明
|
2f63dee3fe
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树林
|
485fd7c3b1
|
合并阿里云
|
5 years ago |
|
杨树明
|
cf7acf3d01
|
调整统计
|
5 years ago |
|
杨树林
|
5c89be3756
|
调整
|
5 years ago |
|
杨树林
|
5418fb7ae1
|
调整
|
5 years ago |
|
hjm
|
b9180e3b37
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
dba9145c5a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
a129027dd4
|
调整
|
5 years ago |
|
hjm
|
4b840c865c
|
read
|
5 years ago |
p31729568
|
acd8a0584f
|
admins: competition prize && competition prize api
|
5 years ago |
|
杨树林
|
f5fe485400
|
调整
|
5 years ago |
|
杨树林
|
2dc4664a2c
|
调整
|
5 years ago |
|
杨树林
|
b80cde484e
|
合并阿里云
|
5 years ago |
|
杨树林
|
fd293c0d44
|
调整实训作业设置
|
5 years ago |
|
杨树林
|
56c1c1d7e4
|
调整实训作业设置
|
5 years ago |
|
杨树明
|
b472f185e5
|
调整统计
|
5 years ago |
|
杨树明
|
60059a65b3
|
竞赛url 调整
|
5 years ago |
|
杨树林
|
8d71763adc
|
调整竞赛验证
|
5 years ago |
|
杨树明
|
6c987ce6f9
|
竞赛证书下载start
|
5 years ago |
|
杨树林
|
d9a3511ecc
|
调整
|
5 years ago |
|
杨树林
|
a16db93ec5
|
Merge branch 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into jingsai01ysl
|
5 years ago |
|
杨树明
|
cfeca3bacb
|
Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
|
5 years ago |
|
杨树林
|
87ba748a4e
|
合并
|
5 years ago |
|
杨树林
|
68c9a83308
|
aliyun
|
5 years ago |
|
杨树明
|
af8ab81146
|
调整
|
5 years ago |
|
杨树明
|
f868cac390
|
。
|
5 years ago |
|
杨树明
|
18fc207c35
|
调整试卷统计调分
|
5 years ago |
|
杨树明
|
7483e8c13f
|
调整
|
5 years ago |
|
杨树林
|
198a61fbf8
|
合并aliyun
|
5 years ago |
|
杨树明
|
e44dc226c7
|
课堂统计模块end
|
5 years ago |
|
杨树林
|
b97d360cf9
|
合并aliyun
|
5 years ago |
|
杨树林
|
381560af02
|
build
|
5 years ago |
|
杨树明
|
78a6a777cf
|
调整
|
5 years ago |
|
杨树明
|
2351c90862
|
调整
|
5 years ago |
|
杨树明
|
1014c5ef60
|
竞赛证书下载and完善个人资料start
|
5 years ago |
|
杨树林
|
07401a52cf
|
调整
|
5 years ago |
|
杨树林
|
830bc21661
|
调整
|
5 years ago |
|
杨树林
|
8b98534c39
|
调整
|
5 years ago |
|
杨树林
|
85fa848e12
|
调整
|
5 years ago |
|
杨树林
|
e38caf2dbc
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
4805538c77
|
调整
|
5 years ago |
|
杨树明
|
152b574458
|
调整
|
5 years ago |
|
杨树明
|
72c801c5cd
|
调整
|
5 years ago |
|
杨树明
|
e1d1ecd861
|
。
|
5 years ago |
|
杨树明
|
236a81f407
|
Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
c42f74700d
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
7a1b489094
|
试卷统计模块调整
|
5 years ago |
|
杨树林
|
c33ea90cb5
|
调整
|
5 years ago |
|
杨树林
|
61c30c407c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
900ee414e7
|
调整
|
5 years ago |
|
杨树明
|
d5bb6852af
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
5cec086da5
|
统计模块调整
|
5 years ago |
|
杨树林
|
e5e90f4489
|
调整新需求
|
5 years ago |
|
杨树林
|
3f3b597266
|
调整新需求
|
5 years ago |
|
杨树林
|
2192755b7e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
2328c928a3
|
调整新需求
|
5 years ago |
|
p31729568
|
8e87b085ad
|
admin: edit subject
|
5 years ago |
|
杨树林
|
6d04519e2b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
bda1eb5fdc
|
调整新需求
|
5 years ago |
|
杨树明
|
97967f300f
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
f51b6a7f77
|
统计模块，竞赛权限调整
|
5 years ago |
|
杨树林
|
070f707df6
|
Merge branches 'dev_aliyun' and 'yslshixunzuoye01' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
69f62645ae
|
调整参数
|
5 years ago |
|
p31729568
|
1bad07bc86
|
admin competition setting: manager select style
|
5 years ago |
|
p31729568
|
2db1e078d5
|
admins: subject list && admins sidebar logo modify
|
5 years ago |
|
杨树明
|
1e1cc79daa
|
调整竞赛权限
|
5 years ago |
|
杨树林
|
1d1e7ee57b
|
Merge branches 'dev_aliyun' and 'ysldev_aliyun_paixugai' of https://bdgit.educoder.net/Hjqreturn/educoder into ysldev_aliyun_paixugai
|
5 years ago |
