杨树明
|
32ccca4b7d
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
d13fbc784b
|
调整
|
5 years ago |
tangjiang
|
9de0953ad8
|
update style
|
5 years ago |
tangjiang
|
9bc3798bcd
|
update style
|
5 years ago |
tangjiang
|
8b15e45793
|
update style
|
5 years ago |
tangjiang
|
331f36edf7
|
Merge branch 'dev_aliyun' into dev_tj
merge aliyun
|
5 years ago |
tangjiang
|
6364cbd279
|
update debug
|
5 years ago |
杨树明
|
d70a2fcb2a
|
调整
|
5 years ago |
杨树明
|
1b1035edcb
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
939383c457
|
调整jupter 和课堂shixun相关
|
5 years ago |
杨树林
|
8b04a870e1
|
调整
|
5 years ago |
杨树林
|
b11904f536
|
调整
|
5 years ago |
杨树林
|
fa3f779b4d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
f8ebd45c19
|
调整
|
5 years ago |
tangjiang
|
6cbed863ac
|
optimize image
|
5 years ago |
tangjiang
|
2d987c9e3e
|
Merge branch 'dev_aliyun' into dev_tj
merge aliyun
|
5 years ago |
tangjiang
|
518bd8c1fe
|
update debug
|
5 years ago |
杨树林
|
7b20882b1e
|
搜索页面banner图
|
5 years ago |
杨树林
|
6a48f43482
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
a5169d99c1
|
调整
|
5 years ago |
tangjiang
|
d9cc8ee315
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
merge oj
|
5 years ago |
杨树明
|
6c2a3e39d2
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
609ea59d8d
|
调整
|
5 years ago |
tangjiang
|
f44e186666
|
Merge branch 'dev_aliyun' into dev_tj
merge aliyun
|
5 years ago |
tangjiang
|
9425317cd2
|
update debug
|
5 years ago |
杨树林
|
01f8797c84
|
调整
|
5 years ago |
杨树林
|
012071b4df
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
0850d09d62
|
调整
|
5 years ago |
杨树明
|
bf6d94ee32
|
调整
|
5 years ago |
杨树明
|
6133e45a5b
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
cf6511f9dd
|
调整
|
5 years ago |
杨树明
|
16a73b45cc
|
Merge branches 'dev_aliyun', 'dev_new_shixun_task' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixun_task
|
5 years ago |
杨树明
|
c37ecc78bb
|
调整
|
5 years ago |
杨树明
|
5c25888110
|
调整
|
5 years ago |
tangjiang
|
d0347acb85
|
add notes
|
5 years ago |
tangjiang
|
5332fc66a7
|
Merge branch 'dev_aliyun' into dev_tj
merge aliyun
|
5 years ago |
tangjiang
|
0a3eee940d
|
update debug
|
5 years ago |
杨树明
|
72d8a630ac
|
调整
|
5 years ago |
杨树明
|
8f82781e94
|
调整
|
5 years ago |
杨树明
|
91ea7796b6
|
Merge branches 'dev_new_shixun_task' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixun_task
|
5 years ago |
杨树明
|
8f760f5fa6
|
延时保存
|
5 years ago |
杨树明
|
0ac199b97a
|
调整
|
5 years ago |
杨树明
|
3c2392b99f
|
Merge branches 'dev_aliyun' and 'dev_new_shixun_task' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixun_task
|
5 years ago |
杨树明
|
41e8cc6905
|
调整
|
5 years ago |
杨树明
|
a2c79ac937
|
Merge branches 'dev_aliyun', 'dev_new_shixun_task' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixun_task
|
5 years ago |
杨树明
|
0a4e7f61ba
|
调整接口
|
5 years ago |
杨树明
|
d8c5ab0a55
|
调整
|
5 years ago |
杨树明
|
dfb81b90ea
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
58c64d6a3a
|
调整
|
5 years ago |
tangjiang
|
67ba77f067
|
update comment style
|
5 years ago |
tangjiang
|
b57f3a8305
|
sync comment count
|
5 years ago |
杨树明
|
d09bb91a5d
|
调整
|
5 years ago |
杨树明
|
71d5e571c1
|
调整
|
5 years ago |
杨树明
|
e2da30eb84
|
调整
|
5 years ago |
杨树明
|
52149e1cb7
|
调整
|
5 years ago |
杨树明
|
1b460acb86
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
e8d9e26f8e
|
调整
|
5 years ago |
tangjiang
|
55c38b0744
|
Merge branch 'dev_aliyun' into dev_tj
merge aliyun
|
5 years ago |
tangjiang
|
251030d4a5
|
update comment style
|
5 years ago |
杨树明
|
cf657d44ee
|
调整
|
5 years ago |
杨树明
|
66d0bbbda7
|
调整
|
5 years ago |
杨树明
|
91b3706d42
|
调整
|
5 years ago |
杨树明
|
74f89610ad
|
调整
|
5 years ago |
杨树明
|
64159aad4e
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
2748306d07
|
调整
|
5 years ago |
杨树明
|
f3308d188c
|
调整
|
5 years ago |
杨树明
|
3b6daa3d7b
|
调整
|
5 years ago |
杨树明
|
a4f872bf49
|
调整fork
|
5 years ago |
杨树明
|
067f770dcc
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
Conflicts:
public/react/src/modules/tpm/TPMIndexHOC.js
|
5 years ago |
tangjiang
|
7ef472177b
|
update comment style
|
5 years ago |
杨树明
|
d203f8e246
|
调整
|
5 years ago |
杨树明
|
56f23efd4a
|
调整提示
|
5 years ago |
tangjiang
|
281aaee056
|
Merge branch 'dev_aliyun' into dev_tj
merge aliyun
|
5 years ago |
tangjiang
|
cd56975094
|
add comment
|
5 years ago |
杨树明
|
c38d9f290f
|
调整
|
5 years ago |
杨树明
|
48677128d6
|
调整
|
5 years ago |
杨树明
|
ff310e2162
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
0c4a92251e
|
调整
|
5 years ago |
杨树明
|
98f457f458
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
dc01f2630b
|
调整时间
|
5 years ago |
杨树明
|
da3e5dfad6
|
Merge branches 'dev_cxt', 'dev_newysm' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
Conflicts:
public/react/src/modules/courses/exercise/Exercisesetting.js
public/react/src/modules/courses/poll/PollDetailTabForth.js
|
5 years ago |
杨树明
|
d0dee3c3fe
|
调整问卷截止时间
|
5 years ago |
杨树明
|
19c9d2d510
|
试卷截止时间和学院统计url调整
|
5 years ago |
杨树明
|
26b98b449e
|
调整试卷截止时间权限
|
5 years ago |
杨树明
|
f7af63cb3a
|
Merge branches 'dev_aliyun' and 'dev_cxt' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cxt
|
5 years ago |
杨树明
|
5bc169fffc
|
调整
|
5 years ago |
杨树明
|
0ec1397f84
|
调整
|
5 years ago |
杨树明
|
118af12957
|
调整
|
5 years ago |
杨树明
|
9abde8b9bd
|
Merge branches 'dev_aliyun' and 'dev_newysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_newysm
|
5 years ago |
杨树明
|
6c04b6fcc0
|
调整
|
5 years ago |
杨树明
|
e170214ed9
|
fork功能调整
|
5 years ago |
daiao
|
1356f7e655
|
Merge branch 'develop' into dev_aliyun
|
5 years ago |
杨树明
|
4d5f902f1c
|
调整实训弹窗筛选规则
|
5 years ago |
杨树明
|
706b8e5f46
|
调整权限
|
5 years ago |
杨树明
|
f95114cb02
|
Merge branches 'dev_aliyun' and 'dev_newysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_newysm
|
5 years ago |
杨树明
|
09633ebf3e
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
49c76d1462
|
调整
|
5 years ago |
杨树明
|
02dbe6a4ce
|
Merge branches 'dev_newysm' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_newysm
|
5 years ago |
杨树明
|
111cca2965
|
调整
|
5 years ago |
杨树明
|
73412c7330
|
调整
|
5 years ago |
杨树明
|
28d322ca91
|
调整
|
5 years ago |
杨树明
|
9a8d4adad3
|
调整
|
5 years ago |
杨树明
|
181fa8f36a
|
Merge branches 'dev_aliyun' and 'dev_newysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_newysm
|
5 years ago |
杨树明
|
4e68607b1f
|
调整
|
5 years ago |
杨树明
|
9977f8d6df
|
调整
|
5 years ago |
杨树明
|
699a3d35be
|
调整
|
5 years ago |
杨树明
|
1108d180b3
|
修改数据集上传大小
|
5 years ago |
杨树明
|
330ab0b665
|
调整个人中心实训筛选状态
|
5 years ago |
杨树明
|
3669839afc
|
调整
|
5 years ago |
杨树林
|
86dcc504c7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
5 years ago |
杨树林
|
09539a843d
|
优化
|
5 years ago |
杨树明
|
f06d9da363
|
调整
|
5 years ago |
杨树明
|
ddc636a684
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
a662321c1b
|
调整
|
5 years ago |
杨树林
|
b59491693b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
f7b47fe935
|
处理
|
5 years ago |
杨树明
|
fc6addca2a
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
b9f25a6271
|
调整
|
5 years ago |
杨树林
|
acfc2bc57f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
cb6a9d66a3
|
处理刷新
|
5 years ago |
杨树明
|
5afcc19350
|
调整
|
5 years ago |
杨树明
|
be6c8c222d
|
调整
|
5 years ago |
杨树林
|
bb52b147ee
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
09aecf625b
|
处理刷新
|
5 years ago |
杨树明
|
50ac4d3e1e
|
调整
|
5 years ago |
杨树林
|
bd2e25ec00
|
处理刷新
|
5 years ago |
杨树林
|
67fbcb823b
|
处理刷新
|
5 years ago |
杨树林
|
900fff4480
|
Merge branch 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter
|
5 years ago |
杨树明
|
1492f48a99
|
调整
|
5 years ago |
杨树林
|
bfc6551711
|
处理刷新
|
5 years ago |
杨树明
|
2eea1a3d69
|
Merge branch 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
8e8237072b
|
Merge remote-tracking branch 'origin/dev_jupyter' into dev_jupyter
|
5 years ago |
杨树明
|
3ea0a3fe97
|
调整
|
5 years ago |
杨树林
|
594b39d027
|
合并
|
5 years ago |
杨树明
|
1f2b57ab47
|
Merge remote-tracking branch 'origin/dev_jupyter' into dev_jupyter
# Conflicts:
# public/react/src/modules/tpm/jupyter/index.scss
|
5 years ago |
杨树明
|
1c9491773c
|
调整
|
5 years ago |
杨树林
|
80506b7d2d
|
调整jupyter
|
5 years ago |
杨树林
|
f1ae306ec1
|
调整jupyter 上传功能
|
5 years ago |
杨树林
|
2bf80316e9
|
Merge branch 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter
|
5 years ago |
杨树林
|
bc6aabffb4
|
调整jupyte 样式
|
5 years ago |
tangjiang
|
4d81f511ef
|
修改地址栏 undefined 情况
|
5 years ago |
杨树明
|
99a49cc07f
|
调整
|
5 years ago |
tangjiang
|
ec4eba76ce
|
update test case tip
|
5 years ago |
杨树明
|
ae0a1d3a54
|
调整
|
5 years ago |
杨树明
|
452daa1f9f
|
Merge remote-tracking branch 'origin/dev_jupyter' into dev_jupyter
# Conflicts:
# public/javascripts/jupyter.js
|
5 years ago |
杨树明
|
838a590074
|
调整
|
5 years ago |
杨树林
|
22c56e64c8
|
Merge branch 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter
|
5 years ago |
杨树林
|
2c6fb8ba0b
|
调整jupyte
|
5 years ago |
杨树明
|
457267c255
|
Merge branches 'dev_aliyun' and 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter
|
5 years ago |
杨树明
|
637eea7def
|
Merge remote-tracking branch 'origin/dev_jupyter' into dev_jupyter
|
5 years ago |