 hjm
|
4e9fc388b8
|
windows不支持8px
|
6 years ago |
|
hjm
|
6b5e333442
|
12
|
6 years ago |
|
hjm
|
30c213ff52
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
bc802e3b60
|
https
|
6 years ago |
 杨树林
|
5d4dd0cc9c
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
16307a5938
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/new/CoursesNew.js
# public/react/src/modules/courses/new/Goldsubject.js
|
6 years ago |
|
hjm
|
d92afe5282
|
超级管理员导入分班后却没有刷新
|
6 years ago |
|
hjm
|
4f7d9297c5
|
Merge branch 'dev_hjm_groupwork_leader_@' into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/busyWork/CommonWorkPost.js
|
6 years ago |
|
hjm
|
4ed38deeaa
|
教师列表样式
|
6 years ago |
 SylorHuang
|
27972122a6
|
实训页面
|
6 years ago |
|
hjm
|
859f7f8e20
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
 杨树明
|
e157bd7d4e
|
b
|
6 years ago |
|
hjm
|
8feb228069
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
33a3ba0bcd
|
超出加。。。
|
6 years ago |
|
杨树明
|
32bf71b714
|
调整
|
6 years ago |
|
杨树明
|
f84056fbdf
|
.
|
6 years ago |
|
杨树明
|
38419b2200
|
毕设任务样式调整
|
6 years ago |
|
hjm
|
00994c1d1c
|
Merge branch 'dev_hjm_groupwork_leader_@' into dev_aliyun_beta
|
6 years ago |
|
hjm
|
d807bfea0e
|
新建时显示组长
|
6 years ago |
|
杨树林
|
447ee0b8dc
|
b
|
6 years ago |
|
杨树明
|
0b647fb59e
|
题库start
|
6 years ago |
|
杨树明
|
db30143d78
|
调整
|
6 years ago |
|
杨树林
|
c2b7bbe229
|
Merge branch 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun_beta
|
6 years ago |
 caicai8
