杨树明
|
7eab5786e3
|
调整
|
5 years ago |
杨树明
|
4b8d4348ed
|
调整
|
5 years ago |
杨树林
|
e04a81881c
|
调整
|
5 years ago |
杨树明
|
c469e59ad1
|
调整
|
5 years ago |
杨树明
|
91696957d8
|
调整
|
5 years ago |
杨树明
|
9eb25f7cca
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
|
5 years ago |
杨树林
|
75c1d3c0e4
|
bd
|
5 years ago |
杨树明
|
b5941cf2e9
|
b
|
5 years ago |
杨树林
|
a4c715becb
|
bd
|
5 years ago |
杨树林
|
e3fd062b44
|
bd
|
5 years ago |
杨树林
|
1e6d5fe296
|
bd
|
5 years ago |
杨树林
|
a63cc8c3ca
|
新版build
|
5 years ago |
杨树林
|
916422ccb4
|
删除新版build
|
5 years ago |
杨树林
|
79c6c45794
|
删除旧版build
|
5 years ago |
hjm
|
1d2097611b
|
选择题答案显示不了公式的问题
|
5 years ago |
杨树林
|
bfd68d30a4
|
新build
|
5 years ago |
SylorHuang
|
59ef4539be
|
Merge branch 'dev_aliyun' into develop
|
5 years ago |
杨树林
|
315c81fcee
|
删除旧版build
|
5 years ago |
杨树林
|
9e9a63f741
|
b
|
5 years ago |
杨树林
|
fff64e238c
|
删除旧版build
|
5 years ago |
杨树林
|
f70198e292
|
合并阿里云
|
5 years ago |
杨树林
|
fe936bd298
|
调整
|
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 |
杨树林
|
efc0f7779c
|
build
|
5 years ago |
杨树林
|
29b4d52d99
|
build
|
5 years ago |
杨树林
|
2a2095820f
|
b
|
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 |
杨树林
|
57947b4e16
|
build
|
5 years ago |
杨树林
|
6e3be1ef30
|
build
|
5 years ago |
hjm
|
d1a77755d8
|
网络恢复正常,感谢使用
|
5 years ago |
杨树林
|
81f9ed20ef
|
调整后代码build
|
5 years ago |
杨树林
|
6e4b73d574
|
调整后代码build
|
5 years ago |
杨树林
|
314fec99d4
|
调整
|
5 years ago |
hjm
|
28b258f1cd
|
去时间参数
|
5 years ago |
杨树林
|
258281e0b5
|
调整轮播点击事件
|
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 |
杨树林
|
7ea6b3abca
|
调整移动图标
|
5 years ago |
杨树林
|
6d31a4df81
|
调整移动图标
|
5 years ago |
杨树林
|
ea57b7f3af
|
调整移动图标
|
5 years ago |
杨树明
|
1c535ff934
|
调整
|
5 years ago |
杨树明
|
f1dd73de1c
|
调整
|
5 years ago |
杨树林
|
c2e3ae2af3
|
调整移动图标
|
5 years ago |
杨树林
|
bff38e04de
|
调整
|
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 |
杨树林
|
4bec189710
|
调整
|
5 years ago |
杨树林
|
12c4450ef9
|
bd
|
5 years ago |
杨树林
|
8767781950
|
bd
|
5 years ago |
杨树林
|
cee11aee64
|
bd
|
5 years ago |
杨树林
|
fbcdae5e1c
|
bd
|
5 years ago |
杨树林
|
16cdccc861
|
bd
|
5 years ago |
杨树林
|
de7436d99f
|
b
|
5 years ago |
杨树林
|
798c103d2c
|
bd
|
5 years ago |
杨树林
|
7f1591fb8e
|
bd
|
5 years ago |
杨树林
|
3bf6e3c88b
|
bd
|
5 years ago |
杨树林
|
35b55cd06d
|
b
|
5 years ago |
杨树林
|
dd120c1878
|
Default Changelist
|
5 years ago |
杨树林
|
beaf3fcd4f
|
Default Changelist
|
5 years ago |
杨树林
|
76296fee5d
|
Default Changelist
|
5 years ago |
杨树林
|
c1a4e2a7fb
|
调整
|
5 years ago |
杨树林
|
77f5c28d58
|
bd
|
5 years ago |
杨树林
|
78d6297f0c
|
bd
|
5 years ago |
杨树林
|
3fe260cbcd
|
b
|
5 years ago |
杨树林
|
e1b49382b4
|
bd
|
5 years ago |
杨树林
|
36cb9180b7
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_local
|
5 years ago |
杨树林
|
66da21228c
|
bd
|
5 years ago |
杨树林
|
a8b0a373b4
|
b
|
5 years ago |
杨树明
|
97fe089a72
|
调整
|
5 years ago |
杨树明
|
05b4bf893a
|
调整
|
5 years ago |
杨树林
|
95c4364a7c
|
bd
|
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 |
杨树林
|
ab9627be0e
|
bd
|
5 years ago |
杨树明
|
51e3325fee
|
调整
|
5 years ago |
hjm
|
d7008219e9
|
init
|
5 years ago |
杨树林
|
b524e576b1
|
bd
|
5 years ago |
杨树明
|
83c8080430
|
调整
|
5 years ago |
杨树林
|
62720bdd09
|
bd
|
5 years ago |
杨树林
|
02322b5b3b
|
bd
|
5 years ago |
hjm
|
ff3ec5436b
|
样式
|
5 years ago |
hjm
|
018c2a3ee7
|
列数不对
|
5 years ago |
杨树林
|
303ab11df0
|
bd
|
5 years ago |
杨树林
|
5df997739b
|
bd
|
5 years ago |
杨树林
|
a687686e11
|
bd
|
5 years ago |
杨树林
|
1ccd99790c
|
bd
|
5 years ago |
杨树林
|
d9a4ee4f87
|
bd
|
5 years ago |
杨树林
|
02bc66014e
|
b
|
5 years ago |
杨树林
|
c152b1eee1
|
bd
|
5 years ago |
杨树林
|
46ed36baa4
|
bd
|
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 |
杨树林
|
dcb6812af6
|
b
|
5 years ago |
杨树林
|
4ab5811e2a
|
合并阿里云 造成隐藏又显示 处理
|
5 years ago |
杨树明
|
c7a49b493c
|
调整
|
5 years ago |
杨树明
|
ab211b4b74
|
调整毕设弹窗
|
5 years ago |
杨树林
|
9ef0d41a34
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_local
|
5 years ago |
杨树林
|
1a298b29a8
|
调整
|
5 years ago |
hjm
|
12f28bcfae
|
place
|
5 years ago |
杨树林
|
55f46ff6b3
|
调整
|
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 |
杨树林
|
afadc7f78b
|
调整
|
5 years ago |
杨树林
|
aa7e5a2e5f
|
调整
|
5 years ago |
杨树林
|
a1e19b6940
|
调整css
|
5 years ago |
杨树林
|
931ccb59c7
|
调整css
|
5 years ago |
杨树明
|
de0fe99b31
|
调整毕设弹窗
|
5 years ago |
杨树林
|
25f7e75a05
|
合并develop
|
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 |
杨树林
|
6060c488fe
|
调整
|
5 years ago |
杨树明
|
f4dbd10d0c
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
20949e6fca
|
调整登录
|
5 years ago |
杨树林
|
feac332ff4
|
调整
|
5 years ago |
杨树林
|
e40d8b4307
|
b
|
5 years ago |
杨树林
|
8b3adb2834
|
调整
|
5 years ago |
杨树林
|
3121212400
|
b
|
5 years ago |
杨树林
|
a447dff938
|
调整
|
5 years ago |
杨树林
|
b4731b6ace
|
Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_local
|
5 years ago |
杨树林
|
1f0d3e9853
|
调整
|
5 years ago |
p31729568
|
7bead01fff
|
precompile
|
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 |
杨树林
|
5290ef7b3b
|
b
|
5 years ago |
杨树林
|
9163a925e4
|
调整
|
5 years ago |
杨树明
|
186a873de4
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
91359292a6
|
调整登录 验证逻辑判断
|
5 years ago |
杨树林
|
0a4ddcd4b0
|
b
|
5 years ago |
杨树林
|
10450c6a54
|
调整
|
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 |
杨树林
|
6d4b72d27b
|
bd
|
5 years ago |
杨树林
|
27c745ef8f
|
调整
|
5 years ago |
杨树林
|
9b97e629b1
|
调整
|
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 |
杨树林
|
7cd64eb6fb
|
调整
|
5 years ago |
杨树明
|
24def0f1e6
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
e59789c843
|
调整
|
5 years ago |
hjm
|
97d0dd3cbe
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
37101ef30d
|
描述
|
5 years ago |
杨树明
|
7c7b88b32e
|
调整
|
5 years ago |
杨树明
|
19a0a6c663
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树林
|
587c0c3130
|
调整
|
5 years ago |
杨树林
|
ed607d7437
|
调整
|
5 years ago |
杨树林
|
d7d4d8c860
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树林
|
d5b0d180f5
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
000a503a7e
|
调整
|
5 years ago |
hjm
|
663443b577
|
按钮控制
|
5 years ago |
hjm
|
bbe5c48564
|
重试
|
5 years ago |
hjm
|
e077b614c3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
552a01b2ee
|
出现重试时,显示头部
|
5 years ago |
杨树林
|
66ce4f7020
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树林
|
b7ab4bee8a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
438eceed42
|
调整
|
5 years ago |
杨树明
|
0a01bc3fb2
|
Merge branches 'dev_aliyun' and 'dev_cs' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cs
|
5 years ago |
杨树明
|
cb0790470a
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
72e0efaf5a
|
金课调整
|
5 years ago |
杨树林
|
df4e08acdb
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
0670a440c5
|
调整
|
5 years ago |
hjm
|
026b0a8f66
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
959fc4e02a
|
table
|
5 years ago |
杨树林
|
8daba535a3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
a8e1f030ce
|
调整
|
5 years ago |
hjm
|
a7e7f1dca6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
25a05ac0a3
|
最后的回车换行
|
5 years ago |
杨树林
|
2ede9c3912
|
调整
|
5 years ago |
杨树林
|
8533ab20d9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
09f4aba88e
|
调整
|
5 years ago |
hjm
|
57c893e300
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
218e416b31
|
2个table: b(a.cells[p],a.header.length) -> a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */)
|
5 years ago |
杨树林
|
1146f529d3
|
调整
|
5 years ago |
杨树林
|
03c2ed1fc8
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
3e532b0e49
|
调整
|
5 years ago |
hjm
|
41e89a3fbe
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
e4542d3ebb
|
b(a.cells[p],a.header.length) -> a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */)
|
5 years ago |
杨树明
|
0fc5da2770
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
4adfa10fd9
|
调整金课课程
|
5 years ago |
杨树林
|
ae3155785f
|
调整
|
5 years ago |
杨树林
|
33a0bb83ce
|
调整
|
5 years ago |
杨树林
|
3519715424
|
调整实训作业设置页面功能
|
5 years ago |
杨树明
|
8e8bcbf503
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
eea5a1986f
|
https
|
5 years ago |
杨树林
|
b154df5485
|
调整权限参数
|
5 years ago |
杨树明
|
6127cc2ca9
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
9c6e389630
|
调整
|
5 years ago |
杨树林
|
e25ec454f6
|
调整bd
|
5 years ago |
杨树林
|
ee595e9e9a
|
调整bd
|
5 years ago |
杨树林
|
a32aa9dde6
|
调整bd
|
5 years ago |
杨树林
|
a328375a97
|
调整bd
|
5 years ago |
杨树林
|
facea97f5e
|
调整bd
|
5 years ago |
杨树林
|
2ce8565e94
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
2151cf8de2
|
调整
|
5 years ago |
杨树明
|
6a1ff441e8
|
调整
|
5 years ago |
杨树林
|
4f907991aa
|
调整bd
|
5 years ago |
杨树明
|
631a916b79
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
a030a500d0
|
金课调整
|
5 years ago |
hjm
|
34c3f88004
|
NoneData
|
5 years ago |
hjm
|
f8665b8a1f
|
https://www.trustie.net/issues/24302
|
5 years ago |
hjm
|
591685c296
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
1070db9ca5
|
add class image-link
|
5 years ago |
p31729568
|
9c74374499
|
admins: auth add batch agree && revoke auth
|
5 years ago |
hjm
|
84a452abe7
|
清除name
|
5 years ago |
hjm
|
7ce3258d29
|
28px
|
5 years ago |
杨树林
|
65f489fc75
|
调整bd
|
5 years ago |
杨树林
|
dd97a689c8
|
调整bd
|
5 years ago |
hjm
|
8804e80e04
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
6c8e86c8c8
|
目录树优化,解决点击根目录不收起的问题
|
5 years ago |
杨树林
|
386d0497d5
|
调整
|
5 years ago |
杨树林
|
a7359add33
|
调整
|
5 years ago |
杨树林
|
5da7c0db40
|
调整
|
5 years ago |
杨树林
|
53a29d9594
|
调整
|
5 years ago |
杨树林
|
e14046b705
|
调整
|
5 years ago |
杨树明
|
774c5babf6
|
调整
|
5 years ago |
杨树明
|
18e67e7bee
|
调整评分
|
5 years ago |
杨树明
|
d4737b3aa2
|
调整评分
|
5 years ago |
杨树明
|
16129e60fc
|
调整评分
|
5 years ago |
杨树明
|
88ac05e8de
|
调整评分
|
5 years ago |
杨树明
|
5b347ca199
|
课程体系 vs 毕业要求
|
5 years ago |
杨树林
|
984e4f0900
|
调整
|
5 years ago |
杨树明
|
df50ee59ec
|
调整
|
5 years ago |
杨树林
|
7422a97ad2
|
调整
|
5 years ago |
杨树林
|
7561549fbe
|
调整
|
5 years ago |
杨树明
|
f00da2711b
|
调整
|
5 years ago |
杨树林
|
a7e3222109
|
Merge branch 'onigin/ysl_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
9439256781
|
调整评分 面包屑跳转
|
5 years ago |
杨树明
|
7bb80d5068
|
调整
|
5 years ago |
杨树明
|
828bc2512c
|
调整
|
5 years ago |
杨树林
|
b45d0fba2f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
fb0fd87f08
|
调整
|
5 years ago |
杨树明
|
760ccb3436
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
ed9b322893
|
评分调整
|
5 years ago |
杨树林
|
872b92eafc
|
Merge branch 'onigin/ysl_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ec
|
5 years ago |
杨树林
|
2f625f01bc
|
调整
|
5 years ago |
杨树林
|
eaa74a1f39
|
调整
|
5 years ago |
杨树林
|
222450db1b
|
调整
|
5 years ago |
杨树林
|
1014b4243d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ec
|
5 years ago |
杨树林
|
d6d2093fa6
|
调整
|
5 years ago |
杨树林
|
fa3e2e92e5
|
调整
|
5 years ago |
杨树林
|
9efbc7ffa8
|
调整
|
5 years ago |
杨树林
|
610536b100
|
调整
|
5 years ago |
hjm
|
762f4a93c1
|
a.cells[p].split('|').length - 2
|
5 years ago |
hjm
|
1cc412ac5b
|
a.cells[p].length
|
5 years ago |
hjm
|
123436de80
|
table没识别的问题 a.header.length -> a.cells.length
|
5 years ago |
hjm
|
0e7843dd2c
|
// header.length===a.align.length --> header.length table没识别的问题
|
5 years ago |
hjm
|
187bcc6940
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
516a354b98
|
// b(i[1].replace(/^ *| *\| *$/g,"")) --> i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */) table没识别的问题
|
5 years ago |
杨树明
|
2d9afb5ac8
|
字体调整
|
5 years ago |
杨树林
|
e03e085062
|
调整
|
5 years ago |
hjm
|
90e2d94cc1
|
Merge branch 'dev_hjm_repo_tree_click_to_expand' into dev_aliyun
|
5 years ago |
hjm
|
6750732350
|
Merge branch 'dev_hjm_a' into dev_aliyun
|
5 years ago |
杨树明
|
3c42f80482
|
调整
|
5 years ago |
hjm
|
2282090093
|
md渲染
|
5 years ago |
杨树明
|
cd60adf401
|
调整
|
5 years ago |
hjm
|
1040eae1ab
|
去掉orig
|
5 years ago |
杨树明
|
5e7f9a502c
|
调整
|
5 years ago |
hjm
|
5bbc5a0ef5
|
hasData 补交附件
|
5 years ago |
杨树林
|
3abe1610be
|
调整
|
5 years ago |
hjm
|
cd15f8f42b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
f9344c8e24
|
props
|
5 years ago |
杨树明
|
62101e78d6
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
4d9ec0d6f6
|
Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop
# Conflicts:
# app/models/user.rb
|
5 years ago |
杨树林
|
d75e41751a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a
|
5 years ago |
杨树林
|
218a2fe51f
|
调整
|
5 years ago |
hjm
|
cdd80e0c09
|
onAttachmentRemove
|
5 years ago |
hjm
|
3073d69993
|
tab不转空格
|
5 years ago |
杨树林
|
560f4c5e2c
|
调整
|
5 years ago |
杨树林
|
7c239e1622
|
调整ec 分支
|
5 years ago |
杨树林
|
340290d66d
|
调整ec 分支
|
5 years ago |
杨树林
|
a24078f8ef
|
提交参数
|
5 years ago |
hjm
|
3c9c815b00
|
缺编辑样式、接口
|
5 years ago |
杨树明
|
6aed418c09
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
20c9a515d7
|
调整
|
5 years ago |
杨树林
|
d62fc0eeb3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
3c828f3533
|
提交参数
|
5 years ago |
杨树明
|
0a41deee10
|
调整
|
5 years ago |
hjm
|
4a8b9dd0ab
|
editableMode
|
5 years ago |
杨树明
|
c2058ddc82
|
调整
|
5 years ago |
杨树明
|
1a7123d803
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
7fa93a3843
|
Merge branches 'dev_aliyun' and 'dev_ec' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
598114de8b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
9279b0d6e9
|
提交参数
|
5 years ago |
hjm
|
7d031142a5
|
scss
|
5 years ago |
hjm
|
675074d5eb
|
Merge branch 'dev_ec' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ec
|
5 years ago |
hjm
|
8aab67c920
|
setting init
|
5 years ago |
杨树明
|
ab03e70c5c
|
Merge branches 'dev_aliyun' and 'dev_ec' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
b10c91c55d
|
工程认证课程体系VS毕业要求
|
5 years ago |
杨树林
|
e473451c79
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
bd319f53ec
|
提交参数变动
|
5 years ago |
p31729568
|
52041806fe
|
fix merge
|
5 years ago |