 杨树明
|
237bf4c821
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
81705ebfab
|
调整
|
5 years ago |
 hjm
|
dd98f0664d
|
404
|
5 years ago |
|
hjm
|
c673e98d7c
|
认证教师允许跳关
|
5 years ago |
|
hjm
|
93f61c92cd
|
空格
|
5 years ago |
|
hjm
|
fea8646212
|
404
|
5 years ago |
|
hjm
|
684b351012
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
875600ac3c
|
admin
|
5 years ago |
 杨树林
|
c050a7c6fa
|
调整
|
5 years ago |
|
杨树林
|
eaff514421
|
调整
|
5 years ago |
|
杨树林
|
231939f47a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
c1646797bd
|
调整
|
5 years ago |
|
杨树明
|
e101275492
|
b
|
5 years ago |
|
杨树明
|
23fea61cc0
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
a18caf2525
|
调整
|
5 years ago |
|
杨树林
|
a4858c3e82
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树林
|
d3de780bb4
|
调整
|
5 years ago |
|
杨树明
|
651399837f
|
调整
|
5 years ago |
|
杨树林
|
e6ba772da6
|
调整
|
5 years ago |
|
杨树林
|
7b0d36f76f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
62b48f7713
|
调整
|
5 years ago |
|
杨树明
|
96cb72f0be
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
32637fba2c
|
调整
|
5 years ago |
|
hjm
|
07fed8980c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
1320b05bfb
|
2.8;
|
5 years ago |
|
杨树林
|
3ca4437ad6
|
调整
|
5 years ago |
|
杨树林
|
7033912fd2
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
463dd5841c
|
调整
|
5 years ago |
|
杨树明
|
734ae79d2c
|
调整
|
5 years ago |
|
杨树明
|
535030d30f
|
调整
|
5 years ago |
|
杨树林
|
57f08bd5a6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
2ed0c3c61f
|
调整
|
5 years ago |
|
hjm
|
73fc0f3b52
|
注释 效果是一样的
|
5 years ago |
|
杨树明
|
388bcbfde0
|
b
|
5 years ago |
|
杨树林
|
2be7b4cd3d
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
d4c7053c4c
|
调整
|
5 years ago |
|
杨树明
|
d7ed523e9d
|
调整
|
5 years ago |
|
杨树明
|
b6c616e473
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
4e4915a3fa
|
调整
|
5 years ago |
|
hjm
|
03423d8c30
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
8debe9d99e
|
key
|
5 years ago |
|
hjm
|
016f6377eb
|
current_user &&
|
5 years ago |
|
杨树明
|
50dd27e744
|
b
|
5 years ago |
|
杨树明
|
4dc0801ff9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
184db72743
|
调整
|
5 years ago |
|
杨树明
|
c661aed21b
|
调整
|
5 years ago |
|
杨树明
|
cb0a10fbc5
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
818952c56f
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
hjm
|
65658c219a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
943a628dc9
|
clear
|
5 years ago |
|
杨树明
|
b350b0f1a6
|
调整
|
5 years ago |
|
杨树林
|
d3bc8b33a0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
806e81e3a5
|
调整
|
5 years ago |
|
杨树明
|
78678a68ba
|
调整
|
5 years ago |
|
hjm
|
8656c6037e
|
面包屑
|
5 years ago |
|
hjm
|
901ed458c4
|
面包屑
|
5 years ago |
|
hjm
|
4b130f2724
|
面包屑
|
5 years ago |
|
hjm
|
5b9bbaf9e1
|
面包屑
|
5 years ago |
|
hjm
|
b9d48c420a
|
面包屑-作业
|
5 years ago |
|
杨树林
|
6903658524
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
f28a2e3580
|
调整
|
5 years ago |
|
杨树明
|
64ae7a2cb6
|
调整
|
5 years ago |
|
杨树明
|
fb44e88969
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
5bfb41ad37
|
调整
|
5 years ago |
|
hjm
|
a107be221c
|
delay 1
|
5 years ago |
|
杨树林
|
a4910c2f8f
|
调整
|
5 years ago |
|
杨树林
|
4992ea6d61
|
调整
|
5 years ago |
|
杨树林
|
1aec807d6b
|
调整
|
5 years ago |
|
杨树明
|
6bde85158a
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
bbad22274c
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
|
5 years ago |
|
杨树林
|
72a15bfad9
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树林
|
13e7b0bd5e
|
调整
|
5 years ago |
|
杨树明
|
23f61a9c95
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
|
5 years ago |
|
杨树林
|
fc9bb34eec
|
调整
|
5 years ago |
|
杨树明
|
aebfc5dd35
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
|
5 years ago |
|
杨树明
|
e57317351d
|
调整
|
5 years ago |
|
杨树明
|
20e85d513f
|
调整
|
5 years ago |
|
杨树林
|
edaf04695d
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
11cd50eb75
|
调整
|
5 years ago |
|
杨树林
|
41fd8013cb
|
调整
|
5 years ago |
|
hjm
|
4bf0b94cc9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
56bfc47444
|
40
|
5 years ago |
|
杨树明
|
af7c74c2a4
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# app/controllers/application_controller.rb
# public/react/src/AppConfig.js
|
5 years ago |
|
hjm
|
4745a3b280
|
40px
|
5 years ago |
|
杨树林
|
01f19b9bcf
|
调整
|
5 years ago |
 caishi
