 杨树林
|
2b35669267
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/modules/login/Trialapplication.js
|
6 years ago |
|
杨树林
|
618efb6df1
|
调整
|
6 years ago |
 hjm
|
ed5c3c8a1a
|
vnc
|
6 years ago |
|
hjm
|
9f7f7483a8
|
score
|
6 years ago |
|
hjm
|
30b735dc83
|
未登录空指针
|
6 years ago |
|
hjm
|
8957461ba9
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
2a320fa7db
|
user
|
6 years ago |
|
杨树林
|
19f678e597
|
调整
|
6 years ago |
 caishi
|
7cd8b09b14
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
Conflicts:
public/react/src/AppConfig.js
public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
|
6 years ago |
|
caishi
|
f287dd53ed
|
issues
|
6 years ago |
|
hjm
|
b5fbbffce8
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
8cdaf91dd5
|
set
|
6 years ago |
 杨树明
|
7e8291d31f
|
b
|
6 years ago |
|
杨树明
|
fbb0c0117f
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
74ed2ec427
|
调整
|
6 years ago |
|
杨树林
|
d6fb28b970
|
调整
|
6 years ago |
|
杨树林
|
9e6b31dddd
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树林
|
aac1900a5e
|
调整
|
6 years ago |
|
hjm
|
d698d0785b
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
16e1a517c6
|
.state
|
6 years ago |
|
hjm
|
5444373331
|
ConnectProject
|
6 years ago |
|
杨树明
|
830fe31e95
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
e8b00031aa
|
实训权限调整
|
6 years ago |
|
hjm
|
786cdff86c
|
memberNumMax
|
6 years ago |
|
hjm
|
170990f953
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
3993378c4d
|
文字
|
6 years ago |
|
杨树明
|
deb6660237
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
8d637c79e8
|
修改实训权限调整
|
6 years ago |
|
hjm
|
7145037a53
|
文字修改
|
6 years ago |
|
hjm
|
7dc3b79b9d
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
6813431b5f
|
立即发布
|
6 years ago |
|
杨树明
|
c1a52bf013
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
7db2a25c77
|
实训权限调整
|
6 years ago |
|
hjm
|
f59390802c
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
49453d3b2a
|
new
|
6 years ago |
|
杨树林
|
fc4baada04
|
调整
|
6 years ago |
|
hjm
|
4a392e4ba3
|
iden
|
6 years ago |
|
hjm
|
6ad93f8cfb
|
appeal_all_count
|
6 years ago |
|
杨树林
|
57cde904bf
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树林
|
aa498d7db5
|
调整
|
6 years ago |
|
hjm
|
bc74c4ee9c
|
iden
|
6 years ago |
|
hjm
|
453c462565
|
共有1条匿评申诉，0条待处理
|
6 years ago |
|
hjm
|
6103f76bc0
|
font-14
|
6 years ago |
|
杨树明
|
1f64fa6cff
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
bc58fcd79d
|
调整
|
6 years ago |
|
hjm
|
7c3e91fb88
|
isNiPing
|
6 years ago |
|
杨树林
|
654f9cbc97
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树林
|
cb970e2223
|
调整
|
6 years ago |
|
hjm
|
3866ec9bbb
|
宽度
|
6 years ago |
|
hjm
|
550692b031
|
cancel_appeal
|
6 years ago |
|
hjm
|
556ce2635e
|
haveProjects
|
6 years ago |
|
hjm
|
7c2cc6aaef
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
c152a950be
|
niPingAndIsStudent
|
6 years ago |
|
hjm
|
9d954ea61e
|
connect
|
6 years ago |
|
杨树林
|
97e83ab154
|
调整
|
6 years ago |
|
杨树林
|
1d47a8f680
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树林
|
800089a4c3
|
调整
|
6 years ago |
|
hjm
|
e77bc70aea
|
const isAdmin = this.props.isAdmin()
|
6 years ago |
|
hjm
|
07b9197e15
|
拒绝
|
6 years ago |
|
hjm
|
4e8bd3fb74
|
getCourseGroups
|
6 years ago |
|
hjm
|
88cebdbb0c
|
hasGraduationModule
|
6 years ago |
|
hjm
|
ffbcbc0349
|
check
|
6 years ago |
|
hjm
|
68a5c601a6
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树明
|
d8fbe0678c
|
调整
|
6 years ago |
|
hjm
|
bac2d56ff1
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
02faf37431
|
check admin
|
6 years ago |
|
杨树林
|
6f4566e03b
|
修复
|
6 years ago |
|
杨树林
|
fb6c09f7df
|
修复
|
6 years ago |
|
杨树林
|
5f44ab72af
|
修复
|
6 years ago |
|
杨树明
|
2d307bdc6d
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
ddf72a5550
|
调整开启实训
|
6 years ago |
|
杨树林
|
a4675215de
|
修复
|
6 years ago |
|
ysl
|
97189e671f
|
修复
|
6 years ago |
|
ysl
|
66e4a5522b
|
修复
|
6 years ago |
|
ysl
|
1a9984fb4b
|
修复
|
6 years ago |
|
杨树明
|
7e7f2b034b
|
调整
|
6 years ago |
|
杨树明
|
ce57c052a0
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/modules/courses/coursesPublic/Startshixuntask.js
# public/react/src/modules/tpm/TPMBanner.js
|
6 years ago |
|
杨树明
|
c71bb0a58a
|
调整
|
6 years ago |
|
ysl
|
a2f6217014
|
修复
|
6 years ago |
|
ysl
|
83efdf9abe
|
修复
|
6 years ago |
|
ysl
|
3ec184008b
|
修复
|
6 years ago |
|
ysl
|
2f1eac3216
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
f5150efa7a
|
修复
|
6 years ago |
|
杨树明
|
09d5e802e8
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
|
6 years ago |
|
杨树明
|
90c935f68c
|
调整
|
6 years ago |
|
caishi
|
a93538aec2
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
7472189ee9
|
个人主页的信息
|
6 years ago |
|
ysl
|
1f9c6b833b
|
修复
|
6 years ago |
|
ysl
|
7682ab2b70
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
0f544ac5d9
|
修复
|
6 years ago |
|
ysl
|
e3e5db246c
|
修复
|
6 years ago |
|
caishi
|
761fed2372
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
b61bb1310c
|
我的实训-images
|
6 years ago |
|
杨树明
|
a3466058c7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/modules/courses/coursesDetail/CoursesBanner.js
# public/react/src/modules/user/LoginRegisterComponent.js
|
6 years ago |
|
杨树明
|
9ab9cc7ce2
|
调整
|
6 years ago |
|
ysl
|
811bd748ce
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
adfdb8e357
|
修复
|
6 years ago |
|
hjm
|
d67952cef2
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
fe5f2e4cb2
|
tpi左右比例
|
6 years ago |
|
caishi
|
439d63ab46
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
7dcf103598
|
fix
|
6 years ago |
|
ysl
|
9356d59ab7
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
425c19f3ea
|
修复
|
6 years ago |
|
hjm
|
9011592e75
|
0
|
6 years ago |
|
hjm
|
71ccf425b6
|
hasGraduationModule
|
6 years ago |
|
hjm
|
8eee96f7c2
|
修改成功
|
6 years ago |
|
ysl
|
b8fab1e9a0
|
附件上传 弹出框口
|
6 years ago |
|
hjm
|
642a70adf9
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
3ac4b9d0a4
|
isAdminOrTeacher
|
6 years ago |
|
ysl
|
6f450183ec
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
0f1211f555
|
附件上传 弹出框口
|
6 years ago |
|
caishi
|
56dbc531d8
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
b6e36fd02e
|
个人主页：fix bug
|
6 years ago |
|
hjm
|
e196f5b066
|
VNCDisplay
|
6 years ago |
|
hjm
|
c3ca98a644
|
"@novnc/novnc": "^1.1.0",
|
6 years ago |
|
hjm
|
f4664de408
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
df009248ea
|
比例
|
6 years ago |
|
ysl
|
cc290824bd
|
附件上传 弹出框口
|
6 years ago |
|
ysl
|
b81a289453
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
710ef90cd1
|
修复
|
6 years ago |
|
hjm
|
12a0bcaf45
|
毕设
|
6 years ago |
|
hjm
|
f10a89b397
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
1ee43431d0
|
资源
|
6 years ago |
|
ysl
|
e188a608f7
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
7aa3477136
|
修复
|
6 years ago |
|
杨树明
|
cfb6a0d16a
|
调整
|
6 years ago |
|
ysl
|
a4fb17467a
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
c73857c4a9
|
修复
|
6 years ago |
|
杨树明
|
a019b59761
|
调整
|
6 years ago |
|
hjm
|
4dff0a03ce
|
route
|
6 years ago |
|
hjm
|
8300491b27
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
75fa868214
|
route
|
6 years ago |
|
杨树明
|
f50e32075a
|
调整
|
6 years ago |
|
杨树明
|
ba2a451200
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
beddaecc4d
|
调整重命名体验
|
6 years ago |
|
caishi
|
5799173099
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
32c678ed3b
|
问卷：q_position
|
6 years ago |
|
hjm
|
698ee32712
|
css
|
6 years ago |
|
hjm
|
3145fa9d7d
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
28b21e7cd6
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
58bf03e694
|
明日签到的金币数
|
6 years ago |
|
hjm
|
b297855e7b
|
top
|
6 years ago |
|
hjm
|
109d266f70
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树明
|
683161b1ec
|
调整
|
6 years ago |
|
杨树明
|
0ea35bb571
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
52c853f997
|
调整
|
6 years ago |
|
ysl
|
76a72bc27a
|
修复
|
6 years ago |
|
ysl
|
264b425b74
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
b6576392ab
|
修复
|
6 years ago |
|
杨树明
|
6f93f9b15a
|
调整
|
6 years ago |
|
hjm
|
18d328a1fc
|
this.closeConnectionProject()
|
6 years ago |
|
杨树明
|
c8722effdf
|
调整
|
6 years ago |
|
杨树明
|
81c042e6f1
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
f4193a6edf
|
调整
|
6 years ago |
|
ysl
|
fe599993b7
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
399aef859c
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
bda8393f27
|
修复
|
6 years ago |
|
caishi
|
0a6b09d227
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
Conflicts:
public/react/src/modules/tpm/NewHeader.js
|
6 years ago |
|
caishi
|
28bbaf7d1c
|
个人主页跳转到老版的链接
|
6 years ago |
|
hjm
|
fc7087ebca
|
分数
|
6 years ago |
|
hjm
|
fbd6f3fe5d
|
invalid
|
6 years ago |
|
hjm
|
d776751997
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
0283a47420
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
ysl
|
51467cf3ef
|
修复
|
6 years ago |
|
hjm
|
ad989177c7
|
isAdmin
|
6 years ago |
|
hjm
|
371e6268c6
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
8791b8edf1
|
分班设置 时间
|
6 years ago |
|
ysl
|
66e65946fb
|
修复
|
6 years ago |
|
ysl
|
fffcdd6270
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
0d3608e6e0
|
修复
|
6 years ago |
|
杨树明
|
5811df7dce
|
调整
|
6 years ago |
|
杨树明
|
255b897a2b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
9769bec517
|
调整
|
6 years ago |
|
hjm
|
d47255d00e
|
title
|
6 years ago |
|
hjm
|
9511600e03
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
b7424701b2
|
route缺失
|
6 years ago |
|
hjm
|
6995de1523
|
cs
|
6 years ago |
|
ysl
|
d486fa1272
|
修复
|
6 years ago |
|
ysl
|
89561bcecd
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
005dfc59ca
|
修复
|
6 years ago |
|
caishi
|
d276fee00b
|
题库跳转
|
6 years ago |
|
caishi
|
0780f2027b
|
个人主页-使用申请
|
6 years ago |
|
caishi
|
9578650e47
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
a8a33ebd7d
|
毕设任务
|
6 years ago |
|
杨树明
|
3eb9008d88
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
05a22b7e9c
|
调整
|
6 years ago |
|
ysl
|
765af2c66e
|
修复
|
6 years ago |
|
ysl
|
d7bbdfba9e
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
6b7cf4217c
|
修复
|
6 years ago |
|
caishi
|
2001e3d749
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
19bf3d635a
|
毕设任务
|
6 years ago |
|
hjm
|
716c2b68ca
|
clearfix mt30 mb30
|
6 years ago |
|
hjm
|
e1339db812
|
返回
|
6 years ago |
|
杨树明
|
83937f4304
|
调整
|
6 years ago |
|
hjm
|
370b1ee234
|
css
|
6 years ago |
|
杨树明
|
5437ff4b7a
|
调整
|
6 years ago |
|
caishi
|
68b85b7364
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树明
|
5b1ed94501
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
caishi
|
86a20e8680
|
个人主页
|
6 years ago |
|
杨树明
|
3c40720339
|
调整
|
6 years ago |
|
hjm
|
5950b789f9
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
hjm
|
f3c99d8780
|
MarkdownToHtml
|
6 years ago |
|
杨树明
|
7afce93796
|
调整
|
6 years ago |
|
ysl
|
a71cd3ac0a
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
ysl
|
cc82615959
|
修复
|
6 years ago |
|
杨树明
|
06367bf257
|
调整
|
6 years ago |
|
hjm
|
9596e795e9
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
杨树明
|
e0668cea7c
|
毕设调整
|
6 years ago |
|
hjm
|
b36c238545
|
mr
|
6 years ago |
|
hjm
|
0248bc7e6c
|
markdown css
|
6 years ago |
|
hjm
|
e96f90c444
|
子回复按钮
|
6 years ago |
|
杨树明
|
2141b068f9
|
毕设时间调整
|
6 years ago |
|
杨树明
|
11a33265c6
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
杨树明
|
1e99acc02c
|
资源调整
|
6 years ago |
|
hjm
|
8a3519e7b1
|
canNotLink
|
6 years ago |
|
hjm
|
07e5760e2b
|
this.props.addSuccess
|
6 years ago |
|
hjm
|
268baa136d
|
canNotLink
|
6 years ago |
|
hjm
|
01fd748038
|
先注释了，影响到了md的拖拽
|
6 years ago |
|
hjm
|
6787d59ec1
|
font-16
|
6 years ago |
|
caishi
|
f79d1a8ad1
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
|
caishi
|
ee6d0ee4ae
|
选题新建
|
6 years ago |
|
杨树明
|
f142c7339d
|
路径调整
|
6 years ago |
|
杨树明
|
47ba7cb333
|
路径调整
|
6 years ago |
|
杨树明
|
86eae252e8
|
路径调整
|
6 years ago |
 jingquan huang
|
b1069b9afd
|
first commit
|
6 years ago |
