cxt
|
8f19e8bc88
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
046a4916c2
|
注册调整
|
6 years ago |
 杨树明
|
5d09989d1e
|
b
|
6 years ago |
|
cxt
|
d89c483532
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
cxt
|
1d1fc66683
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
4fd778ebe2
|
学生列表的排序
|
6 years ago |
|
杨树明
|
43c5a80c92
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
cd830ab9e9
|
众包个人中心页调整
|
6 years ago |
|
cxt
|
417443a39a
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
158b5c5c32
|
加入课堂的提示调整
|
6 years ago |
|
杨树明
|
1c5905ab1b
|
资源调整
|
6 years ago |
|
杨树明
|
91eaeb16da
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
cxt
|
ad2eb895e5
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
5d95f43173
|
实训作品的更新时间
|
6 years ago |
|
杨树明
|
c1de3fd7c4
|
精课权限调整
|
6 years ago |
|
杨树明
|
1befeb1b88
|
b
|
6 years ago |
|
杨树明
|
c6485a8f14
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
 hjm
|
32ee8293c8
|
Merge branch 'dev_aliyun' into dev_hjm_a
|
6 years ago |
|
hjm
|
2d039ae549
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
5339790ba6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
f7b309562a
|
当删除所有题目后，总分还是显示，手动刷新后，才会消失
|
6 years ago |
|
杨树明
|
007f4cc281
|
精课调整
|
6 years ago |
|
杨树明
|
098d51cd6c
|
调整悬停宽度
|
6 years ago |
|
杨树明
|
2603c64712
|
调整
|
6 years ago |
 杨树林
|
296fde8831
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
bc102b9817
|
调整标签宽度
|
6 years ago |
|
杨树明
|
56b157a505
|
调整
|
6 years ago |
|
杨树明
|
811a1b0602
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
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 |
|
cxt
|
1fcd4283d9
|
实训作业成绩的调整
|
6 years ago |
|
cxt
|
f5ea35748e
|
Merge branch 'develop' into dev_aliyun
|
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 |
|
cxt
|
2103e4142a
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop
|
6 years ago |
|
杨树明
|
4cbf872c99
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
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 |
|
cxt
|
d100864739
|
search subject shixun creator
|
6 years ago |
|
cxt
|
3304993315
|
revert
|
6 years ago |
|
cxt
|
7de61e06f4
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
d6551b52b0
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop
|
6 years ago |
|
杨树明
|
779153cd7a
|
调整搜索人名问题
|
6 years ago |
|
cxt
|
3aaef4a166
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
