 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 |
|
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 |
|
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 |
|
杨树明
|
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 |
|
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 |
|
杨树林
|
42a30ed0b7
|
调整
|
6 years ago |
|
hjm
|
9be976063a
|
Merge branch 'dev_hjm_banks_refactor' into topic_bank
# Conflicts:
# public/react/src/modules/courses/busyWork/NewWorkForm.js
|
6 years ago |
|
hjm
|
ac747d3b9d
|
edit
|
6 years ago |
|
杨树林
|
b39b97fe9c
|
b
|
6 years ago |
|
hjm
|
8b040a4e12
|
作业编辑重构
|
6 years ago |
|
hjm
|
225dc116ba
|
Revert "Revert "作业编辑重构""
This reverts commit ea383f6c5d.
|
6 years ago |
|
hjm
|
ea383f6c5d
|
Revert "作业编辑重构"
This reverts commit 8fd8d45df2.
|
6 years ago |
|
hjm
|
8fd8d45df2
|
作业编辑重构
|
6 years ago |
|
杨树明
|
845967802b
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
杨树明
|
3882aabaf7
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
杨树明
|
b55b0b2506
|
课堂个模块翻页选择调整
|
6 years ago |
|
杨树林
|
dcb0f0aae7
|
调整
|
6 years ago |
|
杨树明
|
9601c3b159
|
实训文字调整
|
6 years ago |
|
杨树林
|
bda254abcc
|
调整
|
6 years ago |
|
杨树明
|
6b938d222d
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
6 years ago |
|
杨树明
|
1773e9dda4
|
封装题库发送弹窗
调整个人题库
|
6 years ago |
|
caicai8
|
7d35acce0c
|
Merge branch 'dev_cs' into dev_aliyun_beta
|
6 years ago |
|
caicai8
|
f70758c621
|
MD渲染后段落的行高调整
|
6 years ago |
|
caicai8
|
489a3205a2
|
问卷+毕设选题的附件问题
|
6 years ago |
|
杨树林
|
9d6060c7ff
|
b
|
6 years ago |
|
杨树林
|
b1b957ee8f
|
b
|
6 years ago |
|
杨树林
|
f3896c2370
|
调整
|
6 years ago |
|
杨树林
|
c57e2add4c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
36a386d911
|
调整样式
|
6 years ago |
|
杨树明
|
24b77c17f6
|
题目页调整
|
6 years ago |
|
杨树明
|
ad8cc3c8fd
|
调整
|
6 years ago |
|
hjm
|
714069f0b5
|
indexOf
|
6 years ago |
|
hjm
|
47171c6679
|
em 语法影响公式
|
6 years ago |
|
杨树林
|
724d9dc9ff
|
b
|
6 years ago |
|
杨树林
|
2093fee3ca
|
b
|
6 years ago |
|
杨树林
|
6c5660484b
|
b
|
6 years ago |
|
杨树明
|
2f594f1577
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
6 years ago |
|
杨树明
|
713e2a3229
|
调整
|
6 years ago |
|
杨树林
|
fa5caf6687
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
65527409b3
|
b
|
6 years ago |
|
caicai8
|
4f30476ca6
|
Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
caicai8
|
268a36f9aa
|
题库-毕设选题编辑页面
|
6 years ago |
|
杨树林
|
a466908398
|
b
|
6 years ago |
|
杨树林
|
8ac26007b8
|
b
|
6 years ago |
|
hjm
|
8b493cbbbc
|
去掉时间
|
6 years ago |
|
hjm
|
3cf2f1b0e4
|
css
|
6 years ago |
|
杨树明
|
f72e3fecf8
|
调整
|
6 years ago |
|
杨树林
|
1ff58b6c57
|
调整样式
|
6 years ago |
|
杨树林
|
b2009b9d16
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
5926f74e3a
|
调整样式
|
6 years ago |
|
杨树明
|
63d7542228
|
调整
|
6 years ago |
|
杨树明
|
6936ac3a39
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
6 years ago |
|
杨树明
|
820dba690f
|
调整
|
6 years ago |
|
hjm
|
c377e5c43a
|
katex更新
|
6 years ago |
|
杨树林
|
bcf097ecbd
|
b
|
6 years ago |
|
caicai8
|
6fa97b3d93
|
公开和私有
|
6 years ago |
|
杨树明
|
3a445e8159
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
杨树明
|
3c322a38c3
|
个人题库完善
|
6 years ago |
|
杨树林
|
985846c5a0
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
4691df45f8
|
调整
|
6 years ago |
|
杨树明
|
72282980a1
|
调整
|
6 years ago |
|
杨树明
|
0304a7d2fd
|
调整
|
6 years ago |
|
杨树明
|
7c5994fe16
|
调整
|
6 years ago |
|
杨树明
|
0c31fc2675
|
调整
|
6 years ago |
|
杨树明
|
438f207976
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
d4f409b54e
|
服务器配置调整
|
6 years ago |
|
hjm
|
9b3ae694ff
|
文字修改
|
6 years ago |
|
hjm
|
76c9020b76
|
禁用zoom检查，算法不对，有些显示器（小米笔记本）默认为125
|
6 years ago |
|
hjm
|
a39b5e6098
|
sharetest
|
6 years ago |
|
hjm
|
ee599d93d0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
14fd93f7be
|
移除scripts
|
6 years ago |
|
杨树明
|
25e5a304ae
|
服务器配置增加删除功能
|
6 years ago |
|
杨树林
|
b63e0a9d68
|
调整
|
6 years ago |
|
杨树明
|
d5ed2ed395
|
题库调整
|
6 years ago |
|
杨树林
|
17efffcaa3
|
调整
|
6 years ago |
|
杨树明
|
8c2908fd6c
|
Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank
|
6 years ago |
|
杨树林
|
72fa9c2afb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
8c168c5839
|
调整
|
6 years ago |
|
杨树明
|
3cb8858699
|
实训配置调整
|
6 years ago |
|
杨树林
|
c944c8b591
|
调整
|
6 years ago |
|
杨树明
|
f82d450261
|
Merge remote-tracking branch 'origin/topic_bank' into topic_bank
|
6 years ago |
|
杨树明
|
be103ef10b
|
题库个人主页
|
6 years ago |
|
hjm
|
481efb0477
|
返回
|
6 years ago |
|
caicai8
|
d84fd8b0aa
|
去除多余js
|
6 years ago |
|
杨树林
|
96788551ad
|
调整
|
6 years ago |
|
caicai8
|
72cd7ca2b3
|
修改
|
6 years ago |
|
杨树林
|
ff63a9556a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
8197503908
|
调整
|
6 years ago |
|
hjm
|
04aebfb183
|
real_time_limit
|
6 years ago |
|
caicai8
|
31e29f572b
|
题库-公用组件
|
6 years ago |
|
杨树林
|
ab5cec6470
|
调整
|
6 years ago |
|
hjm
|
b5dd35302b
|
学号列也参与
|
6 years ago |
|
杨树林
|
406ce0f988
|
调整
|
6 years ago |
