cxt
|
1b57593e99
|
完善
|
6 years ago |
 caishi
|
d5c0a5a449
|
显示管理员名字
|
6 years ago |
|
cxt
|
ccede5b5a0
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
cxt
|
13aa9f7df6
|
删除管理员
|
6 years ago |
jasder
|
3b584094c2
|
Merge
|
6 years ago |
|
jasder
|
b7bbb77aaa
|
FIX 过滤数据
|
6 years ago |
|
cxt
|
0b76986075
|
merge
|
6 years ago |
|
cxt
|
43117e7ca1
|
添加管理员
|
6 years ago |
 daiao
|
c0df561a75
|
合作伙伴报500
|
6 years ago |
|
daiao
|
29caae1c36
|
添加客户
|
6 years ago |
|
daiao
|
611b059e6a
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
daiao
|
53e792918b
|
1
|
6 years ago |
|
cxt
|
c56a997403
|
添加合作单位的调整
|
6 years ago |
|
cxt
|
638a3ba1a3
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
cxt
|
eece0a31ee
|
添加合作者
|
6 years ago |
|
jasder
|
42eb7ae408
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
jasder
|
a7034cdbe5
|
ADD
|
6 years ago |
|
daiao
|
cf46589485
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
daiao
|
dc2a59cad9
|
1
|
6 years ago |
|
cxt
|
1c1735a78d
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
cxt
|
3f60c7eae3
|
添加伙伴
|
6 years ago |
|
jasder
|
3d408ac563
|
FIX merger
|
6 years ago |
|
jasder
|
85d8355541
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
jasder
|
9f417e17cd
|
FIX UI
|
6 years ago |
|
cxt
|
f5746f0839
|
调整
|
6 years ago |
|
daiao
|
a01d30f142
|
删除的实训首页还能显示
|
6 years ago |
 SylorHuang
|
744c021e1c
|
partners
|
6 years ago |
|
SylorHuang
|
8ffdad5447
|
partners
|
6 years ago |
|
SylorHuang
|
45bdbab053
|
partners
|
6 years ago |
|
caishi
|
0aec53dda7
|
添加管理员搜索条件修改
|
6 years ago |
|
jasder
|
367b3a6197
|
FIX
|
6 years ago |
|
jasder
|
cd0d8d9a35
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
SylorHuang
|
b3621125d5
|
partners
|
6 years ago |
|
jasder
|
e154b3c7fe
|
Merge
|
6 years ago |
|
jasder
|
2c1bd03c46
|
ADD
|
6 years ago |
|
SylorHuang
|
7af1176280
|
partners
|
6 years ago |
|
SylorHuang
|
828ac000e0
|
合作伙伴添加
|
6 years ago |
|
jasder
|
450876fd39
|
FIX
|
6 years ago |
|
jasder
|
17687f999e
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
jasder
|
8ccfee1299
|
FIX
|
6 years ago |
|
cxt
|
0e8b1d5ee8
|
客户列表调整
|
6 years ago |
|
cxt
|
260cc5b598
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
cxt
|
946755f9e0
|
客户管理列表
|
6 years ago |
|
jasder
|
57fb324875
|
Merge branch 'develop' into dev_partners
|
6 years ago |
|
jasder
|
ae3965d5ed
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
|
6 years ago |
|
jasder
|
47e3f87308
|
ADD 添加关联表
|
6 years ago |
|
cxt
|
bec7b0eb36
|
Merge branch 'develop' into dev_partners
|
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 |
|
cxt
|
b66140bcfe
|
加入题库报错
|
6 years ago |
|
cxt
|
904880044c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
00dadf7531
|
客户列表
|
6 years ago |
 杨树明
|
7370b4ffb6
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
9618334cc7
|
用户列表页加头部导航入口
|
6 years ago |
|
cxt
|
b930943368
|
Merge branch 'develop' into dev_partners
|
6 years ago |
|
cxt
|
700a964505
|
cooperate controller
|
6 years ago |
|
jasder
|
f068ce5a8e
|
ADD 合作伙伴路由
|
6 years ago |
 hjm
|
bd13ac1776
|
b
|
6 years ago |
 huang
