 SylorHuang
|
232f149118
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
 jingquan huang
|
aba7ce2f19
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
jingquan huang
|
b555868967
|
管理员数据清理
|
6 years ago |
|
SylorHuang
|
cc194dd207
|
版本库异常的修复3
|
6 years ago |
cxt
|
8e4e7e4011
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
08a7054614
|
调整课堂设置的接口
|
6 years ago |
|
SylorHuang
|
6caaea4a09
|
版本库异常的修复测试2
|
6 years ago |
|
SylorHuang
|
cac35d0c74
|
版本库异常的测试
|
6 years ago |
|
SylorHuang
|
734443434b
|
Merge branch 'dev_aliyun' into dev_hs
|
6 years ago |
|
SylorHuang
|
fa5f7d6ebb
|
文档获取异常的测试
|
6 years ago |
|
cxt
|
edc0c3776c
|
金课的时间提示调整
|
6 years ago |
|
cxt
|
db26cbbc6e
|
Merge branch 'dev_Ysm' into dev_aliyun
|
6 years ago |
|
cxt
|
1ca4196095
|
金课的首页
|
6 years ago |
|
cxt
|
9919730cb3
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
bdd02b3dbd
|
实训作业的排序调整
|
6 years ago |
|
jingquan huang
|
cd9e537481
|
..
|
6 years ago |
|
jingquan huang
|
46589f9a76
|
请求最大资源错误问题
|
6 years ago |
p31729568
|
bba5f20ffe
|
remove useless admin file
|
6 years ago |
|
SylorHuang
|
f1e4fb447e
|
Merge branch 'dev_aliyun' into dev_hs
|
6 years ago |
|
SylorHuang
|
fd3dfaaa59
|
试卷的位置问题迁移
|
6 years ago |
|
cxt
|
b039fd5839
|
调整
|
6 years ago |
|
cxt
|
8f19e8bc88
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
046a4916c2
|
注册调整
|
6 years ago |
|
cxt
|
d89c483532
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
cxt
|
4fd778ebe2
|
学生列表的排序
|
6 years ago |
|
cxt
|
158b5c5c32
|
加入课堂的提示调整
|
6 years ago |
|
p31729568
|
48138b1f7f
|
admin management system
|
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
|
5d95f43173
|
实训作品的更新时间
|
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 |
|
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 |
|
SylorHuang
|
2f187e1a84
|
试卷的编辑啊的测试
|
6 years ago |
|
杨树林
|
75e5ce8ae8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
cxt
|
e9b682383b
|
调整
|
6 years ago |
|
杨树林
|
6b5fadbeea
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
cxt
|
64a51a1759
|
调整
|
6 years ago |
|
杨树明
|
bbb55f7600
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
p31729568
|
3af57e97ce
|
video feature: modify
|
6 years ago |
|
杨树明
|
54121df076
|
封装open pdf 新开页下载
|
6 years ago |
|
p31729568
|
2d59bf6766
|
modify
|
6 years ago |
|
p31729568
|
95c8f28a74
|
video feature: modify refresh auth api
|
6 years ago |
|
p31729568
|
0d8de9537a
|
modify per_page max 100
|
6 years ago |
|
p31729568
|
4252648a4a
|
modify
|
6 years ago |
|
cxt
|
bc00e02366
|
调整
|
6 years ago |
|
cxt
|
c417eeaf2a
|
调整
|
6 years ago |
|
p31729568
|
cddd782686
|
video feature: modify
|
6 years ago |
|
cxt
|
3685ff1c6a
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop
|
6 years ago |
 daiao
