 杨树林
|
df4732c59a
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
c79b7c4848
|
合并
|
6 years ago |
 杨树明
|
c766a452e9
|
b
|
6 years ago |
|
杨树林
|
c5b41a2892
|
合并
|
6 years ago |
|
杨树明
|
ee8c6a6b6d
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
9b38f44a75
|
实训调分功能
|
6 years ago |
 SylorHuang
|
20921f923f
|
pre compile
|
6 years ago |
|
SylorHuang
|
d046d35b17
|
实训的导出下载
|
6 years ago |
|
SylorHuang
|
abcad32642
|
实训的导出修改
|
6 years ago |
 hjm
|
d3fcf01d0e
|
Merge branch 'topic_bank' into dev_hjm_banks
|
6 years ago |
p31729568
|
4093ca47bf
|
admins: fix ajax
|
6 years ago |
|
杨树林
|
7702d78bc1
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树明
|
e071a48600
|
题库毕设任务完成
|
6 years ago |
|
p31729568
|
90be9823d4
|
admins: fix
|
6 years ago |
|
杨树林
|
601f4439ef
|
合并
|
6 years ago |
|
杨树林
|
f230cf8a11
|
合并
|
6 years ago |
|
杨树明
|
4709e272bf
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
# Conflicts:
# public/react/src/modules/courses/poll/PollNew.js
|
6 years ago |
|
杨树林
|
3501f2caa5
|
合并
|
6 years ago |
|
杨树林
|
4fb12b6082
|
调整
|
6 years ago |
|
杨树林
|
353e821ff6
|
调整
|
6 years ago |
|
杨树林
|
4b9949f186
|
调整
|
6 years ago |
|
杨树林
|
04cd8f4eab
|
调整
|
6 years ago |
|
杨树明
|
350e214d9f
|
调整
|
6 years ago |
|
杨树林
|
622623eaae
|
Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树明
|
b3074db4ca
|
调整
|
6 years ago |
|
杨树明
|
4dab952c41
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
hjm
|
0c340e71a3
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
6 years ago |
|
hjm
|
9875e7c962
|
试卷重构
|
6 years ago |
|
杨树林
|
73f4819899
|
调整
|
6 years ago |
|
杨树明
|
c1c57341e7
|
合并
|
6 years ago |
|
杨树林
|
db9bbd0499
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
 caicai8
