杨树明
|
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 |
杨树明
|
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 |
杨树林
|
9b5933c65b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
4b388e090b
|
调整
|
5 years ago |
cxt
|
ab1039df49
|
删除教师和助教的权限
|
5 years ago |
杨树明
|
42c2cc50cb
|
调整
|
5 years ago |
cxt
|
91bcb7bba4
|
调整
|
5 years ago |
cxt
|
7a65ebaf76
|
附件的权限调整
|
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 |
daiao
|
1ca075652f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
daiao
|
295599ca32
|
删除后台入口
|
5 years ago |
杨树明
|
022a2b57e3
|
调整
|
5 years ago |
杨树林
|
a532653add
|
调整
|
5 years ago |
p31729568
|
5914d83323
|
fix bind phone api
|
5 years ago |
杨树林
|
a44dbc2aea
|
调整
|
5 years ago |
杨树林
|
91fd4fc401
|
调整
|
5 years ago |
杨树明
|
b5b68ac56d
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
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 |
p31729568
|
6c4e959630
|
add id response to add school and add department
|
5 years ago |
cxt
|
788c710ee0
|
万能验证码
|
5 years ago |
hjm
|
bfeb792fa2
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
e855417102
|
debugType
|
5 years ago |
daiao
|
25574c841f
|
增加日志
|
5 years ago |
daiao
|
5eea22fa63
|
增加日志
|
5 years ago |
daiao
|
b2c011e7f6
|
日志报错'
|
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 |
daiao
|
1bc1866b0f
|
增加日志定位
|
5 years ago |
杨树明
|
27ad2e0906
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
3801ca041a
|
调整
|
5 years ago |
daiao
|
ce81fb2a30
|
增加日志
|
5 years ago |
cxt
|
7ecc9116a4
|
Merge branch 'develop' into dev_aliyun
|
5 years ago |
cxt
|
9e331cba6d
|
课堂的设置
|
5 years ago |