|
19e90f6255
|
账户管理修改点击保存仍然提示选择学校/单位
|
5 years ago |
|
hjm
|
7dd4d74b46
|
retryAndRefresh
|
5 years ago |
|
hjm
|
d6ff838b0c
|
请先选择学校
|
5 years ago |
|
hjm
|
5a7599b3ae
|
background: transparent !important;
|
5 years ago |
|
hjm
|
0dbcb88efa
|
s
|
5 years ago |
|
hjm
|
8c96b03142
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
c87c6280bf
|
g
|
5 years ago |
|
杨树明
|
64d6d294c6
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
6d5ec0794d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# app/controllers/application_controller.rb
# public/react/src/AppConfig.js
|
5 years ago |
|
hjm
|
d8670b2092
|
monaca 需要刷新，不然无法编辑
|
5 years ago |
|
hjm
|
49eb847328
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
c29c8253a4
|
monaca 需要刷新，不然无法编辑
|
5 years ago |
|
杨树明
|
b0e0bfaa8a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
c9801f9259
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
3d316e2e4e
|
account
|
5 years ago |
|
杨树明
|
0c1e0483e9
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
47c6b5446d
|
调整
|
5 years ago |
|
杨树林
|
4b388e090b
|
调整
|
5 years ago |
|
杨树明
|
42c2cc50cb
|
调整
|
5 years ago |
|
杨树林
|
0b238c7021
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
1017a23d8f
|
调整
|
5 years ago |
|
杨树明
|
1ef323bf4b
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
9d421e4c4f
|
调整
|
5 years ago |
|
杨树明
|
022a2b57e3
|
调整
|
5 years ago |
|
杨树林
|
a532653add
|
调整
|
5 years ago |
|
杨树林
|
a44dbc2aea
|
调整
|
5 years ago |
|
杨树林
|
91fd4fc401
|
调整
|
5 years ago |
|
杨树明
|
f13003a463
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# app/controllers/application_controller.rb
# public/react/src/AppConfig.js
|
5 years ago |
|
杨树林
|
320c3a2932
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
669d247799
|
调整
|
5 years ago |
|
hjm
|
f049d7763c
|
addSuc
|
5 years ago |
|
hjm
|
e855417102
|
debugType
|
5 years ago |
|
hjm
|
a30b80748c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
4568e0c0c0
|
选项
|
5 years ago |
|
杨树明
|
3801ca041a
|
调整
|
5 years ago |
|
杨树明
|
ac11f89630
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
486d025809
|
调整
|
5 years ago |
|
杨树明
|
620dbd461e
|
调整
|
5 years ago |
|
杨树林
|
d3eee68c74
|
调整
|
5 years ago |
|
杨树明
|
e77ad0d04d
|
调整
|
5 years ago |
|
杨树明
|
16e26b5706
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
7e6d229060
|
调整
|
5 years ago |
|
杨树林
|
9204560e1f
|
调整
|
5 years ago |
|
杨树林
|
2967988215
|
调整
|
5 years ago |
|
杨树林
|
ede7ecefa6
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
aafe6682fc
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
0144522d19
|
调整
|
5 years ago |
|
杨树明
|
e4c44d4a16
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
hjm
|
5b2e452609
|
401
|
5 years ago |
|
杨树明
|
976798de57
|
调整
|
5 years ago |
|
杨树林
|
c696207ac3
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
59917a0d2d
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
b72f4dcfff
|
调整
|
5 years ago |
|
杨树明
|
c1505d1e1f
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
ea6245ba93
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
b59765568a
|
调整
|
5 years ago |
|
hjm
|
c1b9b0078b
|
debugType
|
5 years ago |
|
hjm
|
15f9eb2115
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
ad48ca9542
|
nonedata
|
5 years ago |
|
杨树明
|
7a28d1912b
|
b
|
5 years ago |
|
杨树林
|
8bd2480503
|
调整
|
5 years ago |
|
hjm
|
69f0332e18
|
date
|
5 years ago |
|
hjm
|
ca0e04953e
|
new date
|
5 years ago |
|
hjm
|
2170ea7b7e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
b23d3ccfd7
|
beian
|
5 years ago |
