杨树明
|
872fc5bb6c
|
众包完善
|
6 years ago |
杨树明
|
58bf4afde2
|
完善
|
6 years ago |
杨树明
|
df69ef1ade
|
b
|
6 years ago |
杨树明
|
c558f05de3
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
杨树明
|
65e7c3231e
|
实践课程发送至完善
|
6 years ago |
杨树明
|
fbe9c1a486
|
Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm
|
6 years ago |
杨树明
|
2e889a74e5
|
时间控制调整,不能选今天之前的时间
|
6 years ago |
杨树明
|
60645e2206
|
实训TPM,实践任务的效果展现增加“MP3/MP4”的菜单选项
|
6 years ago |
杨树明
|
89b7a5099f
|
众包完善
|
6 years ago |
杨树明
|
3041f2a4e0
|
b
|
6 years ago |
杨树明
|
3db448643d
|
b
|
6 years ago |
杨树明
|
2fbcd9928a
|
众包移植完善
|
6 years ago |
杨树明
|
22da157241
|
b
|
6 years ago |
杨树明
|
1cb74baff7
|
b
|
6 years ago |
杨树明
|
1b41c1c00b
|
b
|
6 years ago |
杨树明
|
275fb7e21c
|
b
|
6 years ago |
杨树林
|
cad8f2fbbd
|
Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
|
6 years ago |
杨树林
|
6630cae57f
|
调整
|
6 years ago |
杨树明
|
5afe063a85
|
众包移植
|
6 years ago |
杨树明
|
622b4160d9
|
调整
|
6 years ago |
杨树明
|
3725715230
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
6 years ago |
杨树明
|
587dd3da9e
|
完善
|
6 years ago |
杨树明
|
45eb74b149
|
b
|
6 years ago |
杨树明
|
17b615a665
|
b
|
6 years ago |
杨树明
|
eaae076ab0
|
完善
|
6 years ago |
杨树明
|
656992d2a4
|
b
|
6 years ago |
杨树明
|
7a63277390
|
完善
|
6 years ago |
杨树明
|
d62aff6452
|
完善
|
6 years ago |
杨树明
|
6934b3e006
|
完善
|
6 years ago |
杨树明
|
fc40112da8
|
完善
|
6 years ago |
杨树明
|
18c2446b99
|
b
|
6 years ago |
杨树明
|
a48bda6bd6
|
调整logo
|
6 years ago |
杨树明
|
b4a14670ae
|
完善
|
6 years ago |
杨树明
|
b8556d8694
|
完善
|
6 years ago |
杨树明
|
bc9ee87ee1
|
完善
|
6 years ago |
杨树明
|
d77a383a57
|
b
|
6 years ago |
杨树明
|
05b741652d
|
增加全局完善资料弹窗
|
6 years ago |
杨树明
|
f85663c1e0
|
调整
|
6 years ago |
杨树明
|
d6a0a50b43
|
调整
|
6 years ago |
杨树林
|
917c72e31c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
6 years ago |
杨树林
|
ceba041ae3
|
调整
|
6 years ago |
杨树明
|
81705ebfab
|
调整
|
6 years ago |
杨树明
|
50dd27e744
|
b
|
6 years ago |
杨树明
|
184db72743
|
调整
|
6 years ago |
杨树明
|
b350b0f1a6
|
调整
|
6 years ago |
杨树明
|
78678a68ba
|
调整
|
6 years ago |
杨树林
|
41fd8013cb
|
调整
|
6 years ago |
杨树明
|
6d5ec0794d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# app/controllers/application_controller.rb
# public/react/src/AppConfig.js
|
6 years ago |
杨树明
|
9d421e4c4f
|
调整
|
6 years ago |
杨树明
|
022a2b57e3
|
调整
|
6 years ago |
杨树明
|
3801ca041a
|
调整
|
6 years ago |
杨树明
|
486d025809
|
调整
|
6 years ago |
杨树明
|
976798de57
|
调整
|
6 years ago |
杨树明
|
b72f4dcfff
|
调整
|
6 years ago |
hjm
|
ad48ca9542
|
nonedata
|
6 years ago |
杨树林
|
7e0af60680
|
调整
|
6 years ago |
杨树林
|
68e3dd8c1c
|
调整
|
6 years ago |
杨树林
|
a58ed05d89
|
调整
|
6 years ago |
杨树林
|
75e64b2d68
|
调整
|
6 years ago |
杨树林
|
a9823999a1
|
调整
|
6 years ago |
杨树林
|
3197b15e26
|
调整
|
6 years ago |
杨树林
|
cf9c4cad85
|
调整
|
6 years ago |
杨树林
|
0e8eb1aaf3
|
调整
|
6 years ago |
杨树明
|
6966a475f0
|
调整
|
6 years ago |
杨树明
|
aefe7a8fa2
|
调整
|
6 years ago |
杨树明
|
afecc4d5b4
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树明
|
ffd13e728a
|
调整
|
6 years ago |
杨树明
|
838d4c67e8
|
调整
|
6 years ago |
hjm
|
1cea71dd07
|
1440
|
6 years ago |
杨树明
|
0026dfe616
|
调整
|
6 years ago |
杨树明
|
62d0ecdab8
|
.
|
6 years ago |
杨树明
|
a3939d427e
|
.
|
6 years ago |
杨树明
|
62c9ba34c1
|
调整
|
6 years ago |
杨树明
|
91a7dcecf5
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树明
|
438b20e528
|
升级提示调整
|
6 years ago |
杨树明
|
2f601d964a
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树明
|
25ec1a755f
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
6adbbdc54d
|
增加升级提示
|
6 years ago |
杨树明
|
265daa677c
|
b
|
6 years ago |
hjm
|
52130e6918
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
hjm
|
1d354909ad
|
去logo
|
6 years ago |
杨树明
|
54a10a7dae
|
b
|
6 years ago |
杨树明
|
9d96e392c5
|
调整
|
6 years ago |
杨树明
|
a514596495
|
调整
|
6 years ago |
杨树明
|
f44cf53cb9
|
调整
|
6 years ago |
杨树明
|
b1a4b2633c
|
.
|
6 years ago |
杨树林
|
be5893f43d
|
调整
|
6 years ago |
杨树林
|
385422819a
|
调整
|
6 years ago |
hjm
|
7615aca848
|
comm
|
6 years ago |
杨树林
|
64c934ce7a
|
调整
|
6 years ago |
hjm
|
fb076159a9
|
reset_my_game
|
6 years ago |
杨树明
|
8f02983dce
|
调整
|
6 years ago |
杨树明
|
bd5b4cdbf7
|
调整
|
6 years ago |
杨树林
|
e53d241035
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树林
|
5954570d57
|
调整
|
6 years ago |
杨树明
|
2c7ffdedbd
|
调整
|
6 years ago |
杨树明
|
2ff245c715
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
bb1f8dccaa
|
调整
|
6 years ago |
杨树林
|
e76a2e6b79
|
调整
|
6 years ago |
杨树明
|
85664a1889
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/AppConfig.js
|
6 years ago |
杨树明
|
c2962c9612
|
调整
|
6 years ago |
杨树林
|
295941847a
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树林
|
359333e8ab
|
调整
|
6 years ago |
杨树明
|
7a73f04bf1
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
# Conflicts:
# public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
|
6 years ago |
杨树明
|
99f8f0a58b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
371b03458c
|
调整
|
6 years ago |
杨树林
|
6c098e24b5
|
调整
|
6 years ago |
杨树明
|
a6142f8cd1
|
调整
|
6 years ago |
杨树明
|
f306445025
|
调整
|
6 years ago |
杨树明
|
02651e5ce3
|
调整
|
6 years ago |
杨树明
|
dc1edb7a0f
|
调整
|
6 years ago |
杨树林
|
0770901bf7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/modules/tpm/newshixuns/Newshixuns.js
|
6 years ago |
杨树林
|
49bd250e86
|
调整 加注释debugger
|
6 years ago |
杨树明
|
758d8c0d17
|
调整
|
6 years ago |
杨树明
|
20c2dda047
|
调整
|
6 years ago |
杨树明
|
9f75a9780c
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
8ec3869815
|
搜索调整
|
6 years ago |
杨树明
|
68b32572fe
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
88d059aa1a
|
调整
|
6 years ago |
杨树林
|
0c2043d20e
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树林
|
32f9ed1799
|
调整
|
6 years ago |
杨树明
|
e23f71b36e
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
e990fa51c5
|
时间调整
|
6 years ago |
杨树林
|
dd55ea86c1
|
调整
|
6 years ago |
杨树林
|
6fbcb58b83
|
调整
|
6 years ago |
杨树林
|
26596f529b
|
调整
|
6 years ago |
杨树明
|
2019f4cb5d
|
调整
|
6 years ago |
杨树明
|
2c359d0328
|
调整
|
6 years ago |
hjm
|
4f3161fe68
|
needRecreate
|
6 years ago |
杨树明
|
aea230c45a
|
调整
|
6 years ago |
杨树明
|
9ac46ae0e3
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
db96b47211
|
调整
|
6 years ago |
hjm
|
94446c536f
|
Tooltip
|
6 years ago |
hjm
|
2e2eb52161
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
hjm
|
471f92d857
|
ToolTip title="删除">
|
6 years ago |
杨树明
|
47a26ca47a
|
调整
|
6 years ago |
杨树明
|
06244a38c4
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
33e870fd97
|
调整
|
6 years ago |
hjm
|
cc375e9578
|
scroll
|
6 years ago |
hjm
|
7f1c17dbd3
|
scroll
|
6 years ago |
hjm
|
0f9cd35f97
|
filter
|
6 years ago |
hjm
|
8af1cd625c
|
exec_time:20
|
6 years ago |
hjm
|
cb1bba6960
|
请选填此项
|
6 years ago |
杨树林
|
a2d2590ec2
|
调整
|
6 years ago |
杨树林
|
23dd85b8f6
|
调整
|
6 years ago |
杨树明
|
28d10a51d1
|
调整
|
6 years ago |
hjm
|
2308454f42
|
del
|
6 years ago |
杨树明
|
3f76234010
|
调整
|
6 years ago |
杨树明
|
da7b009af4
|
调整
|
6 years ago |
杨树明
|
56b75b7850
|
调整
|
6 years ago |
杨树明
|
c4f5846cbd
|
调整
|
6 years ago |
杨树林
|
6e47803988
|
调整
|
6 years ago |
杨树明
|
ffa647be48
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
63e3ae8385
|
调整
|
6 years ago |
杨树明
|
7378d933ee
|
调整
|
6 years ago |
杨树明
|
84c51989a1
|
调整
|
6 years ago |
杨树明
|
0fda5a8302
|
调整
|
6 years ago |
杨树明
|
c9458c8800
|
调整
|
6 years ago |
杨树明
|
ecbdfe7898
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
3af911654e
|
调整
|
6 years ago |
hjm
|
74f213c481
|
cropper
|
6 years ago |
杨树明
|
2b97bed30c
|
调整
|
6 years ago |
杨树明
|
e3ff332d27
|
跳关功能调整
|
6 years ago |
杨树明
|
769347c77a
|
跳关功能调整
|
6 years ago |
杨树明
|
7379af6d4d
|
调整
|
6 years ago |
杨树明
|
6b1054238d
|
调整
|
6 years ago |
杨树明
|
da474ff992
|
调整
|
6 years ago |
杨树明
|
75d0d84c1a
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
2d8776952c
|
实训功能调整
|
6 years ago |
杨树林
|
48c857c13c
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树明
|
eebc428d42
|
调整
|
6 years ago |
杨树明
|
802546662b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
c57b586dec
|
调整
|
6 years ago |
杨树林
|
cb4d361590
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
hjm
|
d4ffbc52fc
|
23
|
6 years ago |
杨树林
|
b0f9675b56
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树林
|
e3d2a4ae98
|
调整
|
6 years ago |
杨树明
|
8c27a6dc56
|
调整
|
6 years ago |
杨树明
|
8ae79996b9
|
调整
|
6 years ago |
杨树林
|
a69d0402b8
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树林
|
2a10931a61
|
调整
|
6 years ago |
杨树明
|
477f3979d6
|
调整
|
6 years ago |
杨树明
|
a309bec35f
|
调整
|
6 years ago |
杨树明
|
62bf8b7f5f
|
调整
|
6 years ago |
杨树明
|
7e40d772d7
|
调整
|
6 years ago |
杨树明
|
79385d7bc6
|
调整
|
6 years ago |
杨树明
|
9441f038be
|
调整
|
6 years ago |
杨树明
|
8ff9699c80
|
调整
|
6 years ago |
杨树明
|
5496df9e5e
|
调整
|
6 years ago |
杨树明
|
56509b2ad5
|
调整
|
6 years ago |
杨树明
|
8fc86ecf9b
|
调整
|
6 years ago |
杨树明
|
65ee882d65
|
调整
|
6 years ago |
杨树明
|
23224a437d
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
9cda4635dd
|
调整
|
6 years ago |
hjm
|
7b84e5a91c
|
红框
|
6 years ago |
hjm
|
17c4e3e33c
|
isNotMember
|
6 years ago |
杨树明
|
819bfed857
|
调整
|
6 years ago |
杨树明
|
7c2c06874a
|
调整
|
6 years ago |
杨树明
|
7b83f0c604
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
cad2758d02
|
调整
|
6 years ago |
hjm
|
688d44314b
|
1
|
6 years ago |
杨树明
|
0e1dce4c09
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
74bb30ba01
|
调整
|
6 years ago |
hjm
|
75eef2a43a
|
textStart
|
6 years ago |
hjm
|
bbc689cc87
|
( 数据已于 09:17:12 保存 )
|
6 years ago |
杨树明
|
279af48aba
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
|
6 years ago |
杨树明
|
5c8bdefab8
|
调整
|
6 years ago |
hjm
|
2cc8de0898
|
tip
|
6 years ago |
杨树明
|
aadf46fd58
|
b
|
6 years ago |
杨树明
|
d97f865305
|
调整底部样式问题
|
6 years ago |
杨树林
|
a5b14fc4a2
|
调整
|
6 years ago |
杨树明
|
61bb0fb891
|
调整
|
6 years ago |
杨树林
|
6b19ea3361
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树林
|
1b247f8f49
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/AppConfig.js
|
6 years ago |
杨树明
|
e2a40cf205
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
156abe2c7b
|
调整
|
6 years ago |
杨树林
|
3c4151ce65
|
调整
|
6 years ago |
hjm
|
6d927716e8
|
css
|
6 years ago |
杨树明
|
81d38a670c
|
调整
|
6 years ago |
hjm
|
30f6c31896
|
index.html有加载
|
6 years ago |
杨树明
|
cb73289daa
|
调整
|
6 years ago |
杨树明
|
0d9fa58a3e
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
f2e7ebb376
|
调整
|
6 years ago |
杨树林
|
26023201bb
|
调整
|
6 years ago |
杨树明
|
fc23ea5b9b
|
调整
|
6 years ago |
杨树明
|
208a5071eb
|
调整
|
6 years ago |
杨树林
|
e152119cb5
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树林
|
2d8b2ef96f
|
调整
|
6 years ago |
杨树明
|
f6a922004c
|
调整
|
6 years ago |
caishi
|
1c3c85b480
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
caishi
|
71bb545507
|
新课堂指引第一页
|
6 years ago |
杨树林
|
c584a3385b
|
调整
|
6 years ago |
杨树林
|
2b35669267
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/react/src/modules/login/Trialapplication.js
|
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 |
杨树明
|
7e8291d31f
|
b
|
6 years ago |
杨树明
|
74ed2ec427
|
调整
|
6 years ago |
杨树明
|
e8b00031aa
|
实训权限调整
|
6 years ago |
杨树明
|
8d637c79e8
|
修改实训权限调整
|
6 years ago |
杨树明
|
c1a52bf013
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
7db2a25c77
|
实训权限调整
|
6 years ago |
杨树林
|
fc4baada04
|
调整
|
6 years ago |
杨树林
|
57cde904bf
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
杨树林
|
aa498d7db5
|
调整
|
6 years ago |
杨树明
|
1f64fa6cff
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
杨树明
|
bc58fcd79d
|
调整
|
6 years ago |
杨树林
|
cb970e2223
|
调整
|
6 years ago |
杨树林
|
97e83ab154
|
调整
|
6 years ago |
杨树林
|
800089a4c3
|
调整
|
6 years ago |
杨树林
|
6f4566e03b
|
修复
|
6 years ago |
杨树林
|
5f44ab72af
|
修复
|
6 years ago |
杨树明
|
ddf72a5550
|
调整开启实训
|
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
|
f5150efa7a
|
修复
|
6 years ago |
ysl
|
0f544ac5d9
|
修复
|
6 years ago |
ysl
|
e3e5db246c
|
修复
|
6 years ago |
ysl
|
adfdb8e357
|
修复
|
6 years ago |
ysl
|
0f1211f555
|
附件上传 弹出框口
|
6 years ago |
ysl
|
7aa3477136
|
修复
|
6 years ago |
ysl
|
fe599993b7
|
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 |
ysl
|
51467cf3ef
|
修复
|
6 years ago |
ysl
|
66e65946fb
|
修复
|
6 years ago |
ysl
|
89561bcecd
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
ysl
|
005dfc59ca
|
修复
|
6 years ago |
caishi
|
9578650e47
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
ysl
|
d7bbdfba9e
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
ysl
|
6b7cf4217c
|
修复
|
6 years ago |
caishi
|
68b85b7364
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
6 years ago |
caishi
|
86a20e8680
|
个人主页
|
6 years ago |
hjm
|
5950b789f9
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
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
|
b36c238545
|
mr
|
6 years ago |
jingquan huang
|
b1069b9afd
|
first commit
|
6 years ago |