杨树明
|
ea1916fe08
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
5 years ago |
杨树明
|
add8af69ff
|
题库调整
|
5 years ago |
caicai8
|
a3ee98adbf
|
issue
|
5 years ago |
杨树林
|
e1d59c9906
|
合并
|
5 years ago |
杨树林
|
7e54a2bf46
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
5 years ago |
杨树林
|
d66fe97179
|
合并
|
5 years ago |
杨树明
|
acbbd58c11
|
题库调整
|
5 years ago |
杨树林
|
88224a8f8c
|
合并
|
5 years ago |
caicai8
|
a51dfaf911
|
学院统计
|
5 years ago |
杨树明
|
803c02c90d
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
5 years ago |
caicai8
|
51fa698c46
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
caicai8
|
17f3f5d17b
|
学院统计
|
5 years ago |
杨树明
|
d270680ffb
|
金课开课通知调整
|
5 years ago |
杨树林
|
2036674b34
|
合并
|
5 years ago |
杨树林
|
36eef0dda0
|
合并
|
5 years ago |
杨树林
|
827196d046
|
合并
|
5 years ago |
杨树林
|
a95bd30fd7
|
合并
|
5 years ago |
杨树林
|
06e73a5ab8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
d4234a874c
|
合并
|
5 years ago |
杨树明
|
a1177152a7
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
179db07560
|
调整新建课堂 金课体验
|
5 years ago |
杨树林
|
ff409bf587
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
c117b2d0a4
|
合并
|
5 years ago |
caicai8
|
469fa25837
|
TPM添加新文件
|
5 years ago |
杨树林
|
26cdcc5dbb
|
合并
|
5 years ago |
杨树林
|
25450c34d4
|
合并
|
5 years ago |
杨树林
|
687f52e27c
|
合并
|
5 years ago |
杨树明
|
eb1216e2af
|
b
|
5 years ago |
杨树林
|
6b5277c6ac
|
合并
|
5 years ago |
杨树明
|
04df39ee1f
|
b
|
5 years ago |
杨树林
|
2602913c3b
|
合并
|
5 years ago |
杨树明
|
1f8e03c737
|
实训报告调整
|
5 years ago |
杨树明
|
883177636d
|
b
|
5 years ago |
杨树明
|
618fe608b8
|
实训报告调整
|
5 years ago |
杨树明
|
6d80a53e6d
|
b
|
5 years ago |
杨树明
|
daad546710
|
实训报告调整
|
5 years ago |
杨树林
|
07dbcfe137
|
合并
|
5 years ago |
杨树明
|
4247bedad7
|
实训报告调整
|
5 years ago |
杨树明
|
b461eef525
|
调整
|
5 years ago |
杨树明
|
7977966640
|
加载
|
5 years ago |
杨树明
|
1aa713a895
|
调整
|
5 years ago |
杨树林
|
65ff658790
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
0088b8a877
|
合并
|
5 years ago |
杨树明
|
7f80bdbfac
|
调整
|
5 years ago |
hjm
|
a73beb080a
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
5 years ago |
hjm
|
6e905c40f4
|
试卷
|
5 years ago |
hjm
|
0cc4a805dc
|
试卷
|
5 years ago |
杨树明
|
66f796c50b
|
调分功能列表调整
|
5 years ago |
杨树林
|
68ce9440a7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
427acac93c
|
调分功能调整
|
5 years ago |
杨树林
|
001b27172b
|
合并
|
5 years ago |
杨树林
|
7b5f790bbb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
a6b9ba08f7
|
合并
|
5 years ago |
杨树明
|
d42d98e93f
|
实训调分功能
|
5 years ago |
杨树明
|
96b71c7fb3
|
b
|
5 years ago |
杨树林
|
df4732c59a
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
5 years ago |
杨树林
|
c79b7c4848
|
合并
|
5 years ago |
杨树明
|
c766a452e9
|
b
|
5 years ago |
杨树林
|
c5b41a2892
|
合并
|
5 years ago |
杨树明
|
9b38f44a75
|
实训调分功能
|
5 years ago |
hjm
|
d3fcf01d0e
|
Merge branch 'topic_bank' into dev_hjm_banks
|
5 years ago |
杨树明
|
e071a48600
|
题库毕设任务完成
|
5 years ago |
杨树林
|
601f4439ef
|
合并
|
5 years ago |
杨树林
|
f230cf8a11
|
合并
|
5 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
|
5 years ago |
杨树林
|
3501f2caa5
|
合并
|
5 years ago |
杨树林
|
4fb12b6082
|
调整
|
5 years ago |
杨树林
|
353e821ff6
|
调整
|
5 years ago |
杨树林
|
4b9949f186
|
调整
|
5 years ago |
杨树林
|
04cd8f4eab
|
调整
|
5 years ago |
杨树明
|
350e214d9f
|
调整
|
5 years ago |
杨树林
|
622623eaae
|
Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
5 years ago |
杨树明
|
b3074db4ca
|
调整
|
5 years ago |
杨树明
|
4dab952c41
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
5 years ago |
hjm
|
0c340e71a3
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
5 years ago |
hjm
|
9875e7c962
|
试卷重构
|
5 years ago |
杨树林
|
73f4819899
|
调整
|
5 years ago |
杨树明
|
c1c57341e7
|
合并
|
5 years ago |
杨树林
|
db9bbd0499
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
5 years ago |
caicai8
|
bf4ad2e00f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 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
|
5 years ago |
caicai8
|
8451742c55
|
毕设任务-编辑
|
5 years ago |
杨树林
|
35a74601d4
|
调整
|
5 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
|
5 years ago |
hjm
|
5457f81c61
|
spin
|
5 years ago |
caicai8
|
4f6c74c691
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
89979de1db
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 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
|
5 years ago |
caicai8
|
5f38ffb211
|
Merge branch 'dev_cs' into dev_aliyun
# Conflicts:
# public/react/src/modules/moop_cases/CaseNew.js
|
5 years ago |
杨树明
|
0e58f50e15
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
f701a456c7
|
调整
|
5 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
|
5 years ago |
caicai8
|
245569cabe
|
issue
|
5 years ago |
杨树林
|
41994149db
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
4c327d3720
|
调整
|
5 years ago |
杨树明
|
cfd748d9c6
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
d31e98f217
|
调整返回
|
5 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
|
5 years ago |
杨树明
|
ea7fcd3e3a
|
调整
|
5 years ago |
杨树明
|
7fa41b32d5
|
.
|
5 years ago |
杨树明
|
738d889f00
|
url 调整
|
5 years ago |
杨树明
|
e0977396fe
|
url 调整
|
5 years ago |
杨树明
|
f08757a17f
|
url调整
|
5 years ago |
杨树明
|
964b65f3c5
|
url调整
|
5 years ago |
杨树林
|
9af1392f66
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 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
|
5 years ago |
杨树明
|
bf5dcbcc2a
|
合并
|
5 years ago |
杨树明
|
0e08df1dd4
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
# Conflicts:
# public/react/src/modules/user/usersInfo/banks/BanksIndex.js
|
5 years ago |
杨树明
|
72586f082f
|
调整
|
5 years ago |
hjm
|
7501bbb111
|
Merge branch 'dev_hjm_banks' into topic_bank
|
5 years ago |
hjm
|
32d8421781
|
普通 分组
|
5 years ago |
杨树明
|
837aadbe96
|
调整问卷url
|
5 years ago |
hjm
|
780383dfb1
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
a19771cb4c
|
判空
|
5 years ago |
hjm
|
95fecbacb5
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
5 years ago |
hjm
|
35f79be6bd
|
if(file.response!=undefined){
|
5 years ago |
杨树明
|
200031e126
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
5 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
|
5 years ago |
hjm
|
0748aa838c
|
work
|
5 years ago |
hjm
|
7b83fa4c50
|
Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
5 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
|
5 years ago |
hjm
|
2ed8c55287
|
Merge branch 'dev_hjm_banks_refactor' into dev_hjm_banks
|
5 years ago |
hjm
|
838f14ba91
|
Merge branch 'dev_hjm_banks_refactor' into topic_bank
|
5 years ago |
hjm
|
0d9c2d98ab
|
work
|
5 years ago |
杨树明
|
69d1f168f9
|
调整
|
5 years ago |
杨树林
|
44db7fbc4b
|
调整
|
5 years ago |
杨树明
|
52bb727255
|
调整
|
5 years ago |
hjm
|
9a27974fa9
|
form
|
5 years ago |
hjm
|
bf4cf0ff9b
|
作业编辑
|
5 years ago |
杨树林
|
6a4c605e54
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
cfbc63c0c7
|
调整
|
5 years ago |
杨树明
|
a5b86940b6
|
调整
|
5 years ago |
杨树明
|
4c4fbd6051
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
5 years ago |
杨树明
|
afb869305d
|
调整
|
5 years ago |
caicai8
|
a75fa2ec54
|
Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
5 years ago |
caicai8
|
6007958122
|
题库修改
|
5 years ago |
杨树明
|
fc65bb100d
|
调整
|
5 years ago |
杨树明
|
db2357004d
|
调整
|
5 years ago |
杨树明
|
a8372a4e96
|
调整参数
|
5 years ago |
杨树明
|
037c0bdf17
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
5 years ago |
杨树明
|
672fcd61de
|
调整参数
|
5 years ago |
杨树明
|
207ea48093
|
调整参数
|
5 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
|
5 years ago |
杨树林
|
0cf1734f3c
|
调整
|
5 years ago |
杨树明
|
0b43367fa9
|
删除方法判断还没上传成功时报错问题
|
5 years ago |
hjm
|
1650397e75
|
Merge branch 'topic_bank' into dev_hjm_banks
|
5 years ago |
hjm
|
d7c28f5163
|
Merge branch 'dev_aliyun' into topic_bank
|
5 years ago |
caicai8
|
96bde76ac6
|
问卷内容详情
|
5 years ago |
杨树林
|
2087c9c306
|
调整
|
5 years ago |
hjm
|
c40c87b644
|
正在生成文件,请稍后
|
5 years ago |