 杨树林
|
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 |
|
杨树林
|
5cd9ea1fd0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
7e0af60680
|
调整
|
5 years ago |
|
hjm
|
7e57c41174
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
bc30821a5b
|
rename
|
5 years ago |
|
杨树林
|
68e3dd8c1c
|
调整
|
5 years ago |
|
hjm
|
69ac2eb260
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
06c03c8ebb
|
报错
|
5 years ago |
|
杨树林
|
5ceec24386
|
调整
|
5 years ago |
|
杨树林
|
a58ed05d89
|
调整
|
5 years ago |
|
杨树林
|
75e64b2d68
|
调整
|
5 years ago |
|
杨树林
|
a9823999a1
|
调整
|
5 years ago |
|
杨树林
|
3197b15e26
|
调整
|
5 years ago |
|
杨树林
|
4d752d99d5
|
调整
|
5 years ago |
|
hjm
|
3b88a3b15c
|
undefined
|
5 years ago |
|
杨树林
|
cf9c4cad85
|
调整
|
5 years ago |
|
hjm
|
fc2c4e9cde
|
选择题
|
5 years ago |
|
hjm
|
ca4fc67a9d
|
update
|
5 years ago |
|
杨树林
|
0e8eb1aaf3
|
调整
|
5 years ago |
|
hjm
|
73c21b4c53
|
viewport
|
5 years ago |
|
hjm
|
f6a6c39429
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
4da3f80ae3
|
开源创新组报名后，跳转到课堂的赛事说明帖子页面
|
5 years ago |
|
杨树明
|
f1eb51c1d5
|
调整
|
5 years ago |
|
hjm
|
a30134783d
|
null
|
5 years ago |
|
hjm
|
b85cca3d19
|
null
|
5 years ago |
|
hjm
|
01ac19fd21
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
d1965d5251
|
407
|
5 years ago |
|
杨树明
|
32fa240e08
|
b
|
5 years ago |
|
杨树明
|
6966a475f0
|
调整
|
5 years ago |
|
杨树明
|
aefe7a8fa2
|
调整
|
5 years ago |
|
杨树明
|
afecc4d5b4
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
39a2034dcb
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
杨树明
|
ffd13e728a
|
调整
|
5 years ago |
|
hjm
|
d7a4b99380
|
filter
|
5 years ago |
|
hjm
|
6d0860d44f
|
did
|
5 years ago |
|
杨树林
|
5ba07d6feb
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树林
|
b75f5c0767
|
2
|
5 years ago |
|
hjm
|
631afe88a6
|
[]
|
5 years ago |
|
杨树明
|
1de8282c8d
|
调整
|
5 years ago |
|
杨树明
|
838d4c67e8
|
调整
|
5 years ago |
|
杨树明
|
85bbe35785
|
调整
|
5 years ago |
|
hjm
|
1cea71dd07
|
1440
|
5 years ago |
|
杨树明
|
43ebdbca0c
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
0026dfe616
|
调整
|
5 years ago |
|
杨树明
|
6bc633b3b6
|
调整
|
5 years ago |
|
杨树明
|
2ab4c0c2a9
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
df7bcce340
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
杨树明
|
62d0ecdab8
|
.
|
5 years ago |
|
杨树林
|
43d88bd3ea
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树林
|
ac75d7173e
|
调整
|
5 years ago |
|
杨树明
|
904fe72bd6
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
a3939d427e
|
.
|
5 years ago |
|
杨树明
|
526c87c769
|
调整
|
5 years ago |
|
杨树明
|
33f9d9289f
|
.
|
5 years ago |
|
杨树林
|
63662633d2
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树林
|
bd1942ce31
|
调整
|
5 years ago |
|
杨树明
|
f0b3c4e75d
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树林
|
a7a5748d5c
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树林
|
e43839d720
|
调整
|
5 years ago |
|
杨树明
|
d2c134d797
|
调整
|
5 years ago |
|
杨树明
|
145e50c9a7
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
6921ab3ab5
|
调整
|
5 years ago |
|
hjm
|
217369c41f
|
Merge branch 'develop' into dev_aliyun
|
5 years ago |
|
hjm
|
cea9bff7a4
|
cache
|
5 years ago |
|
杨树明
|
62c9ba34c1
|
调整
|
5 years ago |
|
杨树明
|
bde518aaef
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
045e2cc91a
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
杨树明
|
d080387677
|
发送至时间和不能选择问题
|
5 years ago |
|
杨树林
|
8719793491
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树林
|
dd74c61db3
|
2
|
5 years ago |
|
杨树明
|
700d221ae9
|
调整
|
5 years ago |
|
杨树明
|
bd9c7bf622
|
endtime
|
5 years ago |
|
杨树明
|
91a7dcecf5
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
438b20e528
|
升级提示调整
|
5 years ago |
|
杨树明
|
2f601d964a
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
25ec1a755f
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
杨树明
|
6adbbdc54d
|
增加升级提示
|
5 years ago |
|
杨树林
|
687ff6fa06
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树林
|
1f73eae0e5
|
调整
|
5 years ago |
|
hjm
|
7ab95df635
|
host
|
5 years ago |