|
4eba9d27d4
|
Merge branch 'dev_cs' into dev_aliyun_beta
|
6 years ago |
|
caicai8
|
17e1f44146
|
问卷-题库选用
|
6 years ago |
|
杨树林
|
8fb649e6f3
|
Merge branches 'dev_Ysl' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun_beta
|
6 years ago |
|
杨树林
|
9c94bd344d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/new/CoursesNew.js
# public/react/src/modules/courses/new/Goldsubject.js
|
6 years ago |
|
杨树林
|
336ef77a35
|
调整
|
6 years ago |
|
caicai8
|
f445af2d2b
|
Merge branch 'dev_aliyun' into dev_cs
|
6 years ago |
|
caicai8
|
0a6fb4a28c
|
Merge branch 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun_beta
|
6 years ago |
|
hjm
|
d7ac4dfc81
|
tpi 本次评测耗时 文字放出来
|
6 years ago |
|
hjm
|
8f59eae876
|
tpi 本次评测耗时 文字放出来
|
6 years ago |
|
杨树明
|
5cb935e8fe
|
调整
|
6 years ago |
|
杨树明
|
0c00a7408c
|
调整
|
6 years ago |
|
杨树明
|
4390e46612
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
82298dc3ce
|
调整
|
6 years ago |
|
hjm
|
08c4238838
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
691e34ca9d
|
record 才显示分隔
|
6 years ago |
|
杨树明
|
593b7d4f12
|
调整
|
6 years ago |
|
caicai8
|
90d79f0d1c
|
issue
|
6 years ago |
|
杨树明
|
04ba1ebeae
|
替换路径图片
|
6 years ago |
|
杨树明
|
2dafe0a7b6
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
a4202751e3
|
替换路径图片
|
6 years ago |
|
hjm
|
2f7c28fbe0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
2b6ee76c0f
|
cdn ali-cdn.educoder.net
|
6 years ago |
|
SylorHuang
|
10f356a3c8
|
Merge branch 'dev_aliyun' into dev_hss
|
6 years ago |
|
hjm
|
079e28d5fe
|
icon
|
6 years ago |
|
杨树林
|
e61c39d8c5
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
562959b1a1
|
调整样式
|
6 years ago |
|
hjm
|
0ce29ed776
|
Merge branch 'dev_aliyun' into dev_hjm_groupwork_leader_@
|
6 years ago |
|
hjm
|
b2cfdfde65
|
Merge branch 'dev_hjm_groupwork_leader_@' into dev_aliyun_beta
|
6 years ago |
|
杨树明
|
1261d90b26
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
336354eed1
|
替换路径图片
|
6 years ago |
|
hjm
|
05e9071a56
|
tpi 本次评测耗时 文字放出来
|
6 years ago |
|
杨树林
|
e0dadb9f9c
|
调整
|
6 years ago |
|
hjm
|
f86478323d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
130b9cefaa
|
tpi 本次评测耗时 文字放出来
|
6 years ago |
|
杨树明
|
3a795d7d24
|
Merge branches 'dev_Ysm' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
415a2057d4
|
调整实训设置
|
6 years ago |
|
hjm
|
84110f33e4
|
width
|
6 years ago |
|
hjm
|
e52b81e7c8
|
width
|
6 years ago |
|
杨树明
|
71a07708e8
|
Merge branches 'dev_Ysm' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
d59866edeb
|
cdn
|
6 years ago |
|
杨树明
|
eedc757c26
|
Merge branches 'dev_aliyun' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
1344f59d4e
|
实训课程选择框
|
6 years ago |
|
SylorHuang
|
70d50793d9
|
change
|
6 years ago |
|
hjm
|
5bd9c2d336
|
enable cdn
|
6 years ago |
|
杨树明
|
7a31704012
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
1a83a1d567
|
banner 图调整
|
6 years ago |
|
杨树林
|
c97df5d0ba
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
35777dd667
|
调整样式
|
6 years ago |
|
杨树明
|
2f8d34792e
|
标签颜色调整
|
6 years ago |
|
caicai8
|
b3cb780709
|
Merge branch 'dev_aliyun' into dev_cs
|
6 years ago |
p31729568
|
ab0995f55f
|
admins: add local precompile
|
6 years ago |
|
杨树明
|
fddba8ffcc
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
4195fc1b6d
|
.
|
6 years ago |
|
杨树明
|
39a869484a
|
调整
|
6 years ago |
|
杨树林
|
ad1fa49824
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
b7452575af
|
调整样式
|
6 years ago |
|
杨树林
|
ca0fa6ed73
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
f89b10ca39
|
调整
|
6 years ago |
|
caicai8
|
57d8821e83
|
Merge branch 'dev_aliyun' into dev_cs
|
6 years ago |
|
caicai8
|
4c1d181645
|
优化
|
6 years ago |
|
杨树明
|
f49e561e90
|
Merge branches 'dev_Ysm' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
fe81ebeee9
|
调整
|
6 years ago |
|
caicai8
|
1c08f5dc21
|
附件列表公用组件的样式
|
6 years ago |
|
hjm
|
e8beab2625
|
/react/build/ path
|
6 years ago |
|
hjm
|
e96286c24a
|
cdn禁用
|
6 years ago |
|
杨树明
|
0ba1584130
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun_beta
|
6 years ago |
|
hjm
|
3c32566af0
|
图片路径变了
|
6 years ago |
|
杨树明
|
6a5ad71635
|
调整
|
6 years ago |
|
杨树明
|
35b6b43b31
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
c0245baa36
|
Merge branch 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
3a22e45827
|
统一组件
|
6 years ago |
|
杨树明
|
9b897c6399
|
合并
|
6 years ago |
|
杨树明
|
adee752481
|
合并
|
6 years ago |
|
杨树林
|
6217e80adb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
d259c4e83d
|
调整样式
|
6 years ago |
|
hjm
|
9c0704fa3d
|
Merge branch 'dev_aliyun' into dev_aliyun_beta
|
6 years ago |
|
hjm
|
0f59e0f66b
|
间距
|
6 years ago |
|
caicai8
|
cd541ead90
|
Merge branch 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun_beta
|
6 years ago |
|
caicai8
|
92795b5def
|
资源
|
6 years ago |
|
hjm
|
b25026eb19
|
Merge branch 'dev_hjm_cdn' into dev_aliyun_beta
|
6 years ago |
|
hjm
|
8b247e6849
|
path
|
6 years ago |
|
杨树明
|
0e33467eda
|
课堂列表悬停选择
|
6 years ago |
|
caicai8
|
f103d7adc9
|
issue
|
6 years ago |
|
杨树林
|
dc2478b88b
|
调整样式
|
6 years ago |
|
杨树林
|
e9fb87759f
|
修复suffix 造成的重叠 文字
|
6 years ago |
|
hjm
|
116631f900
|
merge
|
6 years ago |
|
hjm
|
0945a67fc7
|
组长
|
6 years ago |
|
杨树林
|
0124871bf5
|
修复suffix 造成的重叠 文字
|
6 years ago |
|
杨树明
|
ad4cf27615
|
调整无数据情况下的显示
|
6 years ago |
|
杨树林
|
0993a0d485
|
调整 公告栏
|
6 years ago |
|
hjm
|
9fde63b578
|
Merge branch 'dev_hjm_cdn' into dev_hjm_826_2
|
6 years ago |
|
hjm
|
1dd22140af
|
顺序
|
6 years ago |
|
杨树明
|
a0a0623373
|
分班重命名404调整
|
6 years ago |
|
hjm
|
1c754b3bc2
|
Merge branch 'dev_hjm_groupwork_leader' into dev_hjm_826_2
|
6 years ago |
|
hjm
|
ac8dda3e28
|
Merge branch 'dev_hjm_cdn' into dev_hjm_826_2
|
6 years ago |
|
hjm
|
7cef8ee608
|
cdn
|
6 years ago |
|
hjm
|
578872b4ac
|
{}
|
6 years ago |
|
杨树明
|
e490266891
|
选择实训路径流程调整
|
6 years ago |
|
hjm
|
8c1ef85cf3
|
Merge branch 'dev_hjm_groupwork_leader' into dev_hjm_826_2
|
6 years ago |
|
hjm
|
8ca76b4b46
|
Merge branch 'dev_hjm_updateFileWhenSwitch' into dev_hjm_826_2
|
6 years ago |
|
hjm
|
4c4f943eed
|
Merge branch 'dev_hjm_cdn' into dev_hjm_826_2
# Conflicts:
# public/react/scripts/build.js
|
6 years ago |
|
杨树明
|
324a39152b
|
添加合作者提示调整
|
6 years ago |
|
hjm
|
84245adefe
|
c
|
6 years ago |
|
hjm
|
35bc6e9679
|
md显示ke内容时，行间距过高的问题
|
6 years ago |
|
caicai8
|
33d5f95a84
|
冲突
|
6 years ago |
|
杨树林
|
21e8e46cdd
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
3dc3a3c0af
|
平台文字说明调整
|
6 years ago |
|
杨树明
|
c59d10a429
|
平台文字说明调整
|
6 years ago |
|
杨树林
|
ee4ec2a237
|
调整 公告栏
|
6 years ago |
|
杨树林
|
99f940f21a
|
调整 公告栏
|
6 years ago |
|
杨树林
|
9955ac8f2a
|
调整 公告栏
|
6 years ago |
|
杨树林
|
0800e2b596
|
调整 公告栏
|
6 years ago |
|
杨树林
|
90fda7bc24
|
调整 公告栏
|
6 years ago |
|
杨树林
|
42da6151a7
|
调整 公告栏
|
6 years ago |
|
杨树林
|
a3c9902834
|
调整 公告栏
|
6 years ago |
|
杨树林
|
840c7ae0e1
|
调整 公告栏
|
6 years ago |
|
杨树林
|
48774b67c6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
da03ded9ea
|
调整 公告栏
|
6 years ago |
|
杨树明
|
28e94d1dc9
|
调整缓存
|
6 years ago |
|
杨树明
|
98f8443f9b
|
默认调整弹窗宽度
|
6 years ago |
|
杨树明
|
021b719857
|
默认显示当期开课
|
6 years ago |
|
caicai8
|
1c9c7dd120
|
导入创建分班-未上传附件提示
|
6 years ago |
|
杨树明
|
ed78052620
|
默认显示当期开课
|
6 years ago |
|
杨树明
|
8f9db17c91
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
9dd9e5385c
|
字数调整
|
6 years ago |
|
杨树明
|
c4ff084532
|
字数调整
|
6 years ago |
|
caicai8
|
e84663bb8d
|
导入创建分班
|
6 years ago |
