 杨树林
|
ee6a347659
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
55a4642325
|
竞赛
|
5 years ago |
 杨树明
|
c862d9cc7f
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
b4eb273367
|
调整
|
5 years ago |
|
杨树林
|
f42d2b005c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
6a74ee462f
|
竞赛
|
5 years ago |
|
杨树明
|
0aeba06ec0
|
调整
|
5 years ago |
|
杨树明
|
2b7b8dc241
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
31d8afe13e
|
调整
|
5 years ago |
cxt
|
2354ce36af
|
调整
|
5 years ago |
|
杨树林
|
b9be6b1dc5
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
8c8f1e26b5
|
竞赛
|
5 years ago |
|
杨树明
|
ddc7e4397c
|
调整
|
5 years ago |
|
杨树明
|
c49ba5c762
|
调整竞赛
|
5 years ago |
|
杨树明
|
229bc0d3ac
|
调整
|
5 years ago |
|
杨树明
|
3f27d4e57d
|
Merge branches 'dev_aliyun' and 'yslcompetition' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
 hjm
|
1cb3fdd962
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
8846c9e998
|
var editor_monaco = window.editor_monaco;
|
5 years ago |
|
杨树林
|
6014a6a56d
|
竞赛
|
5 years ago |
|
杨树林
|
6a6c65f192
|
竞赛
|
5 years ago |
|
杨树明
|
52a82382c8
|
调整
|
5 years ago |
|
杨树明
|
7b60c0f896
|
Merge branches 'dev_aliyun' and 'yslcompetition' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
e4fe5807c0
|
竞赛
|
5 years ago |
|
杨树明
|
96ae845e89
|
Merge branches 'dev_aliyun' and 'yslcompetition' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
e51312f005
|
竞赛22
|
5 years ago |
|
杨树明
|
e7dad06de2
|
合并
|
5 years ago |
|
hjm
|
a6ad7db235
|
insertSpaces
|
5 years ago |
|
杨树林
|
3eca36d5be
|
竞赛21
|
5 years ago |
|
杨树林
|
84463cea47
|
竞赛21
|
5 years ago |
|
杨树林
|
2e2fe14ff4
|
Merge branches 'dev_aliyun', 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树林
|
91f4f9df34
|
竞赛20
|
5 years ago |
|
杨树明
|
ddf7bbfcbf
|
调整导航栏切换编辑
|
5 years ago |
|
杨树明
|
57690077a2
|
调整
|
5 years ago |
|
杨树明
|
1a40972f80
|
Merge branches 'dev_aliyun', 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
ee9c926193
|
排行榜mdend
|
5 years ago |
p31729568
|
6a9c5096dc
|
admins: fix
|
5 years ago |
|
杨树林
|
a8c55e8b28
|
Merge branches 'dev_aliyun', 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树林
|
f39566075d
|
竞赛
|
5 years ago |
|
杨树明
|
e9e9ba9d69
|
竞赛详情头部调整
|
5 years ago |
|
杨树明
|
4c1d173e5e
|
Merge branches 'dev_aliyun', 'develop', 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
3542fbc875
|
竞赛详情头部调整
|
5 years ago |
|
杨树明
|
86c1c370be
|
头部调整
|
5 years ago |
|
杨树林
|
062ed74966
|
Merge branch 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树林
|
34c3e693e1
|
竞赛
|
5 years ago |
|
杨树明
|
40d8a39d3d
|
竞赛内容end
|
5 years ago |
|
杨树明
|
ef0880b9d2
|
Merge branches 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
dd25f38b8f
|
竞赛内容end
|
5 years ago |
|
杨树林
|
c13dfbaa5b
|
竞赛
|
5 years ago |
|
杨树明
|
3a0dea5f48
|
Merge branches 'dev_aliyun', 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树林
|
8007cf0145
|
竞赛
|
5 years ago |
|
杨树明
|
b48bd3aabb
|
调整
|
5 years ago |
|
cxt
|
5f5cfb4c24
|
tiaozheng
|
5 years ago |
|
杨树明
|
03230f3e18
|
Merge branch 'yslcompetition' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树林
|
cfd9e4f6c0
|
竞赛
|
5 years ago |
|
杨树明
|
dd4ce9cf20
|
Merge branches 'dev_aliyun', 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
54ac91e349
|
调整竞赛详情页
|
5 years ago |
|
杨树林
|
bb1cee4d86
|
竞赛15
|
5 years ago |
|
p31729568
|
06e727839e
|
assets precompile
|
5 years ago |
|
杨树林
|
a8be9376c0
|
竞赛14
|
5 years ago |
|
杨树林
|
afb17b85f9
|
Merge branch 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树林
|
3b81009251
|
竞赛13
|
5 years ago |
|
杨树林
|
289913d939
|
tiaozheng12
|
5 years ago |
|
杨树林
|
ae71c3e075
|
tiaozheng
|
5 years ago |
|
杨树明
|
857c6bf587
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
0bab45a6f5
|
调整
|
5 years ago |
|
p31729568
|
a547aebe0b
|
admins: add school name and hidden phone to laboratory users add modal
|
5 years ago |
|
杨树明
|
d01ba55704
|
调整
|
5 years ago |
|
杨树明
|
91a21c3132
|
Merge branches 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
46567871bd
|
调整
|
5 years ago |
|
杨树林
|
b1658ead34
|
tiaozheng
|
5 years ago |
|
杨树林
|
e010ed0a89
|
jingsai.10 图片资源优化
|
5 years ago |
|
杨树明
|
627f1fb838
|
调整
|
5 years ago |
|
杨树明
|
0cdd8a6a40
|
Merge branches 'dev_aliyun' and 'yslcompetition' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树林
|
b41f537ae8
|
jingsai.10 图片资源优化
|
5 years ago |
|
杨树林
|
c46e703340
|
jingsai.10 图片资源优化
|
5 years ago |
|
杨树明
|
7dbf9eab15
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
172ae24bf2
|
调整
|
5 years ago |
|
杨树明
|
d660c3a210
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
5f0699aa73
|
调整
|
5 years ago |
|
杨树林
|
ad044af7a2
|
jingsai.9
|
5 years ago |
|
杨树林
|
bf7caa73ab
|
jingsai.8
|
5 years ago |
|
杨树明
|
cd01499650
|
调整
|
5 years ago |
|
杨树明
|
083d32215d
|
调整
|
5 years ago |
 caishi