|
24ff3a1aa6
|
测试集输出的一些调整
|
6 years ago |
|
huang
|
e7e304064b
|
实训测试集显示问题
|
6 years ago |
|
huang
|
bea1dd618d
|
编译通过但是测试集显示问题
|
6 years ago |
|
huang
|
69a0a5b72b
|
输出字符串问题
|
6 years ago |
|
杨树明
|
30f7a4d2bd
|
隐藏学校
|
6 years ago |
|
杨树明
|
21de026a99
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
杨树明
|
86641c67b1
|
隐藏学校
|
6 years ago |
|
huang
|
0306071ed0
|
..
|
6 years ago |
|
huang
|
e6b786edc0
|
..
|
6 years ago |
|
huang
|
06f29e9109
|
500问题
|
6 years ago |
|
huang
|
b05308baf0
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
e8a8df58ab
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
huang
|
3ac9d7a736
|
编译失败提醒
|
6 years ago |
|
cxt
|
fa667fe665
|
实训评分加事务
|
6 years ago |
|
cxt
|
f5e6b4c46a
|
工程认证的权限调整
|
6 years ago |
|
daiao
|
38eb71d7f2
|
实训tpi的版本库可以通过id查询
|
6 years ago |
|
daiao
|
8950bafb18
|
删除实训
'
|
6 years ago |
|
daiao
|
ed87d56f6c
|
删除实训的访问问题
|
6 years ago |
|
daiao
|
53bf69e4b4
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
f8611f90b6
|
迁移报错的实训
|
6 years ago |
|
cxt
|
03c3729ea3
|
修改邮箱报500
|
6 years ago |
|
cxt
|
f7b95af92f
|
调试
|
6 years ago |
|
cxt
|
ee630954d5
|
调试
|
6 years ago |
|
cxt
|
29001ced81
|
Merge branch 'develop' into educoder
|
6 years ago |
|
cxt
|
e621a54f06
|
实训课程中的实训被“隐藏”后，请悬浮显示“暂未公开”
|
6 years ago |
|
daiao
|
b7b1f35913
|
导出实训反馈编码格式修改
|
6 years ago |
|
cxt
|
442277519b
|
Merge branch 'develop' into educoder
|
6 years ago |
|
daiao
|
655c62defd
|
实训评论url
|
6 years ago |
|
jingquan huang
|
5a3447b5cf
|
conflict
|
6 years ago |
|
daiao
|
6c8517812e
|
评论优化
|
6 years ago |
|
daiao
|
dcc20138dd
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
3ce5c0d7b5
|
评论关卡位置为空时，默认第一关
'
|
6 years ago |
|
cxt
|
a63e45c081
|
用户授权列表500
|
6 years ago |
|
cxt
|
66597eb20b
|
pdf导出500
|
6 years ago |
|
cxt
|
5d8a0158ae
|
pdf导出调整
|
6 years ago |
|
cxt
|
523fb82aa1
|
调试
|
6 years ago |
|
cxt
|
e5589780c7
|
实训报告调试
|
6 years ago |
|
cxt
|
7454064a9c
|
成绩导出调整
|
6 years ago |
|
cxt
|
059db7002e
|
Merge branch 'develop' into educoder
|
6 years ago |
|
cxt
|
8ba0fe6b07
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
59884af2f9
|
调整
|
6 years ago |
|
daiao
|
a71e82ae78
|
https://www.trustie.net/issues/18634
|
6 years ago |
|
daiao
|
49cf70f38f
|
【生产环境】实训配置页的评测脚本选择后，无法清空，必须通过重新技术平台才行
|
6 years ago |
|
cxt
|
4cd1f7c305
|
调整
|
6 years ago |
|
cxt
|
b4bbac6fae
|
调整
|
6 years ago |
|
cxt
|
1192a3c93d
|
课堂成绩导出调整
|
6 years ago |
|
daiao
|
8e4bb66272
|
添加报错时的信息
|
6 years ago |
|
daiao
|
9890a97e34
|
Merge branch 'develop' into educoder
|
6 years ago |
|
daiao
|
12cb81b3e8
|
解决冲突
|
6 years ago |
 cxt
