 杨树明
|
2603c64712
|
调整
|
6 years ago |
 杨树林
|
296fde8831
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
bc102b9817
|
调整标签宽度
|
6 years ago |
|
杨树明
|
56b157a505
|
调整
|
6 years ago |
|
杨树明
|
c61f3c1e8b
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
# Conflicts:
# app/controllers/subjects_controller.rb
# public/react/src/App.js
# public/react/src/modules/courses/coursesPublic/Addcourses.js
# public/react/src/modules/modals/Certifiedprofessional.js
# public/react/src/modules/modals/certfed.css
|
6 years ago |
 hjm
|
926a8748f2
|
注释
|
6 years ago |
|
hjm
|
12e7e78253
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
011cca981d
|
加了cdn后，这个文件里的字体文件加载会有跨域的报错
|
6 years ago |
|
杨树明
|
b335b20c48
|
调整
|
6 years ago |
|
hjm
|
a126673a41
|
css
|
6 years ago |
|
杨树明
|
7985bd3896
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
251f2a0bfa
|
调整
|
6 years ago |
|
hjm
|
e41dbea3e0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
56d3f3fba7
|
clearInput()
|
6 years ago |
|
杨树林
|
d5738980a8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
e1c122f081
|
调整标签宽度
|
6 years ago |
|
杨树明
|
779153cd7a
|
调整搜索人名问题
|
6 years ago |
|
杨树明
|
09df772c2f
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
7d3e53afae
|
调整
|
6 years ago |
|
杨树林
|
0ae5817144
|
调整
|
6 years ago |
|
杨树林
|
1fd84fe597
|
调整
|
6 years ago |
|
hjm
|
e07c9f4061
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
8d33105ec0
|
解决取消上传后无法继续上传同文件的问题
|
6 years ago |
|
杨树林
|
5b6e42969d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
200617796d
|
调整标签宽度
|
6 years ago |
|
杨树林
|
7519350274
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
2867b3bd04
|
调整
|
6 years ago |
|
杨树明
|
463ab05586
|
调整
|
6 years ago |
|
hjm
|
b22d9cfa23
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
hjm
|
88aef68b1d
|
取消 继续上传
|
6 years ago |
|
hjm
|
0365516e75
|
作业 关联项目
|
6 years ago |
|
杨树明
|
ce44b6f051
|
调整
|
6 years ago |
|
杨树林
|
da7ce00749
|
调整标签宽度
|
6 years ago |
|
杨树明
|
f1119f3943
|
调整
|
6 years ago |
|
杨树林
|
b36aeb5293
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/paths/PathDetail/DetailTop.js
# public/react/src/modules/paths/PathDetail/PathDetailIndex.js
|
6 years ago |
|
杨树明
|
6531a83dfc
|
调整
|
6 years ago |
|
杨树明
|
5a90c368d8
|
调整
|
6 years ago |
|
杨树明
|
10df83a6ce
|
调整
|
6 years ago |
 caishi
