p31729568
|
41adc37658
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
e8f40b9430
|
add wechat pay support
|
6 years ago |
 hjm
|
5584fec831
|
vnc
|
6 years ago |
|
p31729568
|
3a301499ca
|
modify trainings
|
6 years ago |
 caishi
|
aeb3fe9b0e
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
|
6 years ago |
|
caishi
|
dba3a65800
|
支付信息
|
6 years ago |
|
p31729568
|
c0a3620bb4
|
training: modify flow
|
6 years ago |
|
p31729568
|
8fddd8959e
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
caishi
|
8b27e66fc3
|
发票类型
|
6 years ago |
|
caishi
|
335988a0b1
|
支付折扣
|
6 years ago |
|
p31729568
|
e5dd2e40b7
|
merge
|
6 years ago |
|
caishi
|
b5730f6dcd
|
信息技术新工科产学研联盟师资研修
|
6 years ago |
|
caishi
|
1fe13e8f4a
|
trainings(联盟师资培训)
|
6 years ago |
|
hjm
|
487323a49e
|
改成后端返回了的，都是要显示的，不管hidden的值是true还是false
|
6 years ago |
|
hjm
|
c4aa30221e
|
改动build后index位置
|
6 years ago |
|
hjm
|
1ca7b99e7b
|
http
|
6 years ago |
|
hjm
|
c164b299c9
|
VNCDisplay
|
6 years ago |
|
hjm
|
4c92bab928
|
_resizeTpiPanel
|
6 years ago |
|
hjm
|
c0cc11b79f
|
b
|
6 years ago |
|
hjm
|
21ec6028dc
|
zindex
|
6 years ago |
|
hjm
|
0d2310c8bb
|
zip path
|
6 years ago |
|
hjm
|
6c46e24647
|
vnc zip_path
|
6 years ago |
|
hjm
|
3b28815ba7
|
test
下载
|
6 years ago |
|
hjm
|
9cd71b8159
|
iconfont
|
6 years ago |
|
hjm
|
ec83c30929
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
hjm
|
9dc838f430
|
pointer-events
|
6 years ago |
cxt
|
8337331103
|
后端-试卷、试卷题库的实训题增加改名称的功能
|
6 years ago |
 杨树明
|
c677f58ca1
|
b
|
6 years ago |
|
杨树明
|
2c20ad2ed5
|
b
|
6 years ago |
|
杨树明
|
32c3c30c6c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
杨树明
|
543bb3e4c9
|
调整
|
6 years ago |
|
caishi
|
3980155697
|
块状样式
|
6 years ago |
|
hjm
|
af37894dbb
|
7999
|
6 years ago |
|
hjm
|
a316a9cebf
|
http
|
6 years ago |
|
hjm
|
9f88f9bf37
|
https
|
6 years ago |
|
hjm
|
fb353c39ab
|
vnc
|
6 years ago |
|
hjm
|
165dd898d4
|
showIframeContent
|
6 years ago |
|
hjm
|
5885568599
|
缩进
|
6 years ago |
|
caishi
|
6d08f360bf
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
740e4d88c4
|
实训课程块里有没有数据的可能，需要固定高度
|
6 years ago |
|
杨树明
|
a49385f073
|
调整
|
6 years ago |
|
杨树明
|
a3dec858f8
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
d5e334738f
|
b
|
6 years ago |
|
hjm
|
8df8dc95d5
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
hjm
|
98ce08d3c7
|
ec 弹出层
|
6 years ago |
|
杨树明
|
41e6f10960
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/views/common/index.html.erb
|
6 years ago |
|
杨树明
|
2a3e7090ae
|
合并认证
|
6 years ago |
|
hjm
|
22f303e4df
|
sec_key
|
6 years ago |
|
hjm
|
a2acd872c9
|
Merge branch 'dev_ec' into develop
|
6 years ago |
|
hjm
|
b64c1a50a4
|
ec
|
6 years ago |
|
caishi
|
7d2730cfa5
|
工程认证
|
6 years ago |
|
hjm
|
a31b826039
|
sec_key
|
6 years ago |
|
hjm
|
982d27b90a
|
|| ratio === 125
|
6 years ago |
|
hjm
|
4a95592b67
|
解决HiDPI/Retina显示器进入tpi时，提示缩放比例变动的问题。
|
6 years ago |
|
杨树明
|
859e3e9a62
|
后台撤销授权功能优化 （前端）
|
6 years ago |
 daiao
|
0c82824439
|
1
|
6 years ago |
|
daiao
|
a1344ff04d
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
2a030196b6
|
注册用户无法完善资料
|
6 years ago |
 jingquan huang