|
ececf85977
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
f4c637a094
|
实训课程的审批翻页
|
6 years ago |
|
cxt
|
b14aaab5c9
|
主机数调整
|
6 years ago |
|
cxt
|
1ddfe358eb
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
295f7a1c2b
|
单位的修改
|
6 years ago |
|
caishi
|
08a4df9698
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
bd98acb24e
|
课堂讨论区未登录不显示发送菜单
|
6 years ago |
|
cxt
|
3d0b8dd2e9
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
e7c8ca039f
|
讨论区的发送调整
|
6 years ago |
|
huang
|
a696886800
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
0115891dee
|
为登陆不显示fork
|
6 years ago |
|
cxt
|
2b691900b3
|
未登录导航栏调整
|
6 years ago |
daiao
|
03ff875279
|
实训反馈导出excel
|
6 years ago |
|
daiao
|
44bd6bfd8a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
cb212407fc
|
1
|
6 years ago |
|
huang
|
3b4714af23
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
f60d8611ed
|
实训权限控制
|
6 years ago |
|
daiao
|
e6b55a7943
|
1
|
6 years ago |
|
huang
|
e6cec18bc5
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
3d59d46ec0
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
7d0d89d4e2
|
超级管理员的实训反馈页面，增加excel导出功能和实训名称检索功能
|
6 years ago |
|
cxt
|
d62f927baf
|
调整
|
6 years ago |
|
cxt
|
31beeaaf67
|
调整
|
6 years ago |
|
cxt
|
27a913882d
|
调整
|
6 years ago |
|
cxt
|
c88142d360
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
88972c60a6
|
实训认证
|
6 years ago |
|
杨树明
|
3be76d137d
|
工程认证调整 userid 特殊情况取不到值
|
6 years ago |
|
杨树明
|
20a65571d8
|
工程认证调整
|
6 years ago |
|
daiao
|
0eab38faae
|
还原
|
6 years ago |
|
daiao
|
d8763cf284
|
1
|
6 years ago |
|
daiao
|
40c19ae0d5
|
1
|
6 years ago |
|
daiao
|
dad2fb6b6f
|
1
|
6 years ago |
|
daiao
|
7f4aaf880e
|
1
|
6 years ago |
|
daiao
|
8466c147af
|
1
|
6 years ago |
|
daiao
|
d4d7f812a6
|
添加报错信息
|
6 years ago |
|
cxt
|
5a4df7c442
|
调整
|
6 years ago |
|
cxt
|
5bfebb53a5
|
调整
|
6 years ago |
|
cxt
|
05ee4e2ea0
|
工程认证
|
6 years ago |
|
杨树明
|
820c662542
|
工程认证调整
|
6 years ago |
|
huang
|
f70c1a49c3
|
移动云问题
|
6 years ago |
|
huang
|
ada4254039
|
ecloud控制器
|
6 years ago |
|
huang
|
6137bcc770
|
实训权限的一些控制
|
6 years ago |
|
cxt
|
f1b17212b4
|
调整
|
6 years ago |
|
cxt
|
0c643a82b8
|
调整
|
6 years ago |
|
cxt
|
2431993071
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
ebe9ee145b
|
实训报告的开启时间
|
6 years ago |
guange
|
24393e8ad3
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
a8fb707230
|
移动同步过来的手机号有相同的情况处理
|
6 years ago |
|
cxt
|
99a47e1c8e
|
超级管理员的自动授权单位列表中，仅给”学生“自动授权
|
6 years ago |
|
cxt
|
58dd8d207d
|
【管理员页面】排序时，未带搜索条件进行排序
|
6 years ago |
|
cxt
|
999aba69f4
|
超级管理员的试用授权审批-已审批列表、以及用户列表增加筛选条件
|
6 years ago |
|
cxt
|
1603c34128
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
2c6e1ba868
|
实训报告的数据总表与分表的数据没有匹配
|
6 years ago |
|
huang
|
95098fafd4
|
..
|
6 years ago |
|
huang
|
a791f1bc53
|
..
|
6 years ago |
|
jingquan huang
|
9fee0222ba
|
ecloud auth
|
6 years ago |
|
daiao
|
93ed95b767
|
冲突
|
6 years ago |
|
daiao
|
8dc5a6b2df
|
评测代码运行中
|
6 years ago |
|
daiao
|
d1b676e479
|
评测开始清空之前的记录
|
6 years ago |
|
daiao
|
d1f536b191
|
增加日志信息
|
6 years ago |
|
daiao
|
8b26219bee
|
字段值
|
6 years ago |
|
daiao
|
d8c389757f
|
评测修改
|
6 years ago |
|
daiao
|
0a772dd67b
|
评测中的信息
|
6 years ago |
|
daiao
|
de2db8ce32
|
学生评测数据
|
6 years ago |
|
daiao
|
7b906e2348
|
Merge branch 'educoder' into dev_shixuns
|
6 years ago |
|
daiao
|
0b587f7217
|
代码评测信息更新
|
6 years ago |
|
jingquan huang
|
a3b14f86ca
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
guange
|
1608ef1f6d
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
8243b33634
|
正式环境参数
|
6 years ago |
|
jingquan huang
|
ef0ffc1295
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
914660ad9f
|
一些优化
|
6 years ago |
|
cxt
|
0202c719f0
|
调整
|
6 years ago |
|
cxt
|
8bbb5a71e0
|
markdown上传的文件权限调整
|
6 years ago |
|
cxt
|
4b23a9a2b5
|
非超级管理员无法正常显示实训课程详情页的图片
|
6 years ago |
|
cxt
|
23fb2e4c23
|
调整
|
6 years ago |
|
huang
|
cf6aa09060
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
Conflicts:
db/migrate/20190314080802_create_shixun_student_works.rb
db/migrate/20190314080805_create_shixun_student_works.rb
|
6 years ago |
|
huang
|
836542759c
|
企业用户如果创建了不重复创建
|
6 years ago |
|
杨树明
|
49f639247e
|
按钮调整
|
6 years ago |
|
杨树明
|
a5504f63d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
6fd67e780e
|
实训路径 新建，修改选择搜索为空取消按钮没有问题
|
6 years ago |
|
cxt
|
6cb82826aa
|
【注册】【需求】测试环境增加一个万能验证码方便测试
|
6 years ago |
|
daiao
|
95a8be8cf6
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
a2e81a3a70
|
测试集问题
|
6 years ago |
|
caishi
|
b43b3ea574
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
69c3952b0f
|
实训课程--课程须知MD编辑渲染失败
|
6 years ago |
|
huang
|
d077c78845
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
b96c293184
|
check sign
|
6 years ago |
|
hjm
|
adc51604b7
|
b
|
6 years ago |
|
cxt
|
7bba4ec39e
|
调整
|
6 years ago |
|
cxt
|
2614f83283
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
b9a72287d1
|
未登录状态下的导航栏调整
|
6 years ago |
|
huang
|
e9fe238b02
|
500问题
|
6 years ago |
|
cxt
|
0b7593c4ec
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
cb4b71e5cd
|
进入子模块需要选中对应的导航
|
6 years ago |
|
huang
|
ed08c76021
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
ae69f82d73
|
完成各种逻辑调试
|
6 years ago |
|
daiao
|
29cff5349b
|
重新迁移实训作业
|
6 years ago |
|
daiao
|
fef35fceae
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
2a68ed0cb0
|
已发布的实训.增加测试集,已完成关卡的用户无法更新测试集内容
|
6 years ago |
|
huang
|
29a0b03397
|
完成用户动态迁移
|
6 years ago |
|
杨树明
|
1092e02271
|
未登录的时候头部导航错乱/点问题出现认证
登录的时候react页面进入到里面导航出现active状态
build
|
6 years ago |
|
huang
|
7158b0710a
|
用户业务动态变更
|
6 years ago |
|
hjm
|
b9c1236ef4
|
b
|
6 years ago |
|
hjm
|
3d86a711bc
|
b
|
6 years ago |
|
daiao
|
2fdf5353c4
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
69db176e48
|
merge
|
6 years ago |
|
guange
|
0e7bd88d69
|
用户同步
|
6 years ago |
|
huang
|
4cf4655b26
|
完成业务退订
|
6 years ago |
|
huang
|
e1558fbd07
|
业务状态变更
|
6 years ago |
|
daiao
|
0fc5fadcb9
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
3a9866943e
|
实训测试集问题
|
6 years ago |
|
huang
|
43c4b784ea
|
完成业务开通接口
|
6 years ago |
|
cxt
|
213dc6a0af
|
用户评测时更新作业分数（为迁移数据做处理）
|
6 years ago |
|
huang
|
2e0c9faf47
|
重构业务新增
|
6 years ago |
|
huang
|
8b62caf8a6
|
完成试用转商用接口调试
|
6 years ago |
|
cxt
|
08accb32db
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
5766a1b0b1
|
实训作业删除的性能优化
|
6 years ago |
|
huang
|
4c58e97d94
|
未完待续
|
6 years ago |
|
huang
|
03b67d1b4d
|
数据库记录用户行为数据
|
6 years ago |
|
huang
|
dcec874401
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
2b28b60828
|
移动云企业业务开通重构
|
6 years ago |
|
hjm
|
29b2a85e8d
|
COURSE
|
6 years ago |
|
hjm
|
e09c93f93d
|
DEVELOPMENT COMMUNITY
|
6 years ago |
|
guange
|
e04f29aa44
|
json
|
6 years ago |
|
guange
|
7e35e1af0d
|
json
|
6 years ago |
|
guange
|
0a176e78ad
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
guange
|
5c0e656dd3
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
guange
|
6f15d83b87
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
huang
|
0e445b3209
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
0f4886906a
|
ecloud授权和取消授权的一些修改
|
6 years ago |
|
cxt
|
b0386586c9
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
d52fec1f51
|
超级管理员的课堂列表导出时会有部分数据缺失
|
6 years ago |
|
huang
|
f1a3459a83
|
.
|
6 years ago |
|
huang
|
7e6c250e7b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
5113d5cb36
|
ecloud_user添加status标记
|
6 years ago |
|
caishi
|
66b12ec493
|
实训报告页面-图形统计页
|
6 years ago |
|
caishi
|
2627a5da13
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
fab470bc0a
|
实训报告页面
|
6 years ago |
|
huang
|
7e168f42a6
|
测试
|
6 years ago |
|
huang
|
d6a20f1cae
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
e7298c7d6f
|
ecloud
|
6 years ago |
|
cxt
|
f1e0510b3b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
618fc93c80
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
# Conflicts:
# app/controllers/ecloud_controller.rb
|
6 years ago |
|
guange
|
166332c936
|
.
|
6 years ago |
|
huang
|
6121b985f0
|
ecloud一些修改
|
6 years ago |
|
cxt
|
de3c5e6d42
|
查看成绩，关卡耗时错误
|
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 |
|
hjm
|
fd6195b9c8
|
b
|
6 years ago |
|
hjm
|
e69de3d59b
|
2.“课堂”→“翻转课堂”
3.“精选实训”→“开发社区”
|
6 years ago |
|
杨树明
|
d03e256822
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
6808284192
|
build
|
6 years ago |
|
cxt
|
e1e02682d7
|
隐藏学年的导出
|
6 years ago |
|
cxt
|
84b16ed361
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
1d71d9ddff
|
调整
|
6 years ago |
|
杨树明
|
35b3872b51
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
9b37e699d0
|
build
|
6 years ago |
|
cxt
|
02c008f696
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
febf6555a9
|
调整
|
6 years ago |
|
杨树明
|
6ad7734813
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
7047360b63
|
build
|
6 years ago |
|
cxt
|
c595ef49b3
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
bbc2c6c387
|
权限调整
|
6 years ago |
|
杨树明
|
5edaa19761
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
1193340214
|
build
|
6 years ago |
|
cxt
|
8470090933
|
调整
|
6 years ago |
|
cxt
|
28aca2571a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
f588b0d765
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
e274be5924
|
sign验证
|
6 years ago |
|
cxt
|
e58d7693ec
|
调整
|
6 years ago |
|
huang
|
e816387170
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
b72c93074a
|
ecloud相关接口修正
|
6 years ago |
|
杨树明
|
81c0906734
|
build
|
6 years ago |
|
cxt
|
649e2a7ba6
|
调整
|
6 years ago |
|
cxt
|
81ab00f482
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
e40adab480
|
调整
|
6 years ago |
|
杨树明
|
e4caf5da9d
|
build
|
6 years ago |
|
cxt
|
5adf21dffc
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
a3c7087a48
|
调整
|
6 years ago |
|
jingquan huang
|
5fee87148a
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
ec87aef778
|
认证
|
6 years ago |
|
cxt
|
7970754e84
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
a9c5b791b5
|
调整
|
6 years ago |
|
杨树明
|
f57f7813bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
afe9158b0f
|
工程认证权限调整
|
6 years ago |
|
jingquan huang
|
d1925971f7
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
82a1a21993
|
签名认证
|
6 years ago |
|
cxt
|
1fb0c4771a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
f9351e259d
|
调整
|
6 years ago |
|
jingquan huang
|
91c95a7988
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
9f0e30676c
|
ecloud认证
|
6 years ago |
|
daiao
|
d97281b04d
|
Merge branch 'educoder' into develop
|
6 years ago |
|
daiao
|
7d6c48e86c
|
【认证】工程认证的界别复制，没有复制毕业要求 vs 培养目标和 毕业要求 vs 通用标准两个矩阵
|
6 years ago |
|
cxt
|
4859ce7046
|
权限调整
|
6 years ago |
|
cxt
|
2fcc555ada
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
a05f1f4739
|
访问权限的判断
|
6 years ago |
|
cxt
|
b1a79f27ca
|
Merge branch 'educoder' into develop
|
6 years ago |
|
daiao
|
eb6f911df5
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
hjm
|
6d92d7700a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
bcdbd5a74d
|
工程认证问题
|
6 years ago |
|
hjm
|
916b27d3ca
|
b
|
6 years ago |
|
cxt
|
2f9860d05c
|
专业管理员无删除权限
|
6 years ago |
|
cxt
|
a17d9f2126
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
eab8ccec8b
|
权限调整
|
6 years ago |
|
guange
|
e5252fa87e
|
获取用户信息
|
6 years ago |
|
hjm
|
280d1c8d24
|
b
|
6 years ago |
|
guange
|
2cd1ce8171
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
325f5c9b15
|
获取用户信息
|
6 years ago |
|
hjm
|
6885ce6cdf
|
b
|
6 years ago |
|
guange
|
ddba3d844d
|
获取用户信息
|
6 years ago |
|
guange
|
9fd268b7d8
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
d2f8f13237
|
增加签名
|
6 years ago |
|
huang
|
4d5716ea97
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
19ece63edb
|
移动云联调相关
|
6 years ago |
|
guange
|
cfcd3fef14
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
杨树明
|
3097a01b7b
|
工程认证
|
6 years ago |
|
guange
|
9d349fe567
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
defbbe1c84
|
ecloud oauth2认证
|
6 years ago |
|
杨树明
|
71b3b1ce4a
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
97179ce628
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
afa8d8f1f3
|
调整
|
6 years ago |
|
jingquan huang
|
befe1381c5
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
8267a5645e
|
企业开通
|
6 years ago |
|
daiao
|
4fa4e2d199
|
在接口里增加指示点内容 （后端增加参数）
|
6 years ago |
|
cxt
|
3bd2a00768
|
重置myshixun时更新用户关联的作业
|
6 years ago |
|
caishi
|
ff0115675c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
3957f5b94c
|
课程体系列表-评价结果显示错误
|
6 years ago |
|
jingquan huang
|
cb73a97425
|
接口调试
|
6 years ago |
|
jasder duan
|
354d51ce1a
|
Merge
|
6 years ago |
|
jasder duan
|
9ed8741829
|
FIX 解决冲突文件
|
6 years ago |
|
jingquan huang
|
3afe376f94
|
ecloud表结构调整
|
6 years ago |
|
huang
|
784172afcb
|
..
|
6 years ago |
|
huang
|
a49e220b1c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
265a928109
|
ecloud相关表结构
|
6 years ago |
|
daiao
|
4aadc998b9
|
允许跳关的实训参数调整
|
6 years ago |
|
daiao
|
1d53060af9
|
工程认证相关任务
|
6 years ago |
|
caishi
|
54061e6a7a
|
工程认证首页列表-专业列表的点击事件
|
6 years ago |
|
hjm
|
9d245f3922
|
b
|
6 years ago |
|
daiao
|
cb4ecb8a0f
|
调试问题
|
6 years ago |
|
jingquan huang
|
528996f57d
|
业务开通接口
|
6 years ago |
|
jingquan huang
|
d58ddee8d3
|
ecloud params
|
6 years ago |
|
jingquan huang
|
9cf02eaf28
|
oauth test
|
6 years ago |
|
daiao
|
b136a7a13d
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
582e8921db
|
通关却没有获得金币
|
6 years ago |
|
jingquan huang
|
c8e7166d02
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
045b8f7655
|
单点登录初步
|
6 years ago |
|
jingquan huang
|
f59338005b
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
fa1af83d6d
|
参考答案前端显示问题
|
6 years ago |
|
daiao
|
d26c4a62ba
|
通过却没有得到金币奖励
|
6 years ago |
|
jingquan huang
|
da14bbed6f
|
通关没加金币的问题
|
6 years ago |
|
jingquan huang
|
bdbb982cf1
|
金币
|
6 years ago |
|
jingquan huang
|
6d944721a8
|
答案问题
|
6 years ago |
|
jingquan huang
|
a95dc01665
|
ecloud
|
6 years ago |
|
jingquan huang
|
acf3296533
|
Merge branch 'develop'
|
6 years ago |
|
jingquan huang
|
7293589da5
|
ecloud
|
6 years ago |
|
cxt
|
bc0c8e5171
|
调整
|
6 years ago |
|
cxt
|
a3caf72e24
|
调整
|
6 years ago |
|
cxt
|
1208818c9d
|
优化
|
6 years ago |
|
cxt
|
dd4513f66c
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
14ef994d84
|
优化
|
6 years ago |
|
daiao
|
7e4bdd51ab
|
实训路径到处增加课程体系和实训的发布时间
|
6 years ago |
|
daiao
|
4fe0bdb620
|
实训首页无权限
|
6 years ago |
|
daiao
|
b2db87cb02
|
实训首页问题
|
6 years ago |
|
daiao
|
3f09af9dbb
|
实训课程首页权限控制
|
6 years ago |
|
daiao
|
68301f5d4e
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
daiao
|
5e029c5e67
|
实训路径权限问题
|
6 years ago |
|
huang
|
61dbb622d6
|
500问题
|
6 years ago |
|
daiao
|
729c079738
|
删除gpid为空的myshixun
|
6 years ago |
|
cxt
|
93f6a3e187
|
Merge branch 'develop' into educoder
|
6 years ago |
|
cxt
|
a64df6da3b
|
课堂继续实战按钮的调整
|
6 years ago |
|
cxt
|
fa54a0be3d
|
课堂继续挑战实训的链接调整
|
6 years ago |
|
cxt
|
57dfad1799
|
调整
|
6 years ago |
|
cxt
|
d6384b7313
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
e5165d1e28
|
增加删除弹框提示
|
6 years ago |
|
daiao
|
cca7aabf84
|
实训课程关联课程体系
|
6 years ago |
|
daiao
|
08a4357405
|
实训课程等级系统页面
|
6 years ago |
|
cxt
|
49a794f11a
|
现在版-在线课堂的实训作业子目录增加删除功能-本周上线
|
6 years ago |
|
cxt
|
39c6daf466
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
dbddd9ddc8
|
（超级管理员）系统升级通知的页面调整
|
6 years ago |
|
huang
|
c9d91b02d3
|
averge_star问题
|
6 years ago |
|
huang
|
480e9724f2
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
8478f9c3b4
|
member_count问题
|
6 years ago |
|
caishi
|
073d9dc523
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
1ca34ce817
|
超级管理员实训课程配置--添加等级体系的配置
|
6 years ago |
|
huang
|
4c8ac8a8b6
|
..
|
6 years ago |
|
caishi
|
5191b8524c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
huang
|
92af24b8e3
|
镜像区分主次
|
6 years ago |
|
caishi
|
0b23356298
|
超级管理员实训课程等级体系
|
6 years ago |
|
huang
|
b1c0c19265
|
门户首页优化
|
6 years ago |
|
huang
|
4e6e724dca
|
个人主页性能优化
|
6 years ago |
|
cxt
|
739e560a40
|
调整
|
6 years ago |
|
cxt
|
d23e266f58
|
调整
|
6 years ago |
|
caishi
|
7c25621ddc
|
系统通知页面位置
|
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 |
|
cxt
|
e7205ddc5a
|
鹏程访问实训页面
|
6 years ago |
|
杨树明
|
54bb513255
|
工程认证输入框的样式问题修复
|
6 years ago |
|
caishi
|
f9354923a5
|
实训配置编辑评测脚本超出范围
|
6 years ago |
|
daiao
|
ce12c48584
|
无法注册用户
|
6 years ago |
|
daiao
|
29e661019b
|
解决线上冲突
|
6 years ago |
|
daiao
|
db1f99cb13
|
第一次上线
|
6 years ago |
|
daiao
|
7b1f61a514
|
第一次版本
|
6 years ago |