|
bf4ad2e00f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
e95b401c7c
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/busyWork/NewWork.js
# public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
# public/react/src/modules/courses/poll/PollNew.js
# public/react/src/modules/moop_cases/CaseNew.js
|
6 years ago |
|
caicai8
|
8451742c55
|
毕设任务-编辑
|
6 years ago |
|
杨树林
|
35a74601d4
|
调整
|
6 years ago |
|
杨树林
|
1d33aaaa5e
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/poll/PollNew.js
|
6 years ago |
|
hjm
|
5457f81c61
|
spin
|
6 years ago |
|
caicai8
|
4f6c74c691
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
89979de1db
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
5991971f12
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/poll/PollNew.js
|
6 years ago |
|
caicai8
|
5f38ffb211
|
Merge branch 'dev_cs' into dev_aliyun
# Conflicts:
# public/react/src/modules/moop_cases/CaseNew.js
|
6 years ago |
|
杨树明
|
0e58f50e15
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
f701a456c7
|
调整
|
6 years ago |
|
杨树林
|
6e03927917
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/poll/PollNew.js
|
6 years ago |
|
caicai8
|
245569cabe
|
issue
|
6 years ago |
|
杨树林
|
41994149db
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
4c327d3720
|
调整
|
6 years ago |
|
杨树明
|
cfd748d9c6
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
d31e98f217
|
调整返回
|
6 years ago |
|
杨树林
|
6afafd04ef
|
Merge branches 'dev_Ysl' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/user/usersInfo/banks/BanksIndex.js
|
6 years ago |
|
杨树明
|
ea7fcd3e3a
|
调整
|
6 years ago |
|
杨树明
|
7fa41b32d5
|
.
|
6 years ago |
|
杨树明
|
738d889f00
|
url 调整
|
6 years ago |
|
杨树明
|
e0977396fe
|
url 调整
|
6 years ago |
|
杨树明
|
f08757a17f
|
url调整
|
6 years ago |
|
杨树明
|
964b65f3c5
|
url调整
|
6 years ago |
|
杨树林
|
9af1392f66
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
ac840b3c94
|
Merge branches 'dev_Ysl' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/Index.js
|
6 years ago |
|
杨树明
|
bf5dcbcc2a
|
合并
|
6 years ago |
|
杨树明
|
0e08df1dd4
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
# Conflicts:
# public/react/src/modules/user/usersInfo/banks/BanksIndex.js
|
6 years ago |
|
杨树明
|
72586f082f
|
调整
|
6 years ago |
|
hjm
|
7501bbb111
|
Merge branch 'dev_hjm_banks' into topic_bank
|
6 years ago |
|
hjm
|
32d8421781
|
普通 分组
|
6 years ago |
|
杨树明
|
837aadbe96
|
调整问卷url
|
6 years ago |
|
hjm
|
780383dfb1
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
a19771cb4c
|
判空
|
6 years ago |
|
hjm
|
95fecbacb5
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
6 years ago |
|
hjm
|
35f79be6bd
|
if(file.response!=undefined){
|
6 years ago |
|
杨树明
|
200031e126
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
6 years ago |
|
杨树明
|
552b32928f
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
# Conflicts:
# public/react/src/modules/courses/Index.js
|
6 years ago |
|
hjm
|
0748aa838c
|
work
|
6 years ago |
|
hjm
|
7b83fa4c50
|
Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
杨树明
|
b10d9e8ebd
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
# Conflicts:
# public/react/src/modules/courses/Index.js
|
6 years ago |
|
hjm
|
2ed8c55287
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
6 years ago |
|
hjm
|
838f14ba91
|
Merge branch 'dev_hjm_banks_refactor' into topic_bank
|
6 years ago |
|
hjm
|
0d9c2d98ab
|
work
|
6 years ago |
|
杨树明
|
69d1f168f9
|
调整
|
6 years ago |
|
杨树林
|
44db7fbc4b
|
调整
|
6 years ago |
|
杨树明
|
52bb727255
|
调整
|
6 years ago |
|
hjm
|
9a27974fa9
|
form
|
6 years ago |
|
hjm
|
bf4cf0ff9b
|
作业编辑
|
6 years ago |
|
杨树林
|
6a4c605e54
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
cfbc63c0c7
|
调整
|
6 years ago |
|
杨树明
|
a5b86940b6
|
调整
|
6 years ago |
|
杨树明
|
4c4fbd6051
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
6 years ago |
|
杨树明
|
afb869305d
|
调整
|
6 years ago |
|
p31729568
|
392f3f9e19
|
admins: precompile
|
6 years ago |
|
caicai8
|
a75fa2ec54
|
Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
caicai8
|
6007958122
|
题库修改
|
6 years ago |
|
杨树明
|
fc65bb100d
|
调整
|
6 years ago |
|
杨树明
|
db2357004d
|
调整
|
6 years ago |
|
杨树明
|
a8372a4e96
|
调整参数
|
6 years ago |
|
杨树明
|
037c0bdf17
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
672fcd61de
|
调整参数
|
6 years ago |
|
杨树明
|
207ea48093
|
调整参数
|
6 years ago |
|
杨树明
|
d609b22f44
|
Merge branches 'dev_Ysl', 'dev_Ysm' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
# Conflicts:
# public/react/src/modules/courses/busyWork/NewWork.js
|
6 years ago |
|
杨树林
|
0cf1734f3c
|
调整
|
6 years ago |
|
杨树明
|
0b43367fa9
|
删除方法判断还没上传成功时报错问题
|
6 years ago |
|
hjm
|
1650397e75
|
Merge branch 'topic_bank' into dev_hjm_banks
|
6 years ago |
|
hjm
|
d7c28f5163
|
Merge branch 'dev_aliyun' into topic_bank
|
6 years ago |
|
caicai8
|
96bde76ac6
|
问卷内容详情
|
6 years ago |
|
杨树林
|
2087c9c306
|
调整
|
6 years ago |
|
hjm
|
c40c87b644
|
正在生成文件，请稍后
|
6 years ago |
|
hjm
|
a4a8f5b92e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
88a4f0e3cf
|
export true
|
6 years ago |
|
杨树明
|
8c655fcc05
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
p31729568
|
e0c7bec49a
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
p31729568
|
151a083cf3
|
admins: college page modify
|
6 years ago |
|
hjm
|
b259ca70b4
|
_gLoadingTip
|
6 years ago |
|
hjm
|
e963042461
|
showGlobalLoading
|
6 years ago |
|
hjm
|
267f1b7c52
|
_gLoadingTip
|
6 years ago |
|
hjm
|
4ac7efaa66
|
globalLoading
|
6 years ago |
|
杨树明
|
a3c928a804
|
b
|
6 years ago |
|
杨树明
|
f00d3761e6
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
0f50aca4dc
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
61850902b0
|
text
|
6 years ago |
|
p31729568
|
20302d5e4b
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
p31729568
|
35f1202196
|
colleges statistic page
|
6 years ago |
|
杨树明
|
4768a94c2b
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
651677f919
|
调整
|
6 years ago |
|
杨树明
|
472dac3029
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
a0c81ff651
|
Merge branch 'dev_hjm_export' into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/members/studentsList.js
|
6 years ago |
|
杨树明
|
703039d145
|
删除子目录 加载调整
|
6 years ago |
|
杨树明
|
00979e92b7
|
调整移动至 都加上默认提示
|
6 years ago |
|
杨树林
|
f0215eae80
|
调整
|
6 years ago |
|
hjm
|
e058451536
|
Merge branch 'dev_hjm_a' into dev_aliyun
# Conflicts:
# public/react/src/modules/forums/MemoDetailMDEditor.js
|
6 years ago |
|
杨树明
|
680410923c
|
调整
|
6 years ago |
|
杨树明
|
b654864778
|
调整
|
6 years ago |
|
杨树林
|
1d0d0dae14
|
调整
|
6 years ago |
|
杨树林
|
b0112b14c1
|
调整
|
6 years ago |
|
杨树林
|
0d7367064b
|
Merge branches 'dev_Ysl' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树明
|
ac5a69d635
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
a5fc4f9144
|
调整
|
6 years ago |
|
杨树明
|
bdf284f556
|
调整
|
6 years ago |
|
杨树明
|
62447ca824
|
合并
|
6 years ago |
|
hjm
|
a0bc6db995
|
版本退回
|
6 years ago |
|
hjm
|
eb7e7952c4
|
backup
|
6 years ago |
|
caicai8
|
570035af4b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caicai8
|
4f70314611
|
问卷
|
6 years ago |
|
caicai8
|
c76a7d86f4
|
问卷
|
6 years ago |
|
杨树林
|
c247e004b7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
11576fd73c
|
调整
|
6 years ago |
|
杨树明
|
6398a188f3
|
Merge branches 'dev_aliyun' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun_beta
|
6 years ago |
|
杨树林
|
d5ba59d30f
|
调整
|
6 years ago |
|
杨树明
|
7e1ffcaccf
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
6 years ago |
|
杨树明
|
1a60ce165e
|
课堂
|
6 years ago |
|
caicai8
|
1433d52125
|
Merge branch 'dev_aliyun' into dev_aliyun_beta
|
6 years ago |
|
caicai8
|
8c69332c9c
|
试卷
|
6 years ago |
|
hjm
|
fbe31b541c
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
6 years ago |
|
hjm
|
8ed3137615
|
onCancel
|
6 years ago |
