杨树明
|
c8c3640cc3
|
b
|
6 years ago |
杨树明
|
db0f8672e4
|
合并
|
6 years ago |
杨树明
|
cafe91bfab
|
Merge remote-tracking branch 'origin/dev_local' into dev_local
# Conflicts:
# db/seeds.rb
# public/react/src/modules/tpm/NewHeader.js
# public/react/src/modules/user/usersInfo/InfosBanner.js
|
6 years ago |
杨树明
|
e15e24b369
|
合并阿里云解决的问题
|
6 years ago |
杨树林
|
8cc179a90f
|
删除调整
|
6 years ago |
hjm
|
946c4c922c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
hjm
|
3ddd1dc07f
|
整组同评 item删除
|
6 years ago |
杨树明
|
6af98b311f
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
杨树明
|
a467ef8475
|
调整课堂首页面包屑
|
6 years ago |
caicai8
|
0650193eb1
|
问卷
|
6 years ago |
caicai8
|
329416a41e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
caicai8
|
2f0d571473
|
分组作业-作业描述
|
6 years ago |
杨树林
|
de95f17b48
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树林
|
0638000049
|
公告栏字体
|
6 years ago |
杨树明
|
72b438a280
|
对应问答改为对应描述
|
6 years ago |
杨树明
|
3e4123d3ff
|
对应问答改为对应描述
|
6 years ago |
杨树明
|
d5b4d6eecf
|
调整
|
6 years ago |
杨树明
|
931b99af8f
|
调整缩放比例造成的影响
|
6 years ago |
杨树明
|
686e6f8a5e
|
调整缩放比例造成的影响
|
6 years ago |
杨树明
|
16fec9e90e
|
调整浏览器调整大小到底加载兼容性
|
6 years ago |
caicai8
|
29bdd529f6
|
check添加文件的后缀
|
6 years ago |
caicai8
|
7b41491473
|
限制文件必须带.
|
6 years ago |
caicai8
|
2158a64a0c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
caicai8
|
afd40cd0f1
|
下拉省略
|
6 years ago |
杨树林
|
8516bedbef
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树林
|
92fab34035
|
合并
|
6 years ago |
杨树明
|
ebacd520eb
|
调整
|
6 years ago |
caicai8
|
a3ee98adbf
|
issue
|
6 years ago |
caicai8
|
a51dfaf911
|
学院统计
|
6 years ago |
caicai8
|
51fa698c46
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
caicai8
|
17f3f5d17b
|
学院统计
|
6 years ago |
杨树明
|
d270680ffb
|
金课开课通知调整
|
6 years ago |
杨树林
|
a95bd30fd7
|
合并
|
6 years ago |
杨树林
|
06e73a5ab8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树林
|
d4234a874c
|
合并
|
6 years ago |
杨树明
|
a1177152a7
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
杨树明
|
179db07560
|
调整新建课堂 金课体验
|
6 years ago |
杨树林
|
ff409bf587
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树林
|
c117b2d0a4
|
合并
|
6 years ago |
caicai8
|
469fa25837
|
TPM添加新文件
|
6 years ago |
杨树明
|
eb1216e2af
|
b
|
6 years ago |
杨树明
|
04df39ee1f
|
b
|
6 years ago |
杨树明
|
1f8e03c737
|
实训报告调整
|
6 years ago |
杨树明
|
883177636d
|
b
|
6 years ago |
杨树明
|
618fe608b8
|
实训报告调整
|
6 years ago |
杨树明
|
6d80a53e6d
|
b
|
6 years ago |
杨树明
|
daad546710
|
实训报告调整
|
6 years ago |
杨树明
|
4247bedad7
|
实训报告调整
|
6 years ago |
杨树明
|
b461eef525
|
调整
|
6 years ago |
杨树明
|
7977966640
|
加载
|
6 years ago |
杨树明
|
1aa713a895
|
调整
|
6 years ago |
杨树林
|
65ff658790
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树林
|
0088b8a877
|
合并
|
6 years ago |
杨树明
|
7f80bdbfac
|
调整
|
6 years ago |
杨树明
|
66f796c50b
|
调分功能列表调整
|
6 years ago |
杨树林
|
68ce9440a7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树明
|
427acac93c
|
调分功能调整
|
6 years ago |
杨树林
|
001b27172b
|
合并
|
6 years ago |
杨树林
|
7b5f790bbb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树林
|
a6b9ba08f7
|
合并
|
6 years ago |
杨树明
|
d42d98e93f
|
实训调分功能
|
6 years ago |
杨树明
|
96b71c7fb3
|
b
|
6 years ago |
杨树明
|
c766a452e9
|
b
|
6 years ago |
杨树明
|
9b38f44a75
|
实训调分功能
|
6 years ago |
杨树林
|
4fb12b6082
|
调整
|
6 years ago |
杨树林
|
353e821ff6
|
调整
|
6 years ago |
杨树林
|
4b9949f186
|
调整
|
6 years ago |
caicai8
|
bf4ad2e00f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
caicai8
|
8451742c55
|
毕设任务-编辑
|
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 |
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 |
杨树林
|
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 |
杨树林
|
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 |
hjm
|
780383dfb1
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
hjm
|
a19771cb4c
|
判空
|
6 years ago |
杨树林
|
44db7fbc4b
|
调整
|
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 |
杨树明
|
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 |
杨树明
|
0b43367fa9
|
删除方法判断还没上传成功时报错问题
|
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 |