SylorHuang
|
59ef4539be
|
Merge branch 'dev_aliyun' into develop
|
5 years ago |
hjm
|
1a2de9b995
|
Checkbox
|
5 years ago |
SylorHuang
|
beccc3a05f
|
Merge branch 'dev_aliyun' into develop
|
5 years ago |
杨树林
|
bad129a0cc
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
afb8c97f63
|
调整
|
5 years ago |
杨树明
|
31fc3b373d
|
调整
|
5 years ago |
杨树明
|
4e1e83f8fe
|
调整
|
5 years ago |
杨树明
|
c72d5b7a79
|
调整
|
5 years ago |
杨树明
|
afed091901
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
098049cfca
|
调整
|
5 years ago |
杨树林
|
ac07bb24aa
|
调整
|
5 years ago |
杨树林
|
acde3709b2
|
调整
|
5 years ago |
杨树明
|
709ea7b6e9
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
c8e5faf931
|
调整
|
5 years ago |
杨树林
|
094c15ac34
|
调整
|
5 years ago |
杨树林
|
847d5ad370
|
调整
|
5 years ago |
杨树明
|
f20d8e8332
|
调整
|
5 years ago |
杨树明
|
26ad3f9723
|
调整
|
5 years ago |
杨树林
|
ee4e560895
|
调整
|
5 years ago |
杨树林
|
682673232a
|
Default Changelist
|
5 years ago |
杨树明
|
abf4fdfee6
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/config/webpack.config.dev.js
|
5 years ago |
hjm
|
94ceb90918
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
c941152e72
|
const $ = window.$
|
5 years ago |
杨树明
|
f9d576bbc8
|
调整
|
5 years ago |
杨树明
|
6420d05eba
|
Merge branches 'dev_aliyun' and 'dev_newshixunModel' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
11253a8cf8
|
新版实训课程
|
5 years ago |
hjm
|
d1a77755d8
|
网络恢复正常,感谢使用
|
5 years ago |
hjm
|
28b258f1cd
|
去时间参数
|
5 years ago |
hjm
|
d9b62b05fe
|
Merge branch 'dev_hjm_a' into dev_aliyun
|
5 years ago |
hjm
|
c08eaf8012
|
导出
|
5 years ago |
hjm
|
032e5dd3f2
|
这里会存在很长的字符串,如果不折行会影响阅读
|
5 years ago |
杨树明
|
1c535ff934
|
调整
|
5 years ago |
杨树明
|
f1dd73de1c
|
调整
|
5 years ago |
杨树林
|
2561d437a3
|
调整
|
5 years ago |
杨树明
|
994ad50fd5
|
调整
|
5 years ago |
杨树林
|
611dc5d29c
|
调整
|
5 years ago |
杨树林
|
2e00d1413b
|
调整
|
5 years ago |
杨树林
|
9bd98fb62d
|
调整
|
5 years ago |
杨树明
|
17a483d52b
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
b0814f5600
|
调整
|
5 years ago |
杨树明
|
730a9c719a
|
Merge branches 'dev_aliyun', 'dev_cs' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
97fe089a72
|
调整
|
5 years ago |
杨树明
|
05b4bf893a
|
调整
|
5 years ago |
hjm
|
6f142a8500
|
接口
|
5 years ago |
杨树明
|
e65b927567
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
51e3325fee
|
调整
|
5 years ago |
hjm
|
d7008219e9
|
init
|
5 years ago |
杨树明
|
83c8080430
|
调整
|
5 years ago |
hjm
|
ff3ec5436b
|
样式
|
5 years ago |
hjm
|
018c2a3ee7
|
列数不对
|
5 years ago |
hjm
|
be1d2f76d4
|
cleare
|
5 years ago |
hjm
|
bb49f978c9
|
loading
|
5 years ago |
杨树明
|
664777d571
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
c7a49b493c
|
调整
|
5 years ago |
杨树明
|
ab211b4b74
|
调整毕设弹窗
|
5 years ago |
hjm
|
12f28bcfae
|
place
|
5 years ago |
hjm
|
96c7a94c3d
|
Merge branch 'dev_ec' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ec
|
5 years ago |
hjm
|
25941dbcf4
|
接口
|
5 years ago |
杨树明
|
de0fe99b31
|
调整毕设弹窗
|
5 years ago |
杨树林
|
7032fa8ea7
|
调整
|
5 years ago |
杨树林
|
4e61419e9c
|
调整
|
5 years ago |
hjm
|
2881ac6254
|
this.props.updataleftNavfun()
|
5 years ago |
hjm
|
924ce186cc
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
9980a82781
|
28px
|
5 years ago |
caicai8
|
271dc09f49
|
毕设任务列表-显示发布者姓名
|
5 years ago |
杨树林
|
b7f46688e3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ec
|
5 years ago |
hjm
|
1b23d59117
|
config
|
5 years ago |
杨树明
|
41e6106275
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
080ac7111f
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
64149719a5
|
调整
|
5 years ago |
hjm
|
242d353185
|
cm.focus()
|
5 years ago |
杨树明
|
c624ae51c8
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
794d35968d
|
调整
|
5 years ago |
杨树林
|
cba9e79bf5
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
1cec2db454
|
调整
|
5 years ago |
杨树明
|
59315e4478
|
调整
|
5 years ago |
杨树明
|
afbf3bd439
|
调整
|
5 years ago |
杨树明
|
2bb947e5da
|
调整
|
5 years ago |
杨树林
|
0ee59c82b9
|
调整
|
5 years ago |
hjm
|
204f296568
|
Merge branch 'dev_aliyun' into dev_hjm_a
|
5 years ago |
杨树明
|
54da019321
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
42773de239
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
e7652a1acb
|
调整
|
5 years ago |
杨树林
|
3636b359f6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
275f245f4d
|
调整
|
5 years ago |
杨树明
|
bdb2564561
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
eae00a74e6
|
调整
|
5 years ago |
hjm
|
e2f6056d50
|
//工程认证各个页面的查看详情弹层
|
5 years ago |
杨树林
|
59a378d7f8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
75c7dbbc79
|
调整
|
5 years ago |
p31729568
|
3c2286cc2c
|
admin: image prew moveable
|
5 years ago |
杨树明
|
08c05eb333
|
Merge branches 'dev_aliyun' and 'onigin/ysl_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
8c3668adc8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
6e580ea305
|
公式加try catch
|
5 years ago |
杨树林
|
4142bd3b36
|
调整
|
5 years ago |
杨树明
|
b369d36a3b
|
Merge branches 'dev_aliyun' and 'onigin/ysl_a' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
# Conflicts:
# public/react/src/modules/courses/Resource/Fileslistitem.js
# public/react/src/modules/courses/busyWork/CommonWorkItem.js
# public/react/src/modules/courses/exercise/ExerciseListItem.js
# public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
# public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
# public/react/src/modules/courses/poll/PollListItem.js
# public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
# public/react/src/modules/login/LoginDialog.js
|
5 years ago |
杨树明
|
94721dca44
|
Merge branches 'dev_aliyun' and 'onigin/ysl_a' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
# Conflicts:
# public/react/src/modules/courses/Resource/Fileslistitem.js
# public/react/src/modules/courses/busyWork/CommonWorkItem.js
# public/react/src/modules/courses/exercise/ExerciseListItem.js
# public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
# public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
# public/react/src/modules/courses/poll/PollListItem.js
# public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
# public/react/src/modules/login/LoginDialog.js
|
5 years ago |
杨树明
|
f4dbd10d0c
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
20949e6fca
|
调整登录
|
5 years ago |
hjm
|
e7926ba12c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
88970c05e5
|
未发布
|
5 years ago |
hjm
|
c4c60a9261
|
背景知识
|
5 years ago |
hjm
|
fb5ee8d75d
|
0
|
5 years ago |
杨树明
|
186a873de4
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
91359292a6
|
调整登录 验证逻辑判断
|
5 years ago |
hjm
|
1f13fef45d
|
修改 导出
|
5 years ago |
hjm
|
8e6882e8bc
|
table 数据
|
5 years ago |
杨树林
|
8e7ee4225a
|
调整
|
5 years ago |
杨树林
|
8df6fd8607
|
调整
|
5 years ago |
杨树林
|
0701cb289c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
|
5 years ago |
杨树林
|
99dcdce07a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
cfd08fe1d8
|
调整
|
5 years ago |
杨树明
|
ec492191d6
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树林
|
46cd5f6c73
|
调整
|
5 years ago |
杨树明
|
58f8fd0f06
|
调整
|
5 years ago |
杨树明
|
1adc97ca64
|
调整
|
5 years ago |
杨树明
|
1c3caa3841
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
83441e3804
|
调整
|
5 years ago |
杨树林
|
4105e476cb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
|
5 years ago |
杨树林
|
04b2aecf3e
|
调整
|
5 years ago |
杨树林
|
81b5d5b3a7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
|
5 years ago |
杨树林
|
d3f1f5402a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
a2f3505345
|
调整
|
5 years ago |
杨树明
|
54c2428c44
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/paths/PathDetail/DetailCards.js
|
5 years ago |
杨树明
|
7ad5fc1f82
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
5 years ago |
杨树明
|
6b6aff953f
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/paths/PathDetail/DetailCards.js
|
5 years ago |
hjm
|
61dad66bfb
|
this.state.description != ''
|
5 years ago |
杨树明
|
443dc7115a
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/paths/PathDetail/DetailCards.js
|
5 years ago |
杨树明
|
274910d0a9
|
调整权限
|
5 years ago |
hjm
|
66869129c0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
0a3192628f
|
window.setTimeout
|
5 years ago |
hjm
|
e7a6146d19
|
init
|
5 years ago |
杨树明
|
65b6b01ce2
|
调整权限
|
5 years ago |
杨树林
|
e6035fd0b1
|
调整
|
5 years ago |
hjm
|
493dae25c2
|
init
|
5 years ago |
杨树明
|
f29d5d504f
|
金课调整
|
5 years ago |
hjm
|
da488e7baf
|
Merge branch 'dev_aliyun' into dev_ec
|
5 years ago |
杨树林
|
f02c789147
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
|
5 years ago |
杨树林
|
6e642f0881
|
调整
|
5 years ago |
杨树林
|
638d76ac27
|
调整
|
5 years ago |
杨树林
|
56665203d5
|
调整
|
5 years ago |
杨树明
|
28eefd8f08
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
d9716703f0
|
调整
|
5 years ago |
杨树林
|
bbf04f17f2
|
调整
|
5 years ago |
杨树林
|
a11da1841a
|
调整
|
5 years ago |
hjm
|
f90e08c49f
|
作业评阅
|
5 years ago |
hjm
|
6e5afff47f
|
所有二级回复 https://www.trustie.net/issues/24302
|
5 years ago |
hjm
|
6b0d8becc2
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
bcbfa17b4c
|
升级到v0.4.0 从/educoder/public/editormd/lib/marked.min.js复制
|
5 years ago |
杨树林
|
212362384d
|
调整
|
5 years ago |
杨树林
|
21f95435fa
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
|
5 years ago |
杨树林
|
48c80b6e5f
|
调整
|
5 years ago |
杨树明
|
c9e13c644c
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
8e0b067b69
|
调整
|
5 years ago |
杨树林
|
3702b71e4b
|
Merge branch 'onigin/ysl_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
2d495af601
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
|
5 years ago |
杨树林
|
7ac33f4318
|
调整
|
5 years ago |
hjm
|
bdf252c588
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
a10a7608da
|
编辑滚动的问题
|
5 years ago |
杨树林
|
be91005008
|
调整
|
5 years ago |
杨树林
|
94758ec442
|
调整
|
5 years ago |
hjm
|
c8d0a0ec9b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
c63298e268
|
Revert " if (this.props.noSetValue) {"
This reverts commit 4ceff1f77a .
|
5 years ago |
杨树林
|
4a7b2638f7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
b0d4d5cbd0
|
调整
|
5 years ago |
hjm
|
aa3fe4b45b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
4ceff1f77a
|
if (this.props.noSetValue) {
isEdit
|
5 years ago |
杨树明
|
2fcf7c1da2
|
调整
|
5 years ago |
杨树明
|
9f1b8fb21e
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
ad2247b2f1
|
调整
|
5 years ago |
杨树林
|
e31ed94656
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
4e5c983d67
|
调整
|
5 years ago |
杨树明
|
2161d292c1
|
b
|
5 years ago |
杨树明
|
c02607582b
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
b8cf557de0
|
Merge remote-tracking branch 'origin/dev_cs' into dev_cs
# Conflicts:
# public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
# public/react/src/modules/paths/PathDetail/DetailTop.js
|
5 years ago |
杨树明
|
b01ed8348a
|
合并
|
5 years ago |
杨树明
|
afd45c2512
|
调整
|
5 years ago |
杨树明
|
06cde99cd6
|
调整
|
5 years ago |
杨树明
|
c64deb1dba
|
调整
|
5 years ago |
杨树林
|
51cf018b12
|
调整
|
5 years ago |
杨树明
|
8383fe7ab5
|
调整
|
5 years ago |
杨树明
|
478b878177
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
a367dba020
|
调整
|
5 years ago |
hjm
|
8bac33c034
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
5d18ca45a5
|
先加时间戳
|
5 years ago |
杨树明
|
1c5e734200
|
调整
|
5 years ago |
杨树明
|
58a4655d7b
|
调整
|
5 years ago |
杨树明
|
077c205bd9
|
调整毕设
|
5 years ago |
杨树明
|
6a64198bba
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
48a1810b68
|
调整毕设
|
5 years ago |
杨树林
|
4ca77262f5
|
调整
|
5 years ago |
杨树林
|
1d014940cd
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
64fabd601f
|
调整
|
5 years ago |
杨树明
|
0877e5fc0c
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
334a5e322a
|
调整
|
5 years ago |
hjm
|
5e10f98890
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
1edbcf9ad3
|
多余 的一句
|
5 years ago |
杨树林
|
562b01bde1
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树林
|
3411c80099
|
调整
|
5 years ago |
杨树林
|
3d4604f316
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |