 杨树明
|
b8556d8694
|
完善
|
5 years ago |
 hjm
|
be8fe75a72
|
current_user &&
|
5 years ago |
|
hjm
|
a27d43695f
|
sSpin:true
|
5 years ago |
|
hjm
|
95ad53667b
|
&& item.question.min_choices && item.question.max_choice
|
5 years ago |
|
hjm
|
14ce4c695f
|
40
|
5 years ago |
|
hjm
|
2c5b6a60c4
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
8c393990f0
|
height 40
|
5 years ago |
 杨树林
|
b78378bba3
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
de3261c9a0
|
调整
|
5 years ago |
|
杨树明
|
bc9ee87ee1
|
完善
|
5 years ago |
|
杨树林
|
4f1430c914
|
调整
|
5 years ago |
|
杨树林
|
abf2789c7a
|
调整
|
5 years ago |
|
hjm
|
ec268b147d
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
ea3a2ea3d6
|
current_user
|
5 years ago |
|
杨树明
|
56d7f26f51
|
调整
|
5 years ago |
|
杨树明
|
40a364c17d
|
b
|
5 years ago |
|
杨树明
|
ae1f2a01f1
|
调整
|
5 years ago |
|
杨树明
|
d77a383a57
|
b
|
5 years ago |
|
杨树明
|
a5e1645c38
|
b
|
5 years ago |
|
杨树明
|
38c2061d8b
|
调整
|
5 years ago |
|
hjm
|
68078a64b0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
7e1a42dc52
|
ctr s
|
5 years ago |
|
杨树林
|
9bc019565f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
9aab1bd63d
|
调整
|
5 years ago |
|
hjm
|
bd93a5aaec
|
<p
|
5 years ago |
|
hjm
|
a3a4e5df80
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
a97c4f9d82
|
select
|
5 years ago |
|
杨树林
|
ae1b31263c
|
调整
|
5 years ago |
|
杨树林
|
639b816bc3
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
bcfe17712f
|
selector
|
5 years ago |
|
hjm
|
51e215f425
|
html
|
5 years ago |
|
杨树明
|
ff377294f1
|
完善
|
5 years ago |
|
杨树明
|
ef8887bb1d
|
完善
|
5 years ago |
|
hjm
|
2d2d92e022
|
cate
|
5 years ago |
|
hjm
|
7a7c2c85d8
|
cate
|
5 years ago |
|
hjm
|
72e53f97b4
|
selectedName
|
5 years ago |
|
hjm
|
07b457f4f4
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
aa0c889f8f
|
cur
|
5 years ago |
|
hjm
|
65800e57df
|
cursor
|
5 years ago |
|
杨树明
|
fd21bd5b7b
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
05b741652d
|
增加全局完善资料弹窗
|
5 years ago |
|
hjm
|
14de4e317d
|
mg
|
5 years ago |
|
hjm
|
552f23fa39
|
https://www.trustie.net/issues/22475
|
5 years ago |
|
hjm
|
5af9f4cafd
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
c7706f29d1
|
toHTML delay
|
5 years ago |
|
杨树明
|
b9ba6da862
|
b
|
5 years ago |
|
杨树明
|
f85663c1e0
|
调整
|
5 years ago |
|
杨树明
|
d6a0a50b43
|
调整
|
5 years ago |
|
杨树明
|
969e163e74
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
杨树明
|
baec2a014e
|
调整
|
5 years ago |
|
杨树林
|
0bf516cfa1
|
调整
|
5 years ago |
|
杨树林
|
917c72e31c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
ceba041ae3
|
调整
|
5 years ago |
|
杨树明
|
237bf4c821
|
Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
81705ebfab
|
调整
|
5 years ago |
|
hjm
|
dd98f0664d
|
404
|
5 years ago |
|
hjm
|
c673e98d7c
|
认证教师允许跳关
|
5 years ago |
|
hjm
|
93f61c92cd
|
空格
|
5 years ago |
|
hjm
|
fea8646212
|
404
|
5 years ago |
|
hjm
|
684b351012
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
875600ac3c
|
admin
|
5 years ago |
|
杨树林
|
c050a7c6fa
|
调整
|
5 years ago |
|
杨树林
|
eaff514421
|
调整
|
5 years ago |
|
杨树林
|
231939f47a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
c1646797bd
|
调整
|
5 years ago |
|
杨树明
|
e101275492
|
b
|
5 years ago |
|
杨树明
|
23fea61cc0
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
a18caf2525
|
调整
|
5 years ago |
|
杨树林
|
a4858c3e82
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树林
|
d3de780bb4
|
调整
|
5 years ago |
|
杨树明
|
651399837f
|
调整
|
5 years ago |
|
杨树林
|
e6ba772da6
|
调整
|
5 years ago |
|
杨树林
|
7b0d36f76f
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
62b48f7713
|
调整
|
5 years ago |
|
杨树明
|
96cb72f0be
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
32637fba2c
|
调整
|
5 years ago |
|
hjm
|
07fed8980c
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
1320b05bfb
|
2.8;
|
5 years ago |
|
杨树林
|
3ca4437ad6
|
调整
|
5 years ago |
|
杨树林
|
7033912fd2
|
Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
463dd5841c
|
调整
|
5 years ago |
|
杨树明
|
734ae79d2c
|
调整
|
5 years ago |
|
杨树明
|
535030d30f
|
调整
|
5 years ago |
|
杨树林
|
57f08bd5a6
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
2ed0c3c61f
|
调整
|
5 years ago |
|
hjm
|
73fc0f3b52
|
注释 效果是一样的
|
5 years ago |
|
杨树明
|
388bcbfde0
|
b
|
5 years ago |
|
杨树林
|
2be7b4cd3d
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
d4c7053c4c
|
调整
|
5 years ago |
|
杨树明
|
d7ed523e9d
|
调整
|
5 years ago |
|
杨树明
|
b6c616e473
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
4e4915a3fa
|
调整
|
5 years ago |
|
hjm
|
03423d8c30
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
8debe9d99e
|
key
|
5 years ago |
|
hjm
|
016f6377eb
|
current_user &&
|
5 years ago |
|
杨树明
|
50dd27e744
|
b
|
5 years ago |
|
杨树明
|
4dc0801ff9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
杨树明
|
184db72743
|
调整
|
5 years ago |
|
杨树明
|
c661aed21b
|
调整
|
5 years ago |
|
杨树明
|
cb0a10fbc5
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树明
|
818952c56f
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder
|
5 years ago |
|
hjm
|
65658c219a
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
943a628dc9
|
clear
|
5 years ago |
|
杨树明
|
b350b0f1a6
|
调整
|
5 years ago |
|
杨树林
|
d3bc8b33a0
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
806e81e3a5
|
调整
|
5 years ago |
|
杨树明
|
78678a68ba
|
调整
|
5 years ago |
|
hjm
|
8656c6037e
|
面包屑
|
5 years ago |
|
hjm
|
901ed458c4
|
面包屑
|
5 years ago |
|
hjm
|
4b130f2724
|
面包屑
|
5 years ago |
|
hjm
|
5b9bbaf9e1
|
面包屑
|
5 years ago |
|
hjm
|
b9d48c420a
|
面包屑-作业
|
5 years ago |
|
杨树林
|
6903658524
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
f28a2e3580
|
调整
|
5 years ago |
|
杨树明
|
64ae7a2cb6
|
调整
|
5 years ago |
|
杨树明
|
fb44e88969
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
5bfb41ad37
|
调整
|
5 years ago |
|
hjm
|
a107be221c
|
delay 1
|
5 years ago |
|
杨树林
|
a4910c2f8f
|
调整
|
5 years ago |
|
杨树林
|
4992ea6d61
|
调整
|
5 years ago |
|
杨树林
|
1aec807d6b
|
调整
|
5 years ago |
|
杨树明
|
6bde85158a
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树明
|
bbad22274c
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
|
5 years ago |
|
杨树林
|
72a15bfad9
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 years ago |
|
杨树林
|
13e7b0bd5e
|
调整
|
5 years ago |
|
杨树明
|
23f61a9c95
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
|
5 years ago |
|
杨树林
|
fc9bb34eec
|
调整
|
5 years ago |
|
杨树明
|
aebfc5dd35
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
# Conflicts:
# public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
|
5 years ago |
|
杨树明
|
e57317351d
|
调整
|
5 years ago |
|
杨树明
|
20e85d513f
|
调整
|
5 years ago |
|
杨树林
|
edaf04695d
|
Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
杨树林
|
11cd50eb75
|
调整
|
5 years ago |
|
杨树林
|
41fd8013cb
|
调整
|
5 years ago |
|
hjm
|
4bf0b94cc9
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
56bfc47444
|
40
|
5 years ago |
|
杨树明
|
af7c74c2a4
|
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
|
5 years ago |
|
hjm
|
4745a3b280
|
40px
|
5 years ago |
|
杨树林
|
01f19b9bcf
|
调整
|
5 years ago |
 caishi
|
19e90f6255
|
账户管理修改点击保存仍然提示选择学校/单位
|
5 years ago |
|
hjm
|
7dd4d74b46
|
retryAndRefresh
|
5 years ago |
|
hjm
|
d6ff838b0c
|
请先选择学校
|
5 years ago |
|
hjm
|
5a7599b3ae
|
background: transparent !important;
|
5 years ago |
|
hjm
|
0dbcb88efa
|
s
|
5 years ago |
|
hjm
|
8c96b03142
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
c87c6280bf
|
g
|
5 years ago |
|
杨树明
|
64d6d294c6
|
Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun
|
5 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
|
5 years ago |
|
hjm
|
d8670b2092
|
monaca 需要刷新，不然无法编辑
|
5 years ago |
|
hjm
|
49eb847328
|
Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
|
5 years ago |
|
hjm
|
c29c8253a4
|
monaca 需要刷新，不然无法编辑
|
5 years ago |