|
2186fa33e2
|
update
|
6 years ago |
|
jingquan huang
|
9bde4eaa94
|
更新提示
|
6 years ago |
|
hjm
|
c1b3dfadd2
|
removeExceptGitDir
|
6 years ago |
|
jingquan huang
|
ca8387e2e6
|
Merge branch 'educoder' into develop
|
6 years ago |
|
jingquan huang
|
2651225563
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
hjm
|
c9ed735139
|
removeExceptGitDir
|
6 years ago |
|
winse
|
372db525bd
|
management school report feature
|
6 years ago |
|
杨树明
|
dddd208335
|
build 测试
|
6 years ago |
|
jingquan huang
|
a71064b8e7
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
f82c7b26f8
|
本地版优化
|
6 years ago |
|
caishi
|
1533295d41
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
f976572985
|
系统升级提示页面时间修改
|
6 years ago |
|
杨树明
|
597a66b764
|
【后台管理】新增需求（运营统计报表 对比报表 新增对比报表 （前端
|
6 years ago |
|
杨树明
|
33d4027a8c
|
客户项目列表页调整
|
6 years ago |
|
hjm
|
0852ecfb40
|
$('.webSSHTimer').html(moment(this.timeRemain).format('mm:ss'))
|
6 years ago |
|
hjm
|
c3ed1bbf14
|
b
|
6 years ago |
|
hjm
|
df919fb6c2
|
重置主倒计时时长：20分钟
|
6 years ago |
|
caishi
|
b58480a637
|
账号审核提示框
|
6 years ago |
|
caishi
|
73e890aaf6
|
超级管理员-合作伙伴新增菜单操作选项
|
6 years ago |
|
杨树明
|
7ff20bbea2
|
新建入口调整
|
6 years ago |
|
杨树明
|
edf1762ae2
|
新建入口调整
|
6 years ago |
|
cxt
|
432fe28c54
|
在用户与超级管理员的私信窗口，增加发送问题页网址的文字说明
|
6 years ago |
|
杨树明
|
ffdbf3c782
|
暂无数据显示新建入口
|
6 years ago |
|
杨树明
|
81eb573c03
|
最新课堂动态时间 根据测试要求调整滑动样式
|
6 years ago |
|
杨树明
|
6c599e362e
|
个人主页新增新建“课堂”、“实训”、“实训课程”、“项目”入口
|
6 years ago |
|
caishi
|
680c7e75cf
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
fcfb91607a
|
滚动条颜色、登录默认为蓝色按钮
|
6 years ago |
|
caishi
|
d5c0a5a449
|
显示管理员名字
|
6 years ago |
|
caishi
|
069fae6608
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
Conflicts:
public/stylesheets/educoder/edu-all.css
|
6 years ago |
|
caishi
|
41cb769fba
|
超级管理员的添加合作伙伴页面
|
6 years ago |
|
杨树明
|
7370b4ffb6
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
9618334cc7
|
用户列表页加头部导航入口
|
6 years ago |
|
hjm
|
bd13ac1776
|
b
|
6 years ago |
|
hjm
|
800f91bf3f
|
status -1
|
6 years ago |
|
hjm
|
3577297fed
|
game_url
|
6 years ago |
|
hjm
|
f45822e01f
|
权限判段有问题
|
6 years ago |
|
杨树明
|
3be76d137d
|
工程认证调整 userid 特殊情况取不到值
|
6 years ago |
|
杨树明
|
94f4166f5a
|
工程认证调整 userid 特殊情况取不到值
|
6 years ago |
|
杨树明
|
20a65571d8
|
工程认证调整
|
6 years ago |
|
杨树明
|
3992b7f9ea
|
工程认证调整
|
6 years ago |
|
杨树明
|
820c662542
|
工程认证调整
|
6 years ago |
 cxt