|
989de0432f
|
txt评测报错
|
6 years ago |
|
daiao
|
f04ad3ed85
|
评测报错
|
6 years ago |
|
daiao
|
0192c0c11f
|
附件下载问题
|
6 years ago |
|
cxt
|
e17d636ba5
|
创建者
|
6 years ago |
|
cxt
|
b404ece696
|
Merge branch 'develop' into dev_aliyun
|
6 years ago |
|
cxt
|
eae8f4f592
|
创建者
|
6 years ago |
|
p31729568
|
3c1d30a133
|
video feature: add account check to api
|
6 years ago |
|
SylorHuang
|
476689314b
|
xxx
|
6 years ago |
|
SylorHuang
|
e8dcb16675
|
pdf 预览修改测试
|
6 years ago |
|
daiao
|
1792b8dc89
|
解决冲突
|
6 years ago |
|
daiao
|
5493ca5330
|
推荐实训数据问题
|
6 years ago |
|
SylorHuang
|
8af97d5655
|
pdf的预览添加disposition
|
6 years ago |
|
SylorHuang
|
b9de46e875
|
附件的pdf预览添加inline请求头
|
6 years ago |
|
SylorHuang
|
b262d98873
|
附件为pdf的添加判断，并修改链接
|
6 years ago |
|
SylorHuang
|
945001cb37
|
attachment.json.jbuilder的修改
|
6 years ago |
|
daiao
|
5c76f32eec
|
课程资源改版
|
6 years ago |
|
SylorHuang
|
0746014dba
|
测试资源和其他附件的预览
|
6 years ago |
|
cxt
|
93eac23c58
|
资源调整
|
6 years ago |
|
cxt
|
b41d127635
|
资源调整
|
6 years ago |
|
cxt
|
efb1be8abe
|
资源调整
|
6 years ago |
|
cxt
|
905f9c040e
|
资源调整
|
6 years ago |
|
cxt
|
961fa1ade5
|
调整
|
6 years ago |
|
cxt
|
852e2931b3
|
调整
|
6 years ago |
|
cxt
|
88afa881ad
|
调整
|
6 years ago |
|
SylorHuang
|
c23f4d92e7
|
Merge branch 'dev_aliyun' into dev_hs
|
6 years ago |
|
SylorHuang
|
0ed5b9fd68
|
开始答题页面的权限判断
|
6 years ago |
|
daiao
|
b5c560c1d1
|
注册万能验证码的问题
|
6 years ago |
|
p31729568
|
81047b02a3
|
video feature: upload video api error message extense
|
6 years ago |
|
SylorHuang
|
31cae1194b
|
过滤附件的api
|
6 years ago |
|
SylorHuang
|
9fd5946837
|
Merge branch 'dev_aliyun' into dev_hs
|
6 years ago |
|
SylorHuang
|
653fb5191d
|
修改判断pdf的错误
|
6 years ago |
|
daiao
|
1adeb490a6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
daiao
|
1677cea34d
|
注册老师时，自动加入示例课堂
|
6 years ago |
|
SylorHuang
|
60a17fa69b
|
Merge branch 'dev_aliyun' into dev_hs
|
6 years ago |
|
SylorHuang
|
7b99a1a5c5
|
资源添加附件的pdf判断
|
6 years ago |
|
p31729568
|
43d8f62f0f
|
fix
|
6 years ago |
|
p31729568
|
32bb3c6044
|
video feature add teacher check
|
6 years ago |
|
cxt
|
6d5571aff6
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
6716cd9938
|
tz
|
6 years ago |
|
cxt
|
c0a4766dab
|
tz
|
6 years ago |
|
daiao
|
b81ddf1d0d
|
打印日志
|
6 years ago |
|
daiao
|
cc29cb6194
|
打印日志
|
6 years ago |
|
daiao
|
8299c443ab
|
复制课堂问题
|
6 years ago |
|
daiao
|
031b93f7cf
|
复制课堂
|
6 years ago |
|
cxt
|
ac66f683f2
|
调整
|
6 years ago |
|
cxt
|
e944ce97c7
|
调整
|
6 years ago |
|
cxt
|
b377047dfd
|
调整
|
6 years ago |
|
cxt
|
6451e82e53
|
调整
|
6 years ago |
|
cxt
|
5ba7fcc061
|
merge
|
6 years ago |
|
jingquan huang
|
0e61bcf818
|
..
|
6 years ago |
|
jingquan huang
|
e6b26ee6cb
|
仓库在冷区后自动迁移
|
6 years ago |
|
jingquan huang
|
3f9c722c98
|
数据同步
|
6 years ago |
|
p31729568
|
2463d3343a
|
add first_category_url to es search api
|
6 years ago |
|
杨树明
|
26b315555d
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
SylorHuang
|
de85220fd8
|
资源下载增加is_pdf参数
|
6 years ago |
|
杨树明
|
8f624eeb6a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
cxt
|
c45a642be2
|
资源列表显示真实姓名
|
6 years ago |
|
SylorHuang
|
8a81871b69
|
空白试卷及实训报告的pdf在线预览
|
6 years ago |
|
cxt
|
50fd29fa65
|
开课消息
|
6 years ago |
|
SylorHuang
|
60baa2ddb8
|
pdf在线测试6
|
6 years ago |
|
SylorHuang
|
d0fcf65295
|
在线预览pdf5
|
6 years ago |
|
SylorHuang
|
e607174449
|
pdf在线预览4
|
6 years ago |
|
SylorHuang
|
6c0a070981
|
pdf在线测试3
|
6 years ago |
|
SylorHuang
|
cfa22663fa
|
pdf在线测试2
|
6 years ago |
|
cxt
|
72b73199f9
|
调整
|
6 years ago |
