杨树明
|
69f9390eeb
|
调整立即发布 包括单个立即发布弹窗封装
|
5 years ago |
hjm
|
d2b2384b94
|
教师列表
|
5 years ago |
hjm
|
e67b8e3404
|
style2
|
5 years ago |
杨树林
|
5baaeb6822
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
a91cf878c0
|
调整
|
5 years ago |
杨树明
|
add7207310
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
d54d26e7b1
|
调整
|
5 years ago |
hjm
|
92bcb4052b
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
abb5ec8cfd
|
if (this.props.isCourseAdmin()) {
|
5 years ago |
杨树林
|
fb6d28683e
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
a86c347805
|
调整
|
5 years ago |
hjm
|
7f09f745c3
|
this.props.showNotification('操作成功。')
|
5 years ago |
hjm
|
ae764f9606
|
window.location.reload()
|
5 years ago |
hjm
|
31d5e0ccc2
|
tea
|
5 years ago |
杨树明
|
dcdbc00305
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
d97f251e02
|
调整设置
|
5 years ago |
hjm
|
b09659dcaf
|
pageType !== TYPE_STUDENTS &&
|
5 years ago |
hjm
|
ba862bc5bd
|
分班
|
5 years ago |
杨树明
|
f8ca6f1792
|
调整资源
|
5 years ago |
杨树明
|
64294fa85f
|
。
|
5 years ago |
杨树明
|
3f3484c815
|
调整试卷和问卷编辑权限
|
5 years ago |
杨树明
|
c1a57c1d85
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
1fd9315791
|
统一视频
|
5 years ago |
hjm
|
90fb19324d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
05a14d2a3e
|
tpi目录树,当目录下没有文件时,一直处于加载中,报脚本错
|
5 years ago |
杨树明
|
1c94493f2e
|
安全设置中的手机和邮箱请从接口中读取数据
|
5 years ago |
杨树明
|
0173ddf253
|
调整题库闭环问题,调整实训作业设置问题,消息模块统一无数据显示
|
5 years ago |
杨树林
|
aeae8a4970
|
调整
|
5 years ago |
杨树明
|
92218bb829
|
调整得分规则
|
5 years ago |
杨树明
|
3dab4dca77
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
5fa875bf55
|
调整私有属性提示
|
5 years ago |
杨树林
|
e0a80f2e49
|
调整
|
5 years ago |
杨树林
|
233caafd5d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
7c44c0d697
|
调整
|
5 years ago |
杨树明
|
c5191f90ab
|
调整
|
5 years ago |
杨树林
|
d8e6340947
|
调整
|
5 years ago |
杨树林
|
a2f3437ca2
|
调整
|
5 years ago |
杨树林
|
618d99f6a3
|
调整
|
5 years ago |
杨树林
|
5a73f00ea6
|
调整
|
5 years ago |
杨树林
|
854cfc4977
|
调整开始学时刷新前页面
|
5 years ago |
杨树林
|
56c327c366
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
f763bdad55
|
调整
|
5 years ago |
杨树明
|
9020ef940b
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
杨树明
|
8f9f44b131
|
调整
|
5 years ago |
hjm
|
bb516db7dc
|
退出登录不刷新
|
5 years ago |
杨树林
|
76f7d94349
|
调整
|
5 years ago |
杨树林
|
8ff3babbb1
|
调整提示文字
|
5 years ago |
杨树林
|
e65b573012
|
调整无数据显示
|
5 years ago |
杨树林
|
ed40d0a977
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树林
|
35937ad3c4
|
调整左侧课堂导航栏
|
5 years ago |
杨树明
|
28f9f03beb
|
调整
|
5 years ago |
杨树明
|
21462cd45e
|
调整跳转体验
|
5 years ago |
杨树明
|
9b899fef19
|
调整编辑状态
|
5 years ago |
杨树明
|
a1f6dd6731
|
调整
|
5 years ago |
hjm
|
33e13837ba
|
Merge branch 'dev_hjm_a' into dev_aliyun
|
5 years ago |
杨树明
|
5ef85cde10
|
调整
|
5 years ago |
杨树明
|
f97e425d45
|
调整
|
5 years ago |
杨树明
|
f97dc36fef
|
调整
|
5 years ago |
杨树明
|
2c0688e57a
|
调整
|
5 years ago |
杨树明
|
6d0348f969
|
调整
|
5 years ago |
杨树明
|
38db7a0ff4
|
调整
|
5 years ago |
杨树明
|
e062f026fe
|
调整
|
5 years ago |
杨树明
|
7462e1e8f1
|
调整ec
|
5 years ago |
hjm
|
e1c730d1e3
|
tab
|
5 years ago |
杨树明
|
00d8eea156
|
Merge branches 'dev_aliyun' and 'dev_ec' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
杨树明
|
8f97c7f957
|
调整
|
5 years ago |
杨树林
|
17043017d6
|
调整
|
5 years ago |
杨树明
|
a8f4b758d3
|
调整设置模式
|
5 years ago |
hjm
|
b66f5a67ad
|
duration: 2,
|
5 years ago |
hjm
|
5650ef7b15
|
checkAllValue
|
5 years ago |
杨树明
|
a8f379b2d1
|
调整
|
5 years ago |
杨树林
|
7cd79e92ad
|
调整
|
5 years ago |
杨树明
|
a9ff5259fc
|
调整
|
5 years ago |
杨树林
|
a49eb656db
|
调整
|
5 years ago |
杨树林
|
5dc87e6b5a
|
调整
|
5 years ago |
杨树林
|
720e8c9403
|
调整
|
5 years ago |
杨树林
|
107909bdb3
|
调整
|
5 years ago |
杨树明
|
15a1eb805c
|
调整
|
5 years ago |
杨树明
|
3ac498c2bd
|
b
|
5 years ago |
杨树明
|
4f13935757
|
调整
|
5 years ago |
杨树林
|
5892c28916
|
调整
|
5 years ago |
杨树明
|
63c169e457
|
调整
|
5 years ago |
杨树明
|
2977a48e38
|
调整
|
5 years ago |
杨树明
|
af28a5c5e8
|
调整
|
5 years ago |
杨树林
|
0bbc6a2e28
|
自己版本调整
|
5 years ago |
杨树明
|
bae0380eb2
|
调整对应评阅跳转
|
5 years ago |
杨树明
|
c9c66f2f7f
|
调整
|
5 years ago |
杨树明
|
d03d2e2777
|
调整发送至跳转
|
5 years ago |
杨树明
|
cef1ca9799
|
调整
|
5 years ago |
p31729568
|
24b7257031
|
precompile admin assets
|
5 years ago |
杨树明
|
05d7c03b03
|
Merge branches 'dev_aliyun' and 'dev_ec' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ec
|
5 years ago |
杨树明
|
91cedff462
|
调整
|
5 years ago |
杨树明
|
04bc9b9a15
|
调整
|
5 years ago |
杨树明
|
a25b193015
|
调整
|
5 years ago |
hjm
|
95e6cea51b
|
3
|
5 years ago |
杨树明
|
1d1e56731e
|
调整
|
5 years ago |
hjm
|
e8982c22ca
|
{}
|
5 years ago |
杨树明
|
9f4ac8147a
|
调整
|
5 years ago |
杨树明
|
077dd38e3d
|
调整
|
5 years ago |
杨树明
|
9594cd31e8
|
调整
|
5 years ago |
hjm
|
5f6fc6bbeb
|
file
|
5 years ago |
hjm
|
c09054de5e
|
map
|
5 years ago |
hjm
|
8fd076eec5
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
hjm
|
4eeb488fe8
|
版本库中有.的目录,被当成了代码文件加载
|
5 years ago |
杨树明
|
7eab5786e3
|
调整
|
5 years ago |
杨树明
|
4b8d4348ed
|
调整
|
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 |
杨树明
|
b5941cf2e9
|
b
|
5 years ago |
hjm
|
1d2097611b
|
选择题答案显示不了公式的问题
|
5 years ago |
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 |
杨树林
|
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 |