 杨树明
|
c61f3c1e8b
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
# Conflicts:
# app/controllers/subjects_controller.rb
# public/react/src/App.js
# public/react/src/modules/courses/coursesPublic/Addcourses.js
# public/react/src/modules/modals/Certifiedprofessional.js
# public/react/src/modules/modals/certfed.css
|
6 years ago |
 hjm
|
926a8748f2
|
注释
|
6 years ago |
|
hjm
|
12e7e78253
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
011cca981d
|
加了cdn后，这个文件里的字体文件加载会有跨域的报错
|
6 years ago |
|
杨树明
|
b335b20c48
|
调整
|
6 years ago |
|
hjm
|
a126673a41
|
css
|
6 years ago |
|
杨树明
|
7985bd3896
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
251f2a0bfa
|
调整
|
6 years ago |
|
hjm
|
e41dbea3e0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
56d3f3fba7
|
clearInput()
|
6 years ago |
 杨树林
|
d5738980a8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
e1c122f081
|
调整标签宽度
|
6 years ago |
|
杨树明
|
779153cd7a
|
调整搜索人名问题
|
6 years ago |
|
杨树明
|
09df772c2f
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
7d3e53afae
|
调整
|
6 years ago |
|
杨树林
|
0ae5817144
|
调整
|
6 years ago |
|
杨树林
|
1fd84fe597
|
调整
|
6 years ago |
|
hjm
|
e07c9f4061
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
8d33105ec0
|
解决取消上传后无法继续上传同文件的问题
|
6 years ago |
|
杨树林
|
5b6e42969d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
200617796d
|
调整标签宽度
|
6 years ago |
|
杨树林
|
7519350274
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
2867b3bd04
|
调整
|
6 years ago |
|
杨树明
|
463ab05586
|
调整
|
6 years ago |
|
hjm
|
b22d9cfa23
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
hjm
|
88aef68b1d
|
取消 继续上传
|
6 years ago |
|
hjm
|
0365516e75
|
作业 关联项目
|
6 years ago |
|
杨树明
|
ce44b6f051
|
调整
|
6 years ago |
|
杨树林
|
da7ce00749
|
调整标签宽度
|
6 years ago |
|
杨树明
|
f1119f3943
|
调整
|
6 years ago |
|
杨树林
|
b36aeb5293
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/paths/PathDetail/DetailTop.js
# public/react/src/modules/paths/PathDetail/PathDetailIndex.js
|
6 years ago |
|
杨树明
|
6531a83dfc
|
调整
|
6 years ago |
|
杨树明
|
5a90c368d8
|
调整
|
6 years ago |
|
杨树明
|
10df83a6ce
|
调整
|
6 years ago |
|
杨树明
|
972cd6efa3
|
调整
|
6 years ago |
|
杨树明
|
0e1c9a9f39
|
Merge branches 'dev_OnlineYsm' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
b5ad1abcff
|
调整
|
6 years ago |
|
杨树明
|
51f585cf51
|
Merge branches 'dev_OnlineYsm' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
69c7f7281b
|
调整
|
6 years ago |
|
杨树明
|
8c05ef7f20
|
调整
|
6 years ago |
|
杨树明
|
890e434bb9
|
Merge branches 'dev_OnlineYsm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_OnlineYsm
|
6 years ago |
|
杨树明
|
3d4f16cd56
|
Merge remote-tracking branch 'origin/dev_Ysm' into dev_Ysm
|
6 years ago |
|
杨树明
|
720aad8a3a
|
调整
|
6 years ago |
|
杨树林
|
ff96a521d9
|
调整
|
6 years ago |
|
hjm
|
68a848e0b7
|
ali cdn test
|
6 years ago |
|
杨树明
|
a14d5fc74c
|
Merge branches 'dev_OnlineYsm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_OnlineYsm
|
6 years ago |
|
杨树林
|
e69c598611
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
84dbad63b0
|
调整
|
6 years ago |
|
hjm
|
4e8508228b
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
hjm
|
e07baf9f3d
|
merge
|
6 years ago |
|
杨树明
|
0e13d279dd
|
调整
|
6 years ago |
|
hjm
|
ac9a9b2e18
|
test host
|
6 years ago |
|
杨树林
|
4aa48dfaed
|
调整
|
6 years ago |
|
hjm
|
a8a426706e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
1c2ffd1563
|
false
|
6 years ago |
|
杨树明
|
3512917c5b
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
5931e58b29
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
d12dbca500
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
40771b31c7
|
调整
|
6 years ago |
|
杨树明
|
a62d58fb21
|
调整
|
6 years ago |
|
杨树林
|
817efa053e
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
38e307487a
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
hjm
|
39b239c2d7
|
格式
|
6 years ago |
|
杨树明
|
529a0ee365
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
dbdd03378c
|
调整
|
6 years ago |
|
hjm
|
b4a84fa8d6
|
火狐额外处理
|
6 years ago |
|
杨树林
|
911094b88f
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
e3a9065161
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
杨树林
|
8b0a2a2a56
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
28280a7d7d
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
hjm
|
3277299ce8
|
<div className="courseForm">
|
6 years ago |
|
hjm
|
cee025b35f
|
ogm
|
6 years ago |
|
杨树明
|
ee2547d015
|
调整
|
6 years ago |
|
杨树明
|
f022577cf5
|
b
|
6 years ago |
|
杨树明
|
f394425cfc
|
调整
|
6 years ago |
|
杨树明
|
9c73ea5b12
|
调整
|
6 years ago |
|
杨树明
|
7199a086d7
|
调整
|
6 years ago |
|
杨树明
|
b10df6f65e
|
调整
|
6 years ago |
|
杨树明
|
790fa4e6ac
|
调整
|
6 years ago |
|
杨树明
|
8cd8843736
|
调整
|
6 years ago |
|
杨树林
|
1889e8794f
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
杨树明
|
8cb40f7870
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
# Conflicts:
# public/react/public/css/edu-all.css
# public/stylesheets/educoder/edu-all.css
|
6 years ago |
|
杨树明
|
d1e78b622c
|
。
|
6 years ago |
|
杨树明
|
5c08820899
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
01489d7f0f
|
格式
|
6 years ago |
|
hjm
|
3bd19cbf57
|
Merge branch 'dev_aliyun' into dev_hjm_a
|
6 years ago |
|
hjm
|
37a89ccd8b
|
多个
|
6 years ago |
|
hjm
|
068abb8232
|
16
|
6 years ago |
|
hjm
|
4e7b26951d
|
z-index: 9;
|
6 years ago |
|
杨树明
|
17bceb68af
|
Merge branches 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
4a6e125b70
|
2px
|
6 years ago |
|
杨树明
|
a221b5220e
|
精品课程调整
|
6 years ago |
|
hjm
|
4fbc3b5e24
|
_random
|
6 years ago |
|
杨树明
|
bddd85e89c
|
Merge branches 'dev_Ysl', 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
6df73b3058
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树林
|
1af5e8900b
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
杨树明
|
def39cfa7d
|
精品课程调整
|
6 years ago |
|
杨树明
|
9e01ccc7ee
|
Merge branches 'dev_Ysl', 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
1db5702f12
|
精品课程调整
|
6 years ago |
|
杨树林
|
1f72e7966a
|
调整
|
6 years ago |
