 hjm
|
4bf0b94cc9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
56bfc47444
|
40
|
6 years ago |
 daiao
|
060d1a6792
|
Merge branch 'develop' into dev_aliyun
|
6 years ago |
|
daiao
|
458f98bafa
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
6 years ago |
|
daiao
|
64dcbba6ad
|
选择题找不到图片的问题
|
6 years ago |
p31729568
|
e8b0866ff0
|
fix department show deleted
|
6 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
|
6 years ago |
|
p31729568
|
08f374fede
|
modify tiding list api
|
6 years ago |
|
hjm
|
4745a3b280
|
40px
|
6 years ago |
cxt
|
92337c9479
|
user_info中加入课堂的第一个模块url
|
6 years ago |
 杨树林
|
01f19b9bcf
|
调整
|
6 years ago |
|
杨树林
|
ac2065b518
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
 caishi
|
19e90f6255
|
账户管理修改点击保存仍然提示选择学校/单位
|
6 years ago |
|
杨树林
|
becece288d
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
daiao
|
f96a0f747d
|
Merge branch 'dev_aliyun' into develop
|
6 years ago |
|
hjm
|
7dd4d74b46
|
retryAndRefresh
|
6 years ago |
|
hjm
|
d6ff838b0c
|
请先选择学校
|
6 years ago |
|
hjm
|
5a7599b3ae
|
background: transparent !important;
|
6 years ago |
|
hjm
|
0dbcb88efa
|
s
|
6 years ago |
|
hjm
|
8c96b03142
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
c87c6280bf
|
g
|
6 years ago |
|
杨树明
|
64d6d294c6
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 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
|
6 years ago |
|
cxt
|
7c21c728de
|
附件下载
|
6 years ago |
|
cxt
|
bad0158971
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
aa2cc34cc9
|
附件下载调整
|
6 years ago |
|
hjm
|
d8670b2092
|
monaca 需要刷新，不然无法编辑
|
6 years ago |
|
hjm
|
49eb847328
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
c29c8253a4
|
monaca 需要刷新，不然无法编辑
|
6 years ago |
|
杨树明
|
b0e0bfaa8a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
c9801f9259
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
3d316e2e4e
|
account
|
6 years ago |
|
杨树明
|
0c1e0483e9
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
47c6b5446d
|
调整
|
6 years ago |
|
杨树林
|
9b5933c65b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
4b388e090b
|
调整
|
6 years ago |
|
cxt
|
ab1039df49
|
删除教师和助教的权限
|
6 years ago |
|
杨树明
|
42c2cc50cb
|
调整
|
6 years ago |
|
cxt
|
91bcb7bba4
|
调整
|
6 years ago |
|
cxt
|
7a65ebaf76
|
附件的权限调整
|
6 years ago |
|
杨树林
|
0b238c7021
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
1017a23d8f
|
调整
|
6 years ago |
|
杨树明
|
1ef323bf4b
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
9d421e4c4f
|
调整
|
6 years ago |
|
daiao
|
1ca075652f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
daiao
|
295599ca32
|
删除后台入口
|
6 years ago |
|
杨树明
|
022a2b57e3
|
调整
|
6 years ago |
|
杨树林
|
a532653add
|
调整
|
6 years ago |
|
p31729568
|
5914d83323
|
fix bind phone api
|
6 years ago |
|
杨树林
|
a44dbc2aea
|
调整
|
6 years ago |
