 杨树林
|
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 |