|
1de495dc92
|
调整
|
6 years ago |
|
cxt
|
f1b17212b4
|
调整
|
6 years ago |
|
hjm
|
a344eab36d
|
Merge branch 'dev_hjm' into develop
|
6 years ago |
|
hjm
|
f811f4a927
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
999aba69f4
|
超级管理员的试用授权审批-已审批列表、以及用户列表增加筛选条件
|
6 years ago |
|
hjm
|
27240407a0
|
正在评测中
!status && status !== 0
|
6 years ago |
|
hjm
|
55af94ceb4
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
杨树明
|
de55a35708
|
banner图调整
|
6 years ago |
|
hjm
|
6786b6ee10
|
Merge remote-tracking branch 'origin/develop' into dev_hjm
|
6 years ago |
|
hjm
|
b6a764f0c6
|
statusMessage
|
6 years ago |
|
杨树明
|
1c1293a32c
|
替换图片
|
6 years ago |
|
hjm
|
35f4dea04a
|
正在编译代码。。。
|
6 years ago |
|
杨树明
|
818a7c48e2
|
替换图片
|
6 years ago |
|
hjm
|
63d57d11bb
|
response.data.message ||
|
6 years ago |
|
杨树明
|
49f639247e
|
按钮调整
|
6 years ago |
guange
|
9c1f33d60a
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
d627f3a0b9
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
hjm
|
adc51604b7
|
b
|
6 years ago |
|
hjm
|
db2da93eed
|
handleGdialogClose
|
6 years ago |
|
杨树明
|
1092e02271
|
未登录的时候头部导航错乱/点问题出现认证
登录的时候react页面进入到里面导航出现active状态
build
|
6 years ago |
|
hjm
|
b9c1236ef4
|
b
|
6 years ago |
|
hjm
|
1b64f09ec9
|
resetTestSetsExpandedArray
|
6 years ago |
|
hjm
|
3d86a711bc
|
b
|
6 years ago |
|
hjm
|
33058789b0
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
hjm
|
5dedb3f80a
|
详情请参见“测试结果”
|
6 years ago |
|
guange
|
0e7bd88d69
|
用户同步
|
6 years ago |
|
hjm
|
ed321e58ef
|
去掉注释
|
6 years ago |
|
杨树明
|
09f52a4a1b
|
build
|
6 years ago |
|
cxt
|
1f6da8629f
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
Conflicts:
app/views/common/index.html.erb
public/react/build/asset-manifest.json
public/react/build/index.html
public/react/build/service-worker.js
public/react/build/static/js/12.db6c3c0e.chunk.js
public/react/build/static/js/12.db6c3c0e.chunk.js.map
public/react/build/static/js/17.45b7dec5.chunk.js
public/react/build/static/js/17.45b7dec5.chunk.js.map
public/react/build/static/js/main.32605315.js.map
public/react/build/static/js/main.a9947884.js.map
public/react/build/static/js/main.ea3ca4b2.js
public/react/build/static/js/main.ea3ca4b2.js.map
|
6 years ago |
|
cxt
|
7e3a4ea2b6
|
合并
|
6 years ago |
|
杨树明
|
7c36bbc0fa
|
build
|
6 years ago |
|
杨树明
|
815d64936c
|
认证权限调整
|
6 years ago |
|
hjm
|
fd6195b9c8
|
b
|
6 years ago |
|
hjm
|
e69de3d59b
|
2.“课堂”→“翻转课堂”
3.“精选实训”→“开发社区”
|
6 years ago |
|
杨树明
|
6808284192
|
build
|
6 years ago |
|
杨树明
|
9b37e699d0
|
build
|
6 years ago |
|
杨树明
|
7047360b63
|
build
|
6 years ago |
|
杨树明
|
1193340214
|
build
|
6 years ago |
|
杨树明
|
81c0906734
|
build
|
6 years ago |
|
hjm
|
915fb90ec8
|
.json
|
6 years ago |
|
杨树明
|
e4caf5da9d
|
build
|
6 years ago |
|
hjm
|
2fd2ffc777
|
_data
|
6 years ago |
|
杨树明
|
afe9158b0f
|
工程认证权限调整
|
6 years ago |
|
hjm
|
045ac6bff7
|
is_manager
|
6 years ago |
|
hjm
|
e58628b38b
|
&& is_manager
|
6 years ago |
|
hjm
|
916b27d3ca
|
b
|
6 years ago |
|
hjm
|
6142022d74
|
is_manager
|
6 years ago |
|
hjm
|
95a3f43ca3
|
this.props.showModal('提示', '您没权限编辑，请联系管理员。')
|
6 years ago |
|
hjm
|
fc4bcca5de
|
is_manager
|
6 years ago |
|
hjm
|
c174191336
|
real_value_total
|
6 years ago |
|
hjm
|
280d1c8d24
|
b
|
6 years ago |
|
hjm
|
2d4310c4f2
|
real_value_total != 0
|
6 years ago |
|
hjm
|
6885ce6cdf
|
b
|
6 years ago |
|
hjm
|
3b8750dd2b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
hjm
|
537a3cbf2e
|
total value
|
6 years ago |
|
杨树明
|
3097a01b7b
|
工程认证
|
6 years ago |
|
hjm
|
9d245f3922
|
b
|
6 years ago |
|
hjm
|
5c2eb8b1d3
|
snackbarOpen
|
6 years ago |
|
hjm
|
6e6a318162
|
/* 最后一个item 占满剩余空间 */
|
6 years ago |
daiao
|
e5165d1e28
|
增加删除弹框提示
|
6 years ago |
|
caishi
|
92b25e6d3f
|
暂停服务通知改为3月8号
|
6 years ago |
|
caishi
|
8f88f7fd84
|
系统通知页面
|
6 years ago |
|
caishi
|
12dc0a2d08
|
使用原版提示页面
|
6 years ago |
|
caishi
|
e4f786fecf
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
f3a3ebe543
|
系统升级通知页面
|
6 years ago |
|
杨树明
|
54bb513255
|
工程认证输入框的样式问题修复
|
6 years ago |
|
daiao
|
29e661019b
|
解决线上冲突
|
6 years ago |
|
daiao
|
7b1f61a514
|
第一次版本
|
6 years ago |
