 杨树明
|
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 |
|
SylorHuang
|
75383afcc5
|
pdf在线预览测试1
|
6 years ago |
|
杨树明
|
def0ccc670
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
SylorHuang
|
49247eb90c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
SylorHuang
|
3f3b755611
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
daiao
|
aa537d3ff9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
p31729568
|
9d8ed2f292
|
fix es search course teacher not exist
|
6 years ago |
|
daiao
|
47851a87ac
|
客户管理
|
6 years ago |
|
SylorHuang
|
f59b93d78f
|
测试在线预览pdf
|
6 years ago |
|
cxt
|
6f717f52de
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop
|
6 years ago |
|
cxt
|
9922b53425
|
分组作业的作品增加组长的相关处理
|
6 years ago |
|
daiao
|
8c6d0e3318
|
客户管理url入口
|
6 years ago |
|
cxt
|
0eb221d22e
|
调整
|
6 years ago |
|
cxt
|
3863c85ec4
|
调整
|
6 years ago |
|
cxt
|
ced52a49fd
|
调整
|
6 years ago |
|
cxt
|
ed11f16a9e
|
调整
|
6 years ago |
|
cxt
|
aa136f3865
|
调整
|
6 years ago |
|
cxt
|
744b391650
|
分组作业删除组员
|
6 years ago |
|
cxt
|
d23f48dbc7
|
用户开启实训时自动加入该实训所在的金课课堂
|
6 years ago |
|
cxt
|
8509d09194
|
金课课堂的调整
|
6 years ago |
|
cxt
|
157cfdd590
|
调整
|
6 years ago |
|
cxt
|
3a1490f1c4
|
开启挑战时加入课堂
|
6 years ago |
|
cxt
|
48e06686eb
|
实践课程详情页接口增加金课的数据
|
6 years ago |
|
daiao
|
dc2a00a6a9
|
重置实训报错
|
6 years ago |
|
daiao
|
9d0b61d459
|
纯选择题类型重置的问题
|
6 years ago |
|
daiao
|
674b665213
|
课程名字太长无法保存
|
6 years ago |
|
cxt
|
0396d28ef9
|
调整
|
6 years ago |
|
daiao
|
5d8600c362
|
实训合作者不显示个性签名
|
6 years ago |
|
cxt
|
887171cf7e
|
实践课程的调整
|
6 years ago |
|
daiao
|
2010c736ff
|
注释个性签名
|
6 years ago |
|
daiao
|
8a25eaeebd
|
去除首页个人简介
|
6 years ago |
|
daiao
|
345438d99e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
daiao
|
467a96f14c
|
实训作业目录显示
|
6 years ago |
|
cxt
|
717b1778bb
|
Merge branch 'dev_cxt' into dev_aliyun
|
6 years ago |
|
cxt
|
1c54a09d2d
|
金课课堂的api编写
|
6 years ago |
|
daiao
|
ebfe326988
|
运营人员权限问题
|
6 years ago |
|
daiao
|
da61ead624
|
实践课程下移添加用户权限
|
6 years ago |
|
daiao
|
a72810588c
|
申请发布
|
6 years ago |
|
daiao
|
e7a197bad3
|
实践课程删除权限控制
|
6 years ago |
|
daiao
|
4a742cb337
|
权限修改
|
6 years ago |
|
daiao
|
d534d8016b
|
添加成员权限判断问题
|
6 years ago |
|
daiao
|
df5e9280ef
|
实践课程的权限
|
6 years ago |
|
daiao
|
8c20aeb9e5
|
实践课程的管理者不允许被删除
|
6 years ago |
|
daiao
|
981739495c
|
代码查重bug
|
6 years ago |
|
daiao
|
389d3cef55
|
代码文件判断
|
6 years ago |
|
daiao
|
0034b26b00
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
daiao
|
f04fe525de
|
代码分析报告
|
6 years ago |
|
cxt
|
9b129e4f2c
|
Merge branch 'develop' into dev_cxt
|
6 years ago |
|
cxt
|
536d6ea7f7
|
调整
|
6 years ago |
|
cxt
|
ca819e490c
|
调试
|
6 years ago |
|
cxt
|
eda31f182b
|
调试
|
6 years ago |
|
cxt
|
3ccb0a5e26
|
调试
|
6 years ago |
|
cxt
|
4e5d87f41c
|
加入课堂
|
6 years ago |
|
daiao
|
11f97819b3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
daiao
|
cbff39697f
|
分班名称长度修改成60个字符
|
6 years ago |
|
p31729568
|
db5e58a911
|
modify video batch publish apu
|
6 years ago |
|
daiao
|
2e53af0f4f
|
多选题选项的问题
|
6 years ago |
|
daiao
|
3d019e0727
|
抄袭者不存在的情况
|
6 years ago |
|
daiao
|
3df693cdf6
|
抄袭者不存在的情况
|
6 years ago |
|
daiao
|
846be14bc0
|
页面显示空白
|
6 years ago |
|
daiao
|
ee70a023bd
|
查重率的问题
|
6 years ago |
|
daiao
|
9be7563fa2
|
代码查重查看报错
|
6 years ago |
|
daiao
|
2804dc2580
|
打印日志
|
6 years ago |
|
daiao
|
11fb99285a
|
实训详情页排序问题
|
6 years ago |
|
daiao
|
2b211412b3
|
优化Model
|
6 years ago |
|
jingquan huang
|
020ff548b7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
jingquan huang
|
b12b10f3a8
|
区分错误日志
|
6 years ago |
|
p31729568
|
7bbc9150a6
|
fix get video upload auth sign
|
6 years ago |
|
cxt
|
8b992ae36b
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
cxt
|
b6df2233f4
|
导出成绩实时计算实训作业成绩
|
6 years ago |
|
p31729568
|
342ef48544
|
fix video reviews api
|
6 years ago |
|
p31729568
|
46cba02c8b
|
fix video batch publish api
|
6 years ago |
|
p31729568
|
7fbd045d8f
|
fix
|
6 years ago |
|
p31729568
|
5635e5af9e
|
add cate id to aliyun vod config
|
6 years ago |
|
p31729568
|
8af083f55f
|
aliyun vod SnapshotComplete event handle
|
6 years ago |
|
p31729568
|
8c5ff4ffa8
|
fix tiding
|
6 years ago |
|
p31729568
|
1b81785495
|
fix
|
6 years ago |
|
p31729568
|
f977591bb6
|
fix bug
|
6 years ago |
|
p31729568
|
97e0f411da
|
Merge branch 'dev_winse' into dev_aliyun
|
6 years ago |
|
p31729568
|
498660c015
|
video feature
|
6 years ago |