|
91539451bd
|
竞赛导航
|
5 years ago |
|
caishi
|
fcac10f426
|
超级管理员-竞赛导航
|
5 years ago |
|
杨树明
|
af15a303f6
|
调整
|
5 years ago |
|
杨树林
|
ec97013ebd
|
jingsai.7
|
5 years ago |
|
杨树林
|
64816b7255
|
jingsai.6
|
5 years ago |
|
杨树林
|
8c2e99a12f
|
Merge branch 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树明
|
d9fc557cef
|
竞赛调整
|
5 years ago |
|
杨树林
|
5785d4e4cb
|
jingsai.5
|
5 years ago |
|
杨树林
|
32398333ec
|
jingsai.4
|
5 years ago |
|
杨树明
|
aaf61985a5
|
竞赛调整
|
5 years ago |
|
杨树明
|
540a4a309d
|
Merge branches 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
e8344c6674
|
竞赛调整
|
5 years ago |
|
杨树林
|
0d9aebc7a8
|
jingsai.2
|
5 years ago |
|
杨树林
|
fa47b00a7a
|
jingsai.2
|
5 years ago |
|
杨树林
|
1bf72e9314
|
jingsai.2
|
5 years ago |
|
杨树林
|
8b7f3b6e91
|
jingsai.2
|
5 years ago |
|
杨树明
|
00e70575cc
|
竞赛详情页调整
|
5 years ago |
|
杨树林
|
fc998222ac
|
Merge branch 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树明
|
8d30810f55
|
调整
|
5 years ago |
|
杨树林
|
dd42517143
|
Merge branch 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树明
|
c72b15d519
|
调整
|
5 years ago |
|
杨树林
|
cf59d7fff7
|
jingsai.
|
5 years ago |
|
杨树林
|
582fc40632
|
Merge branch 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树明
|
f85583d22e
|
竞赛战队详情页首页 内容详情页完善
|
5 years ago |
|
杨树林
|
0010173d19
|
jingsai.
|
5 years ago |
|
杨树林
|
a58907178d
|
jingsai.
|
5 years ago |
|
杨树明
|
ff9effc515
|
竞赛调整
|
5 years ago |
|
杨树林
|
cbd2ef6752
|
jingsai.
|
5 years ago |
|
杨树林
|
ae2270307c
|
jingsai.
|
5 years ago |
|
杨树明
|
0631fbfd9f
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
78de09562f
|
调整防止xss攻击
|
5 years ago |
|
杨树林
|
6f927424d3
|
jingsai.
|
5 years ago |
|
杨树明
|
e388939af9
|
Merge branches 'yslcompetition' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
# Conflicts:
# public/react/src/App.js
|
5 years ago |
|
杨树明
|
dbc88ae483
|
竞赛首页 战队详情页接口联调
|
5 years ago |
|
杨树林
|
6d713fb10a
|
jingsai.
|
5 years ago |
|
杨树林
|
91fa828359
|
jingsai.
|
5 years ago |
|
杨树林
|
677791ad36
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树明
|
e07b8356ad
|
文案导致的问题
|
5 years ago |
|
杨树明
|
2f35a8172b
|
调整
|
5 years ago |
|
杨树林
|
ed5d7e7359
|
竞赛
|
5 years ago |
|
杨树明
|
101f53b306
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树林
|
cdda2aa1ce
|
竞赛
|
5 years ago |
|
杨树明
|
0e25964d19
|
调整时间
|
5 years ago |
|
杨树明
|
5fe5bab9a4
|
调整时间
|
5 years ago |
|
杨树明
|
a14ece2093
|
调整时间
|
5 years ago |
|
杨树明
|
6dde2ef6d5
|
调整时间
|
5 years ago |
|
杨树明
|
f51cf91b6b
|
Merge branch 'ysmCompetitions' into ysm1
|
5 years ago |
|
杨树林
|
7ee7f0feb4
|
tz
|
5 years ago |
|
杨树林
|
aab802807e
|
tz
|
5 years ago |
|
杨树明
|
5d5be45eee
|
调整
|
5 years ago |
|
杨树明
|
64d0280e73
|
调整
|
5 years ago |
|
杨树明
|
3e0fc0c4d0
|
调整
|
5 years ago |
|
杨树明
|
e453701805
|
调整
|
5 years ago |
|
杨树明
|
9bc8c91d38
|
Merge branches 'competitions', 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysmCompetitions
|
5 years ago |
|
杨树林
|
c16c96e348
|
tz
|
5 years ago |
|
杨树明
|
7a6ae30b1e
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
6d1b82eb65
|
立即发布时间调整
|
5 years ago |
|
杨树林
|
07a8062ac9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into yslcompetition
|
5 years ago |
|
杨树林
|
8e82b4c607
|
调整实训作品页面
|
5 years ago |
|
杨树林
|
05face68b4
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
5d881d8090
|
调整评阅页
|
5 years ago |
|
杨树林
|
8d73b6c26b
|
调整
|
5 years ago |
|
p31729568
|
7396c412f1
|
admins: weapp setting && modify weapp home api
|
5 years ago |
|
杨树明
|
45b1550f57
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
c4d67c3948
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
f3d9a89ff5
|
调整
|
5 years ago |
|
杨树明
|
847d2998e0
|
Merge branches 'competitions' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into ysmCompetitions
|
5 years ago |
|
杨树明
|
fdab0e6768
|
前端build调整
|
5 years ago |
|
杨树林
|
dbd1e97d40
|
竞赛
|
5 years ago |
|
hjm
|
63116768cf
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
fc1972efa0
|
去掉title
|
5 years ago |
|
杨树林
|
8414c6a3b2
|
竞赛
|
5 years ago |
|
杨树林
|
44d7f47d76
|
调整
|
5 years ago |
|
杨树林
|
d3b63963a8
|
调整问卷
|
5 years ago |
|
杨树林
|
39039b3a91
|
竞赛调整
|
5 years ago |
|
hjm
|
ab6ee862f4
|
blur
|
5 years ago |
|
hjm
|
dc52b5f503
|
保存
|
5 years ago |
|
hjm
|
9d5efc98fa
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
74714547e7
|
shixun={this.props.shixun}
|
5 years ago |
|
杨树林
|
91eb9eac55
|
竞赛调整
|
5 years ago |
|
p31729568
|
c51802281a
|
admins: export user statistic
|
5 years ago |
|
杨树林
|
08d4b56880
|
竞赛新增
|
5 years ago |
|
杨树林
|
42e5a3ca81
|
竞赛添加加入战队弹框调整
|
5 years ago |
|
杨树林
|
7203345468
|
竞赛添加加入战队弹框
|
5 years ago |
|
杨树林
|
d420744016
|
竞赛调整
|
5 years ago |
|
p31729568
|
d2c2fd7f40
|
admin: precompile
|
5 years ago |
|
杨树明
|
a95c1925c2
|
Merge branches 'dev_aliyun' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
|
5 years ago |
|
杨树明
|
fe518f8bee
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
f98b88df10
|
【实训项目】选择题实训如果用户不写答案，不用传参数到标准答案
|
5 years ago |
|
杨树明
|
92af9e4a2c
|
Merge branches 'dev_aliyun', 'develop' and 'ysm1' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1
# Conflicts:
# app/controllers/games_controller.rb
|
5 years ago |
|
hjm
|
4bc32cb9e9
|
vnc
|
5 years ago |
|
杨树明
|
624738d897
|
调整
|
5 years ago |
|
杨树明
|
0df28461cd
|
试卷，问卷详情页立即发布
|
5 years ago |
|
杨树明
|
276eb9c4a7
|
实训作业详情、普通作业详情、分组作业详情tab的立即发布改版
|
5 years ago |
|
杨树林
|
78481e4cdf
|
竞赛调整
|
5 years ago |
|
杨树林
|
b2b4dac11d
|
竞赛调整
|
5 years ago |
|
杨树林
|
f954be3b1b
|
竞赛调整
|
5 years ago |
|
杨树林
|
3999146695
|
调整bd
|
5 years ago |
|
杨树明
|
8abd7b546e
|
调整
|
5 years ago |
|
杨树明
|
72f3016a6a
|
调整
|
5 years ago |
|
杨树明
|
2eda621b44
|
调整
|
5 years ago |
|
杨树明
|
794febaff9
|
调整
|
5 years ago |
|
杨树林
|
8bd60f57c2
|
竞赛
|
5 years ago |
|
杨树明
|
03c38ceb77
|
Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
fd283d29a7
|
调整
|
5 years ago |
|
杨树明
|
43744be289
|
实训审核全选控制调整
|
5 years ago |
|
杨树林
|
b52afe0f8b
|
竞赛
|
5 years ago |
|
杨树林
|
c26d4e805d
|
竞赛
|
5 years ago |
|
杨树明
|
ffbc812709
|
调整
|
5 years ago |
|
杨树林
|
21738d8b72
|
竞赛
|
5 years ago |
|
杨树明
|
29ba5814af
|
Merge branches 'dev_aliyun' and 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
|
5 years ago |
|
杨树明
|
3597303218
|
实训审核状态联调
|
5 years ago |
|
杨树明
|
79df257216
|
竞赛start
|
5 years ago |
|
杨树明
|
3f8ccccdfe
|
实训审核开发 小程序解绑开发
|
5 years ago |
|
p31729568
|
edd450fe73
|
cooperative manage
|
5 years ago |
|
杨树明
|
95d8d7d90b
|
更新icon
|
5 years ago |
|
杨树明
|
aa30db04f4
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