|
089f9c3c79
|
Merge branch 'dev_aliyun' into dev_cs_new
|
6 years ago |
|
杨树明
|
972cd6efa3
|
调整
|
6 years ago |
|
杨树明
|
0e1c9a9f39
|
Merge branches 'dev_OnlineYsm' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
b5ad1abcff
|
调整
|
6 years ago |
|
杨树明
|
51f585cf51
|
Merge branches 'dev_OnlineYsm' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
69c7f7281b
|
调整
|
6 years ago |
|
杨树明
|
8c05ef7f20
|
调整
|
6 years ago |
|
杨树明
|
890e434bb9
|
Merge branches 'dev_OnlineYsm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_OnlineYsm
|
6 years ago |
|
杨树明
|
3d4f16cd56
|
Merge remote-tracking branch 'origin/dev_Ysm' into dev_Ysm
|
6 years ago |
|
杨树明
|
720aad8a3a
|
调整
|
6 years ago |
|
杨树林
|
ff96a521d9
|
调整
|
6 years ago |
|
hjm
|
68a848e0b7
|
ali cdn test
|
6 years ago |
|
杨树明
|
a14d5fc74c
|
Merge branches 'dev_OnlineYsm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_OnlineYsm
|
6 years ago |
|
杨树林
|
e69c598611
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
84dbad63b0
|
调整
|
6 years ago |
|
hjm
|
4e8508228b
|
Merge branch 'dev_aliyun' into dev_Ysm
|
6 years ago |
|
hjm
|
e07baf9f3d
|
merge
|
6 years ago |
|
杨树明
|
0e13d279dd
|
调整
|
6 years ago |
|
hjm
|
ac9a9b2e18
|
test host
|
6 years ago |
|
杨树林
|
4aa48dfaed
|
调整
|
6 years ago |
|
hjm
|
a8a426706e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
1c2ffd1563
|
false
|
6 years ago |
|
杨树明
|
3512917c5b
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
5931e58b29
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
d12dbca500
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
40771b31c7
|
调整
|
6 years ago |
|
杨树明
|
a62d58fb21
|
调整
|
6 years ago |
|
杨树林
|
817efa053e
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
38e307487a
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
hjm
|
39b239c2d7
|
格式
|
6 years ago |
|
杨树明
|
529a0ee365
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
dbdd03378c
|
调整
|
6 years ago |
|
hjm
|
b4a84fa8d6
|
火狐额外处理
|
6 years ago |
|
杨树林
|
911094b88f
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
e3a9065161
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
杨树林
|
8b0a2a2a56
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
28280a7d7d
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
hjm
|
3277299ce8
|
<div className="courseForm">
|
6 years ago |
|
hjm
|
cee025b35f
|
ogm
|
6 years ago |
|
杨树明
|
ee2547d015
|
调整
|
6 years ago |
|
杨树明
|
f022577cf5
|
b
|
6 years ago |
|
杨树明
|
f394425cfc
|
调整
|
6 years ago |
|
杨树明
|
9c73ea5b12
|
调整
|
6 years ago |
|
杨树明
|
7199a086d7
|
调整
|
6 years ago |
|
杨树明
|
b10df6f65e
|
调整
|
6 years ago |
|
杨树明
|
790fa4e6ac
|
调整
|
6 years ago |
|
杨树明
|
8cd8843736
|
调整
|
6 years ago |
|
杨树林
|
1889e8794f
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
杨树明
|
8cb40f7870
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
# Conflicts:
# public/react/public/css/edu-all.css
# public/stylesheets/educoder/edu-all.css
|
6 years ago |
|
杨树明
|
d1e78b622c
|
。
|
6 years ago |
|
杨树明
|
5c08820899
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
01489d7f0f
|
格式
|
6 years ago |
|
hjm
|
3bd19cbf57
|
Merge branch 'dev_aliyun' into dev_hjm_a
|
6 years ago |
|
hjm
|
37a89ccd8b
|
多个
|
6 years ago |
|
hjm
|
068abb8232
|
16
|
6 years ago |
|
hjm
|
4e7b26951d
|
z-index: 9;
|
6 years ago |
|
杨树明
|
17bceb68af
|
Merge branches 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
4a6e125b70
|
2px
|
6 years ago |
|
杨树明
|
a221b5220e
|
精品课程调整
|
6 years ago |
|
hjm
|
4fbc3b5e24
|
_random
|
6 years ago |
|
杨树明
|
bddd85e89c
|
Merge branches 'dev_Ysl', 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
6df73b3058
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树林
|
1af5e8900b
|
Merge branches 'dev_Ysm' and 'dev_admin' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# app/controllers/application_controller.rb
|
6 years ago |
|
杨树明
|
def39cfa7d
|
精品课程调整
|
6 years ago |
|
杨树明
|
9e01ccc7ee
|
Merge branches 'dev_Ysl', 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
1db5702f12
|
精品课程调整
|
6 years ago |
|
杨树林
|
1f72e7966a
|
调整
|
6 years ago |
|
杨树明
|
78f26b1eb5
|
精品课程调整
|
6 years ago |
|
hjm
|
e860b3088f
|
Merge branch 'dev_aliyun' into dev_hjm_a
|
6 years ago |
|
hjm
|
b20c9aa147
|
tab
|
6 years ago |
|
hjm
|
004524390f
|
分页
|
6 years ago |
|
杨树林
|
1b5c1e5cf5
|
调整
|
6 years ago |
|
杨树林
|
697d38f718
|
调整
|
6 years ago |
|
杨树林
|
329946dbc9
|
Merge branches 'dev_Ysl', 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
ea66f83d26
|
调整
|
6 years ago |
|
杨树林
|
e8cba53c99
|
调整
|
6 years ago |
|
杨树明
|
8d40ed7677
|
精品课程调整
|
6 years ago |
|
杨树明
|
674738a865
|
精品课程调整
|
6 years ago |
|
杨树明
|
6ba9f5db32
|
Merge branches 'dev_Ysl', 'dev_Ysm', 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
5e168417a5
|
精品课程调整
|
6 years ago |
|
杨树林
|
5da261b9f9
|
调整
|
6 years ago |
|
hjm
|
1ad925b264
|
视频标题编辑
|
6 years ago |
|
hjm
|
61a6c567b6
|
protocol
|
6 years ago |
|
杨树林
|
a24f0613a4
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
dc931ec403
|
调整
|
6 years ago |
|
杨树明
|
91d4803a84
|
精品课程调整
|
6 years ago |
|
杨树林
|
a38249f002
|
调整
|
6 years ago |
|
hjm
|
c2df4ef92a
|
消息跳转
|
6 years ago |
|
杨树明
|
378e998681
|
合并
|
6 years ago |
|
杨树明
|
ae45177822
|
精品课程
|
6 years ago |
|
杨树林
|
0b27fef23d
|
调整
|
6 years ago |
|
杨树林
|
87e7e854bb
|
调整
|
6 years ago |
|
杨树林
|
f2a8525aad
|
调整
|
6 years ago |
|
杨树林
|
459a2783f2
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
59cf9693e2
|
调整
|
6 years ago |
|
caishi
|
957d8f1592
|
教学案例-附件列表-单独组件
|
6 years ago |
|
杨树林
|
af3e265c2b
|
调整
|
6 years ago |
|
caishi
|
b9900553e3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
25c553d3c5
|
教学案例详情
|
6 years ago |
|
hjm
|
713aebdc47
|
入口
|
6 years ago |
|
hjm
|
9110cc6a9a
|
list
|
6 years ago |
|
杨树林
|
fbd43b7c4f
|
调整
|
6 years ago |
|
hjm
|
6d6199a708
|
remove
|
6 years ago |
|
杨树林
|
4d06b7a561
|
调整
|
6 years ago |
|
杨树林
|
d70bf4cfad
|
调整
|
6 years ago |
|
hjm
|
678ad697cb
|
确认要离开当前页面，当前数据不可恢复
|
6 years ago |
|
杨树林
|
1ce41ff550
|
调整
|
6 years ago |
|
hjm
|
819fd483c3
|
s
|
6 years ago |
|
杨树林
|
71b7557875
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树明
|
a6fbe9f176
|
Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
a52819710f
|
调整
|
6 years ago |
|
杨树林
|
8ec18cb752
|
调整
|
6 years ago |
|
杨树明
|
961e87ede1
|
调整
|
6 years ago |
|
杨树林
|
d87f339143
|
调整
|
6 years ago |
|
hjm
|
fa17886de0
|
cp
|
6 years ago |
|
hjm
|
a8a6561313
|
Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
hjm
|
a7baacbdec
|
先不delete
|
6 years ago |
|
杨树明
|
bbb55f7600
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
54121df076
|
封装open pdf 新开页下载
|
6 years ago |
|
hjm
|
1068b5d1fb
|
windows video/* 不管用 TODO
|
6 years ago |
|
杨树明
|
4d0e464a0f
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
6f8c315cd2
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
5d46519867
|
封装open pdf 新开页下载
|
6 years ago |
|
杨树明
|
b3b0f711d0
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
0c193369b4
|
Merge branches 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
# Conflicts:
# public/react/public/css/iconfont.css
# public/react/src/modules/user/usersInfo/InfosShixun.js
|
6 years ago |
|
杨树明
|
fadd1ecf43
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
caishi
|
414d1832c2
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
29ab7e95c2
|
头部跳转
|
6 years ago |
|
杨树明
|
44cec38843
|
Merge branches 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
# Conflicts:
# public/react/public/css/iconfont.css
# public/react/src/modules/user/usersInfo/InfosShixun.js
|
6 years ago |
|
hjm
|
27991c8fe1
|
Merge branch 'dev_aliyun' into dev_hjm_a
|
6 years ago |
|
hjm
|
9365c038f2
|
Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
hjm
|
e002d9f1eb
|
null
|
6 years ago |
|
hjm
|
35a071722f
|
check
|
6 years ago |
|
杨树明
|
9f90dceb3d
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
af5b025e5f
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
fff396a35f
|
调整
|
6 years ago |
|
杨树明
|
2809bc0e09
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
2bae6b81c7
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
3f2cdc3ece
|
调整
|
6 years ago |
|
hjm
|
c10ef72b2e
|
入口权限
|
6 years ago |
|
杨树明
|
1c3f9aae4d
|
调整
|
6 years ago |
|
hjm
|
c171e9d61f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
e7a96f8ad1
|
sort
|
6 years ago |
|
杨树明
|
d8a4808530
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
60ebfe8547
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
b094010ad1
|
调整
|
6 years ago |
|
杨树明
|
8f453c4ebd
|
调整
|
6 years ago |
|
杨树林
|
da0b6771bb
|
调整
|
6 years ago |
|
杨树明
|
2ca83ff066
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
9a0c4fa20b
|
调整
|
6 years ago |
|
杨树明
|
f348c35190
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
c37492dc75
|
封装showpdf方法
|
6 years ago |
|
杨树林
|
ed78456913
|
调整
|
6 years ago |
|
杨树明
|
86ae700024
|
调整
|
6 years ago |
|
hjm
|
f7bdccda09
|
time_limit + 5次
|
6 years ago |
|
杨树林
|
9cdb10ebcf
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
ad09458e3c
|
调整
|
6 years ago |
|
hjm
|
44eb63f026
|
重新创建 才会用最新的 dispatch
|
6 years ago |
|
hjm
|
83829d91c5
|
uploader
|
6 years ago |
|
杨树明
|
7414c7e490
|
调整精品课堂
|
6 years ago |
|
hjm
|
bcf91750a8
|
onUploadEnd: (uploadInfo) => {
|
6 years ago |
|
hjm
|
f5ac539fa6
|
视频云服务出现异常，请重新上传。
|
6 years ago |
|
杨树明
|
78414139f0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
7af46f772e
|
Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
hjm
|
96cefd80dd
|
// 如果不重新赋值，第二次create后，执行到这里会空指针
|
6 years ago |
|
杨树明
|
9982a5f526
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
05b09597de
|
1
|
6 years ago |
|
杨树明
|
fe6a0703a6
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
f9b8af0d61
|
调整
|
6 years ago |
|
hjm
|
a20e258185
|
id
|
6 years ago |
|
杨树明
|
1040d1fc55
|
调整
|
6 years ago |
|
杨树明
|
8324d49a95
|
b
|
6 years ago |
|
caishi
|
3a02cdf9bc
|
Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
caishi
|
9ee0879f68
|
个人主页
|
6 years ago |
|
杨树明
|
d22afcbad3
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
fd65a24d5d
|
调整
|
6 years ago |
|
hjm
|
fa38cebc19
|
delete
|
6 years ago |
|
hjm
|
871af9e74e
|
hover
|
6 years ago |
|
杨树明
|
02f0a12735
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
a082283212
|
调整
|
6 years ago |
|
杨树明
|
83b08d232d
|
调整
|
6 years ago |
|
杨树明
|
7cd46bc3ea
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
caishi
|
037e3c7d78
|
个人主页
|
6 years ago |
|
caishi
|
46cce4b237
|
Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
hjm
|
65322e0160
|
css
|
6 years ago |
|
caishi
|
c24f0987ee
|
个人主页iscurrent
|
6 years ago |
|
hjm
|
a5791057fe
|
Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
eed1aa4cf1
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
dd143f4543
|
资源列表增加pdf 展示功能
|
6 years ago |
|
hjm
|
d903a7d468
|
css
|
6 years ago |
|
杨树明
|
58ac01b34d
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
杨树明
|
de93d52d8c
|
调整
|
6 years ago |
|
hjm
|
65e8b67fec
|
Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
hjm
|
15b709854e
|
css
|
6 years ago |
|
杨树明
|
f14abf4f38
|
Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a
|
6 years ago |
|
hjm
|
987cfade38
|
nonedata
|
6 years ago |
|
hjm
|
5b28c51d76
|
nonedata
|
6 years ago |
|
杨树明
|
965f9b65f8
|
调整
|
6 years ago |
|
杨树林
|
6eff80ae47
|
调整
|
6 years ago |
|
hjm
|
8afa209ea8
|
css
|
6 years ago |
|
杨树明
|
f5a85e38f7
|
调整
|
6 years ago |
|
hjm
|
cc6f225c1a
|
bd
|
6 years ago |
|
hjm
|
e80cac998f
|
b
|
6 years ago |
|
hjm
|
d3d05c00c8
|
Merge branch 'dev_hjm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm
# Conflicts:
# public/react/public/css/iconfont.css
# public/react/src/common/components/media/AliyunUploader.js
# public/react/src/common/educoder.js
# public/react/src/modules/user/usersInfo/Infos.js
# public/react/src/modules/user/usersInfo/video/InfosVideo.js
# public/react/src/modules/user/usersInfo/video/VideoPublishSuccess.js
# public/react/src/modules/user/usersInfo/video/VideoUploadList.js
|
6 years ago |
|
hjm
|
b4c72bcff1
|
css
|
6 years ago |
|
hjm
|
f5a50a149d
|
closure
|
6 years ago |
|
hjm
|
855fd745bf
|
noUploads
|
6 years ago |
|
hjm
|
908f16c190
|
css
|
6 years ago |
|
hjm
|
8687aecbbf
|
def
|
6 years ago |
|
hjm
|
b78ee4d27e
|
c
|
6 years ago |
|
hjm
|
1416970fad
|
下拉
|
6 years ago |
|
hjm
|
c6b6a85a5c
|
copy iconfont
|
6 years ago |
|
hjm
|
23f58a0c33
|
css
|
6 years ago |
|
hjm
|
a97c737dfb
|
m
|
6 years ago |
|
hjm
|
30c9131c32
|
video
|
6 years ago |
|
hjm
|
1703e76c78
|
i
|
6 years ago |
|
hjm
|
0e47f3e69d
|
css
|
6 years ago |
|
hjm
|
ba4d2711ac
|
type size
|
6 years ago |
|
hjm
|
913f7ed2cf
|
接口
|
6 years ago |
|
hjm
|
d36da7c2c9
|
删除当前出错的，并执行下一个任务
|
6 years ago |
|
hjm
|
702b471d0b
|
video
|
6 years ago |
|
hjm
|
2abd97a217
|
video
|
6 years ago |
|
hjm
|
e806e8d589
|
阿里云
|
6 years ago |
|
杨树明
|
f571a8bb83
|
调整
|
6 years ago |
|
杨树明
|
c41aec0904
|
调整
|
6 years ago |
|
caishi
|
5a58440624
|
个人主页banner图更换size更小的
|
6 years ago |
|
caishi
|
0af5682461
|
Merge branch 'dev_hjm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm
# Conflicts:
# public/react/src/modules/user/usersInfo/InfosBanner.js
|
6 years ago |
|
caishi
|
ab4e31709d
|
个人主页
|
6 years ago |
|
杨树明
|
c751fecf72
|
合并
|
6 years ago |
|
杨树明
|
0c408581ae
|
调整
|
6 years ago |
|
杨树明
|
a9c4049d33
|
调整
|
6 years ago |
|
hjm
|
9c873ab0c7
|
css
|
6 years ago |
|
caishi
|
c1c8f4e680
|
Merge branch 'dev_hjm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm
|
6 years ago |
|
caishi
|
e20a8bb9df
|
Merge branch 'dev_hjm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm
# Conflicts:
# public/react/public/css/iconfont.css
|
6 years ago |
|
hjm
|
a639628879
|
def
|
6 years ago |
|
caishi
|
ab790abd31
|
个人主页改版
|
6 years ago |
|
hjm
|
364adf2a85
|
下拉
|
6 years ago |
|
杨树明
|
12dd5b128e
|
调整
|
6 years ago |
|
杨树林
|
7878109a43
|
Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树明
|
b22ac386fe
|
调整
|
6 years ago |
|
杨树林
|
8f202a7d5c
|
调整
|
6 years ago |
|
杨树明
|
a71382114e
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
a9b17d4223
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
40baf91b1c
|
调整
|
6 years ago |
|
杨树明
|
d3a504bd04
|
调整
|
6 years ago |
|
杨树明
|
b8259d8871
|
b
|
6 years ago |
|
杨树明
|
5ae88f1c21
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
6 years ago |
|
杨树林
|
c2d4243dfe
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
5a3dc6eae5
|
调整搜索 课堂根据字段跳转
|
6 years ago |
|
杨树明
|
13cf4b04d3
|
调整
|
6 years ago |
|
杨树明
|
8a9cd2b288
|
b
|
6 years ago |
|
hjm
|
5dc0e159c0
|
copy iconfont
|
6 years ago |
|
杨树明
|
422a40a59f
|
调整
|
6 years ago |
|
杨树明
|
2552761248
|
b
|
6 years ago |
|
caishi
|
9d281547e3
|
Merge branch 'dev_hjm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm
|
6 years ago |
|
hjm
|
8fd44e6182
|
css
|
6 years ago |
|
杨树林
|
2c94c246e8
|
调整
|
6 years ago |
|
caishi
|
5a4de0f87c
|
个人主页
|
6 years ago |
|
杨树明
|
81ff73e5e4
|
b
|
6 years ago |
|
杨树明
|
26b315555d
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树林
|
303b0b8f72
|
调整小手
|
6 years ago |
|
杨树林
|
47c73b8a04
|
空白试卷打开pdf
|
6 years ago |
|
杨树林
|
3e88829d01
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
cd3aecc8f1
|
调整
|
6 years ago |
|
杨树林
|
1cc224e709
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
23dd392c1d
|
空白试卷打开pdf
|
6 years ago |
|
hjm
|
dddb9a0aea
|
video
|
6 years ago |
|
caishi
|
2da8dd592b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
46580fd139
|
试卷交卷后页面没有显示选中的项
|
6 years ago |
|
杨树明
|
58c56d6324
|
b
|
6 years ago |
|
杨树明
|
8f624eeb6a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
14acd39a07
|
调整
|
6 years ago |
|
杨树林
|
027d99163c
|
调整
|
6 years ago |
|
杨树明
|
2de30bc91f
|
调整
|
6 years ago |
|
杨树林
|
38b72f0d70
|
调整
|
6 years ago |
|
杨树林
|
ea4a2ea0b8
|
调整
|
6 years ago |
|
杨树明
|
35f53bc9d0
|
b
|
6 years ago |
|
杨树明
|
c175fc84bd
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
f7a3ceb966
|
b
|
6 years ago |
|
杨树林
|
3232ae2ce8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
cbc100f8e1
|
调整
|
6 years ago |
|
hjm
|
871d7a57ac
|
判断是否有作品
|
6 years ago |
|
hjm
|
c55c315e96
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
772a6d06cb
|
member
|
6 years ago |
|
杨树林
|
c60c24d753
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
43762561ba
|
调整
|
6 years ago |
|
hjm
|
58e54dd802
|
video
|
6 years ago |
|
杨树林
|
632f6d1905
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
980aee35fd
|
调整
|
6 years ago |
|
杨树林
|
eade50e738
|
调整
|
6 years ago |
|
杨树林
|
d5ebe26cb8
|
调整
|
6 years ago |
|
杨树林
|
45103884d4
|
调整
|
6 years ago |
|
杨树林
|
d33dafd53c
|
调整
|
6 years ago |
|
杨树林
|
6d974f9a58
|
调整
|
6 years ago |
|
hjm
|
e31f73ace1
|
4
|
6 years ago |
|
杨树林
|
5c4ab203e9
|
调整
|
6 years ago |
|
hjm
|
b461f9b895
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
b809bb4467
|
删自己
|
6 years ago |
|
杨树林
|
c6852dda74
|
b
|
6 years ago |
|
杨树林
|
2729871a36
|
调整
|
6 years ago |
|
杨树林
|
97429b9c23
|
调整
|
6 years ago |
|
杨树林
|
8e0adec7bd
|
调整
|
6 years ago |
|
杨树林
|
c6a41cc348
|
调整
|
6 years ago |
|
杨树林
|
d3ad02535a
|
调整
|
6 years ago |
|
杨树林
|
612d455a7a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
09ef9987ea
|
allow_add_member
|
6 years ago |
|
杨树林
|
f7f64031cf
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
6ae1d40052
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
8c3d13dccf
|
this.props.history.push('/paths')
|
6 years ago |
|
杨树林
|
777736d47f
|
调整
|
6 years ago |
|
杨树林
|
89bf7c0b7c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
2cecc31c24
|
调整
|
6 years ago |
|
hjm
|
2e9bfeee26
|
log
|
6 years ago |
|
hjm
|
3206625ea8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
6022e88b1d
|
window.location.reload()
|
6 years ago |
|
杨树林
|
e2e8421f14
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
e7081f9ee7
|
调整
|
6 years ago |
|
hjm
|
2bd1b48b49
|
edit
|
6 years ago |
|
hjm
|
faefeff99b
|
新增allow_delete 判断是否能删除
|
6 years ago |
|
hjm
|
cde78d7603
|
noti
|
6 years ago |
|
hjm
|
ef3e8c7301
|
__Element
|
6 years ago |
|
hjm
|
d799a7e22b
|
sign
|
6 years ago |
|
hjm
|
e6d24639ee
|
sign
|
6 years ago |
|
hjm
|
1271666572
|
css
|
6 years ago |
|
杨树林
|
d8196bef47
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
746cfef993
|
调整
|
6 years ago |
|
hjm
|
e8a0697256
|
error
|
6 years ago |
|
hjm
|
10a889388e
|
console
|
6 years ago |
|
hjm
|
824badffba
|
type size
|
6 years ago |
|
杨树林
|
bf3dcdabc7
|
b
|
6 years ago |
|
hjm
|
f8c7f1eaa2
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
ca3edc22db
|
d
|
6 years ago |
|
杨树林
|
885e6e1b33
|
调整
|
6 years ago |
|
杨树林
|
66b0611886
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
d778481f9d
|
调整
|
6 years ago |
|
hjm
|
f214e741b7
|
del
|
6 years ago |
|
hjm
|
efc5d2108d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
6ba5259708
|
index
|
6 years ago |
|
杨树林
|
af7abbfe1d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
3c6360e557
|
调整
|
6 years ago |
|
hjm
|
5c5deca3ed
|
df
|
6 years ago |
|
hjm
|
fb7078a052
|
indec
|
6 years ago |
|
杨树林
|
24dd22aa35
|
b
|
6 years ago |
|
hjm
|
3aa38f1f39
|
接口
|
6 years ago |
|
hjm
|
a21ca8c695
|
删除当前出错的，并执行下一个任务
|
6 years ago |
|
杨树林
|
ac40293d22
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
ed244fae64
|
调整
|
6 years ago |
|
hjm
|
85bbbf40ef
|
如果是第一次完善资料，重新拉头部接口更新
|
6 years ago |
|
hjm
|
1c62cf337e
|
video
|
6 years ago |
|
杨树明
|
fcb2b1c9b1
|
Merge branches 'dev_Ysm' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
6 years ago |
|
杨树明
|
c068f4df49
|
调整
|
6 years ago |
|
杨树明
|
d217b09af0
|
调整
|
6 years ago |
|
杨树明
|
864161022b
|
b
|
6 years ago |
|
杨树林
|
f274eeddfb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
ac14036c74
|
调整
|
6 years ago |
|
杨树林
|
27e06c9ca6
|
调整
|
6 years ago |
|
杨树明
|
3758def11a
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
3aa11b0070
|
调整
|
6 years ago |
|
杨树林
|
40f14d7ae0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
1029d273de
|
调整
|
6 years ago |
|
杨树明
|
777a8f895a
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
3d20802e04
|
调整
|
6 years ago |
|
杨树林
|
aacef6ccce
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
d997704ed4
|
调整
|
6 years ago |
|
杨树明
|
673fb3f0bd
|
调整
|
6 years ago |
|
杨树明
|
6d3e29bad8
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
0919202427
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
12388a1f7b
|
调整
|
6 years ago |
|
杨树明
|
8fcd326566
|
调整增加退出刷新浏览器 谷歌/实践课程调整
|
6 years ago |
|
杨树明
|
37010a9c65
|
调整
|
6 years ago |
|
杨树明
|
51c06f366f
|
b
|
6 years ago |
|
杨树明
|
908e1a201d
|
登录
|
6 years ago |
|
杨树明
|
d8ce09cdb4
|
tab 首页筛选调整
|
6 years ago |
|
杨树明
|
74cddf178e
|
tab 首页筛选调整
|
6 years ago |
|
杨树明
|
50e1c25392
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
5a180802c6
|
调整代码查重跳转和体验
|
6 years ago |
|
杨树林
|
230b603b00
|
调整
|
6 years ago |
|
杨树明
|
a0b5fd69fb
|
调整火狐下拉加载刷新问题
|
6 years ago |
|
杨树林
|
e2c80258a2
|
调整列表页面非课堂显示
|
6 years ago |
|
杨树林
|
adfb64d87c
|
调整列表页面非课堂显示
|
6 years ago |
|
杨树林
|
284493c02f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
70853c2557
|
调整列表页面非课堂显示
|
6 years ago |
|
杨树明
|
ac618d5744
|
b
|
6 years ago |
|
hjm
|
a783776348
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
eae33ad063
|
color
|
6 years ago |
|
杨树林
|
63723ba15b
|
调整列表页面非课堂显示
|
6 years ago |
|
杨树明
|
7f48f07938
|
b
|
6 years ago |
|
杨树明
|
d0c0f7639a
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
b4d6142d53
|
调整
|
6 years ago |
|
hjm
|
b1ce653a33
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
64deed8908
|
13px font 130
|
6 years ago |
|
杨树林
|
f09d649a1e
|
个检索结果 数量统计
|
6 years ago |
|
hjm
|
5e581cb1ea
|
video
|
6 years ago |
|
杨树林
|
1af5ee5ba6
|
个检索结果 数量统计
|
6 years ago |
|
hjm
|
de9e0d6525
|
Merge branch 'dev_aliyun' into dev_hjm
|
6 years ago |
|
hjm
|
21d50dac04
|
阿里云
|
6 years ago |
|
杨树林
|
530179a6b1
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
ff0beb1bed
|
调整
|
6 years ago |
|
杨树林
|
f5696efcf8
|
调整
|
6 years ago |
|
杨树明
|
33416930a7
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
c3d8800105
|
调整
|
6 years ago |
|
杨树林
|
559cb4a58d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
230e6bf654
|
调整
|
6 years ago |
 jingquan huang
|
5a2984073e
|
Merge branch 'dev_aliyun' into dev_admin
|
6 years ago |
|
hjm
|
10fccf5ca1
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
498ebaa506
|
> 12
|
6 years ago |
|
杨树明
|
ed62f48a10
|
调整
|
6 years ago |
|
杨树林
|
b2d26654e2
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
14c99e9a72
|
调整
|
6 years ago |
|
杨树明
|
2b70af1355
|
调整
|
6 years ago |
|
杨树林
|
7ab045503f
|
调整
|
6 years ago |
|
杨树林
|
60606b6aa0
|
个检索结果 数量统计
|
6 years ago |
|
杨树林
|
c603e8c32c
|
调整
|
6 years ago |
|
杨树林
|
5414a7301e
|
调整
|
6 years ago |
|
杨树林
|
8a9ffd1952
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
cc85dfc0eb
|
个检索结果 数量统计
|
6 years ago |
|
hjm
|
c841a7a3d9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
929cbeb42d
|
width
|
6 years ago |
|
杨树林
|
07388f4437
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
459810bf96
|
个检索结果 数量统计
|
6 years ago |
|
杨树明
|
fa17b52356
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
bfe2071076
|
调整
|
6 years ago |
|
hjm
|
2266d818f3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
785f2d0efa
|
padding
|
6 years ago |
|
杨树林
|
9f69834d08
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
a3fc02cbc8
|
个检索结果 数量统计
|
6 years ago |
|
杨树明
|
21c91cc949
|
b
|
6 years ago |
|
杨树明
|
f5b99167cd
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
|
杨树明
|
eea07bf2f1
|
调整
|
6 years ago |
|
hjm
|
0369893e9a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
72349a6ddd
|
spin
|
6 years ago |
|
杨树林
|
abda9ed218
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树林
|
8a808eca67
|
个检索结果 数量统计
|
6 years ago |
|
杨树明
|
32715d1b67
|
b
|
6 years ago |
|
杨树明
|
ee830f0369
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
077fe65753
|
调整
|
6 years ago |
|
杨树明
|
65c5764031
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
721f1dd0d2
|
bottom
|
6 years ago |
|
杨树明
|
1c62a7e09d
|
调整
|
6 years ago |
|
杨树明
|
54d8f9df06
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
hjm
|
39705d9688
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
0f038dbee4
|
debug
|
6 years ago |
|
杨树明
|
b2bf345be5
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
|
杨树明
|
311122cb2c
|
调整
|
6 years ago |
|
杨树林
|
4cdfbcce8f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
3d0c856623
|
增加指引css
|
6 years ago |
|
杨树明
|
bc218fe3da
|
调整实践任务提交成功后继续提交 导致多个问题
|
6 years ago |
|
杨树明
|
b08832cf7f
|
调整
|
6 years ago |
|
hjm
|
6121de9d63
|
separator
|
6 years ago |
|
杨树明
|
c52fdcea57
|
调整
|
6 years ago |
|
杨树林
|
e45d3b3d99
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
aa66bd1f81
|
增加指引
|
6 years ago |
|
hjm
|
36a94d159c
|
bread
|
6 years ago |
|
hjm
|
b195074461
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
3ce799e154
|
面包屑
|
6 years ago |
|
杨树明
|
f0e7a4ab43
|
课堂banner 数据显示调整
|
6 years ago |
|
杨树明
|
422dc75f6e
|
b
|
6 years ago |
|
杨树明
|
fc2c3a846e
|
Merge branches 'dev_Ysl', 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
杨树明
|
091624cadf
|
课堂banner 数据显示调整
|
6 years ago |
|
hjm
|
b3c6a31b55
|
disabledDate={disabledDateFunc}
|
6 years ago |
|
杨树明
|
9302b69fcd
|
申请新建脚本移植到编辑
|
6 years ago |
|
hjm
|
6137cb7e8b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
05e48faf7a
|
样式重构
|
6 years ago |
|
caishi
|
0c8afafdf4
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
5d87411130
|
个人主页去掉试用申请按钮，（试用申请流程已经去除）
|
6 years ago |
|
杨树林
|
428b67bfdf
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
|
杨树林
|
bd0fda3541
|
调整
|
6 years ago |
|
杨树林
|
a2fa94ddea
|
调整
|
6 years ago |
|
杨树林
|
e28511177b
|
加注释
|
6 years ago |
|
杨树明
|
9f7ccb6401
|
调整
|
6 years ago |
|
caishi
|
88116e55cc
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
d5473c01f9
|
教学案例封面图
|
6 years ago |
|
hjm
|
2b029f9cd2
|
img
|
6 years ago |
|
hjm
|
37d890fcf8
|
实践课程
|
6 years ago |
|
caishi
|
e62ffdc463
|
完善资料
|
6 years ago |
|
caishi
|
3b97dd75ad
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
e81ff50299
|
issue
|
6 years ago |
|
hjm
|
09b893c86d
|
资料完善
|
6 years ago |
|
hjm
|
5086052897
|
response.data.message
|
6 years ago |
|
hjm
|
2573000928
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
4a3b8ed0ed
|
教学案例--issue
|
6 years ago |
|
hjm
|
24bf86ca6a
|
// 如果第一次发生404，则隔1s后再调用一次本接口；（因为ucloud主从同步可能有延迟）
|
6 years ago |
|
hjm
|
de64fc0fab
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
4bfb9bd9b6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
acd96fc822
|
教学案例--issue
|
6 years ago |
|
hjm
|
576d1160a9
|
备注，这个改动没启用，只是做个记录
|
6 years ago |
|
hjm
|
275110d287
|
备注，这个改动没启用，只是做个记录：
|
6 years ago |
|
hjm
|
9076a7bf2c
|
html内的回车换行不转br
|
6 years ago |
|
hjm
|
dd001fbe67
|
hash跳转
|
6 years ago |
|
hjm
|
ad83326ebd
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
cac358d896
|
emoji 默认关闭
|
6 years ago |
|
hjm
|
32062a5d5e
|
新建选择题时，没法切回 ‘本关任务’ tab
|
6 years ago |
|
jingquan huang
|
56264e34bd
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
jingquan huang
|
6a0f2aaecb
|
检测reponame为空的问题
|
6 years ago |
|
hjm
|
c1407f2452
|
h
|
6 years ago |
|
hjm
|
717222746d
|
width
|
6 years ago |
|
hjm
|
d68c186a4f
|
state
|
6 years ago |
|
hjm
|
d4ad4bb029
|
点赞数
|
6 years ago |
|
hjm
|
5fdbbcd319
|
LinkAfterLogin
|
6 years ago |
|
hjm
|
8960cc6216
|
showHiddenButton={true}
|
6 years ago |
|
hjm
|
d77d873787
|
index
|
6 years ago |
|
hjm
|
e0004e029d
|
title
|
6 years ago |
|
jingquan huang
|
c4dc36a37f
|
管理员界面初始化
|
6 years ago |
|
hjm
|
da34f9c687
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
90dd68e5b4
|
修改
|
6 years ago |
|
caishi
|
c3e287cff8
|
个人主页姓名过长省略
|
6 years ago |
|
hjm
|
58203e59cc
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
553c13a647
|
length
|
6 years ago |
|
hjm
|
c414beaa5b
|
https://www.trustie.net/issues/22810
|
6 years ago |
|
caishi
|
0fce5d58e7
|
个人主页姓名超出省略
|
6 years ago |
|
hjm
|
c0359dc57d
|
30
|
6 years ago |
|
hjm
|
e4166bb0e6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
781cdc129d
|
试卷统计结果
|
6 years ago |
|
hjm
|
6ecd439ce5
|
请输入真实姓名，最大限制10个字符
|
6 years ago |
|
caishi
|
ad7c52aa14
|
试卷-统计结果
|
6 years ago |
|
hjm
|
8256ede495
|
大小
|
6 years ago |
|
hjm
|
ffe398bd52
|
/moop_cases/new
|
6 years ago |
|
hjm
|
099e5bfbfc
|
/* 某些情况下，被cm盖住了 */
|
6 years ago |
|
hjm
|
a0e7afaf22
|
md
|
6 years ago |
|
hjm
|
3046237a56
|
// 解决有时候编辑时内容不显示的问题
|
6 years ago |
|
hjm
|
e68241c064
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
5b32c98abd
|
h
|
6 years ago |
|
caishi
|
116ca8b6ff
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
caishi
|
39777f17ad
|
案例文档必须上传
|
6 years ago |
|
hjm
|
f58d1e1b84
|
去 is_md
|
6 years ago |
|
hjm
|
cbdbe7bf7d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
81950a771b
|
flex start
|
6 years ago |
|
caishi
|
f811769bf6
|
Merge branch 'dev_Cs' into dev_aliyun
|
6 years ago |
|
caishi
|
a3241dae68
|
案例提交保存-以及保存成功页
|
6 years ago |
|
hjm
|
0994809511
|
1
|
6 years ago |
|
hjm
|
d7e9e041b5
|
reward
|
6 years ago |
|
hjm
|
c6d491f0a3
|
https://www.trustie.net/issues/22768
|
6 years ago |
|
hjm
|
3aa6e30765
|
请输入您的姓名，最大限制10个字符
|
6 years ago |
|
hjm
|
fa4cc931da
|
line-height: 1.2;
|
6 years ago |
|
hjm
|
328f05a235
|
resize
|
6 years ago |
|
hjm
|
b1ba192f40
|
markdown-body
|
6 years ago |
|
hjm
|
f41d6ffc15
|
bg
|
6 years ago |
|
hjm
|
1d92834ee5
|
sub
|
6 years ago |
|
hjm
|
fbc8ada5e9
|
login
|
6 years ago |
|
hjm
|
f558c9d3ce
|
reward
|
6 years ago |
|
hjm
|
909bd562d0
|
交流问答
|
6 years ago |
|
caishi
|
1acd1d2d27
|
Merge branch 'dev_aliyun' into dev_Cs
# Conflicts:
# public/react/src/App.js
|
6 years ago |
|
caishi
|
b50c897f20
|
教学案例详情和新建
|
6 years ago |
|
hjm
|
285b84801c
|
isSuperAdmin
|
6 years ago |
|
hjm
|
b2964205a4
|
updated_at
|
6 years ago |
|
hjm
|
d15e0e3bd7
|
margin-bottom: 0px !important;
|
6 years ago |
|
hjm
|
10d534bbd5
|
删除
|
6 years ago |
|
hjm
|
e87665010b
|
(示例课堂，部分成员不可见)
|
6 years ago |
|
hjm
|
ef32b49770
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
2fb774e243
|
统一 noti
|
6 years ago |
|
杨树林
|
337827d4a0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
|
6 years ago |
|
hjm
|
85842e5226
|
title
|
6 years ago |
|
hjm
|
1c3fec0cc7
|
附件
|
6 years ago |
|
hjm
|
90136595f2
|
a href
|
6 years ago |
|
hjm
|
eefaf77b5f
|
safari
|
6 years ago |
|
杨树林
|
48bef2dc27
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
cxt
|
2b44e65cb2
|
Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
|
hjm
|
d84e865151
|
created_at
|
6 years ago |
|
cxt
|
04bf6fe40c
|
Merge branch 'develop' into dev_aliyun
|
6 years ago |
|
hjm
|
c0458052c7
|
置顶
|
6 years ago |
|
杨树明
|
5c733f3f8d
|
bd
|
6 years ago |
|
杨树林
|
33ebb264eb
|
调整
|
6 years ago |
