 SylorHuang
|
f1e4fb447e
|
Merge branch 'dev_aliyun' into dev_hs
|
5 years ago |
|
SylorHuang
|
fd3dfaaa59
|
试卷的位置问题迁移
|
5 years ago |
cxt
|
b039fd5839
|
调整
|
5 years ago |
|
cxt
|
8f19e8bc88
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
cxt
|
046a4916c2
|
注册调整
|
5 years ago |
|
cxt
|
d89c483532
|
Merge branch 'dev_aliyun' into dev_Ysm
|
5 years ago |
|
cxt
|
4fd778ebe2
|
学生列表的排序
|
5 years ago |
|
cxt
|
158b5c5c32
|
加入课堂的提示调整
|
5 years ago |
 杨树明
|
91eaeb16da
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
5 years ago |
|
cxt
|
5d95f43173
|
实训作品的更新时间
|
5 years ago |
|
杨树明
|
811a1b0602
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
5 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
|
5 years ago |
|
cxt
|
1fcd4283d9
|
实训作业成绩的调整
|
5 years ago |
|
SylorHuang
|
2f67425e2a
|
试卷的位置问题和标准答案的算分问题
|
6 years ago |
|
cxt
|
d100864739
|
search subject shixun creator
|
6 years ago |
|
cxt
|
3304993315
|
revert
|
6 years ago |
|
cxt
|
3aaef4a166
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
b208a73638
|
调整
|
6 years ago |
|
cxt
|
18b1197a9d
|
Merge branch 'dev_cxt' into dev_Ysm
|
6 years ago |
|
cxt
|
01d9f741af
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
cxt
|
35ad9d249f
|
实训作业的排序
|
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 |
|
cxt
|
300996b0d7
|
tiaoz
|
6 years ago |
|
cxt
|
500d0761eb
|
tiaoz
|
6 years ago |
|
cxt
|
9b720cde16
|
tiaoz
|
6 years ago |
|
cxt
|
56cc4aec69
|
tiaoz
|
6 years ago |
|
cxt
|
00e2eb4017
|
加入课堂时增加课程是否已结束的判断
|
6 years ago |
|
cxt
|
c6066ec5bd
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
 hjm
|
4e8508228b
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
hjm
|
e07baf9f3d
|
merge
|
6 years ago |
|
cxt
|
c497048359
|
新建金课时返回课堂名称
|
6 years ago |
p31729568
|
ff6649cd2c
|
modify bind email and phone error tip
|
6 years ago |
|
cxt
|
0095202a66
|
tiaoz
|
6 years ago |
|
cxt
|
ab59a180c3
|
实践课程的名称长度限制调整
|
6 years ago |
|
cxt
|
de5ff94bea
|
实训作业的排序
|
6 years ago |
|
cxt
|
a6076a4ecf
|
调整
|
6 years ago |
|
cxt
|
bb1e7616b9
|
金课调整
|
6 years ago |
|
cxt
|
490354a96b
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
cxt
|
a8abdfbd23
|
课程的登录
|
6 years ago |
|
杨树林
|
d4420f4e51
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
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 |
|
杨树明
|
4898527781
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
p31729568
|
b93c7f9f46
|
video modify
|
6 years ago |
|
杨树明
|
6ba9f5db32
|
Merge branches 'dev_Ysl', 'dev_Ysm', 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
p31729568
|
f105c938af
|
video: title limit 30
|
6 years ago |
|
杨树林
|
8ff2b8ff23
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
p31729568
|
a791e2576d
|
add filesize to video
|
6 years ago |
|
杨树明
|
378e998681
|
合并
|
6 years ago |
|
p31729568
|
a7c6674fe2
|
video: only teacher can visit video list
|
6 years ago |
|
SylorHuang
|
14c8e9f24e
|
Merge branch 'dev_hs' into dev_aliyun
|
6 years ago |
