 杨树林
|
4992ea6d61
|
调整
|
5 years ago |
 daiao
|
456c6fc9bd
|
Merge branch 'dev_aliyun' into develop
|
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 |
cxt
|
fc965a3030
|
加入课堂的提示修改
|
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 |
|
daiao
|
f2097f2a11
|
迁移错误错误
|
5 years ago |
|
杨树林
|
41fd8013cb
|
调整
|
5 years ago |
|
daiao
|
1bb0d4be58
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
daiao
|
861cf17263
|
下载图片报错
|
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 |
|
daiao
|
060d1a6792
|
Merge branch 'develop' into dev_aliyun
|
5 years ago |
|
daiao
|
458f98bafa
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
5 years ago |
|
daiao
|
64dcbba6ad
|
选择题找不到图片的问题
|
5 years ago |
p31729568
|
e8b0866ff0
|
fix department show deleted
|
5 years ago |
|
杨树明
|
c1284c229b
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
ccdf8f141a
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
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 |
|
p31729568
|
08f374fede
|
modify tiding list api
|
5 years ago |
|
hjm
|
4745a3b280
|
40px
|
5 years ago |
|
cxt
|
92337c9479
|
user_info中加入课堂的第一个模块url
|
5 years ago |
|
杨树林
|
01f19b9bcf
|
调整
|
5 years ago |
|
杨树林
|
ac2065b518
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
 caishi
|
19e90f6255
|
账户管理修改点击保存仍然提示选择学校/单位
|
5 years ago |
|
杨树林
|
becece288d
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
daiao
|
f96a0f747d
|
Merge branch 'dev_aliyun' into develop
|
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 |
|
cxt
|
7c21c728de
|
附件下载
|
5 years ago |
|
cxt
|
bad0158971
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
cxt
|
aa2cc34cc9
|
附件下载调整
|
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 |
