Commit Graph

572 Commits (a496de41ee2dca70d495de8b45d9c8e8284fcb4f)

Author SHA1 Message Date
jingquan huang 034312aec4 简略版统计
6 years ago
cxt b8daa7e818 调整导入学生账号
6 years ago
jingquan huang 3685c386db 实训临时一些优化
6 years ago
daiao eea7aae984 修改回来
6 years ago
daiao 542830b315 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
daiao b139d1cf28 评测策略修改
6 years ago
jasder 01a9662ac2 FIX 修复合作伙伴添加客户后,与我的菜单中 '客户管理'列表数据不一致的bug
6 years ago
Alec Zhou 923d702d01 将current_user修改为User.current
6 years ago
Alec Zhou 4b7d55cbef 创建openi记录之后建立起user与openi之间的联系
6 years ago
Alec Zhou fbf86d64dc 解除openi单点登录相关代码的注释
6 years ago
p31729568 1fa27ae9d3 fix reject trial auth feature issue
6 years ago
p31729568 9c3fdd0c08 fix management agree or reject trial auth
6 years ago
cxt 4c2d678253 调整
6 years ago
cxt efa4020aa3 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt f6e533c6b6 试用授权的审批短信发送手机号变更
6 years ago
cxt e2669b8e78 试卷分数迁移
6 years ago
p31729568 f1b0c6a038 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
p31729568 05cd6b874b reject trial authorization modal feature
6 years ago
daiao 7359854e28 超级管理员 已发布实训路径的excel导出增加实训的实训发布时间和课程等级列
6 years ago
daiao 85c96c5167 1
6 years ago
daiao aa525adae9 Merge branch 'develop' into educoder
6 years ago
jingquan huang 5950eb66d6 添加权限
6 years ago
jingquan huang c71677710d ..
6 years ago
jingquan huang e3af858ecc 本地导入线上
6 years ago
jingquan huang 593ee71e79 ..
6 years ago
huang 41a1795b32 Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
huang e6b3b6b535 本地到线上仓库同步
6 years ago
huang fe1b87f9d6 '..'
6 years ago
Alec Zhou 8b711ac57d Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 21043d1a6c 修复未绑定邮箱用户点击开始实战按钮页面无反应的bug
6 years ago
p31729568 1298e748f2 modify school statistic service to decrease response time
6 years ago
Alec Zhou face0cc8de Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 2f92f650d5 增加邮箱为空的判断
6 years ago
jasder 2807c3f433 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
jasder 70cb0254bf FIX bug
6 years ago
Alec Zhou 081eef9fb5 将注释的openi单点登录的代码重新加上
6 years ago
jingquan huang 54f51ff3f4 图像被串改问题
6 years ago
jingquan huang 2fc8833bef 图像修改添加权限
6 years ago
Alec Zhou 59e084ba48 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 59b117376e 暂时注释openi相关代码
6 years ago
p31729568 922553af6e fix school data grow list error
6 years ago
p31729568 8348c95b57 modify school contrast data feature
6 years ago
Alec Zhou c76c43eb29 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 451e06dcaa 后台创建openi关联用户时直接授权,并且修改了生成用户名的规则
6 years ago
cxt 0560d0e2c5 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt 09abc5511f 编辑部门url
6 years ago
Alec Zhou 97c2b1f1f5 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 90e7e056ec 修复重定向过多的bug
6 years ago
p31729568 6a08ec9a27 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
p31729568 50d7ed2deb export school statistic data feature
6 years ago
daiao 731d8532e4 1
6 years ago
daiao b49c1f5752 1
6 years ago
daiao f738ba4cc5 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt fdec1f663d 超级管理员的试用授权“已审批”增加学院统计
6 years ago
cxt 5002fd8a5c 搜索实训时过滤掉删除的实训
6 years ago
daiao 8cce3e27ba 隐藏和已经删除的实训,不能通过连接访问
6 years ago
Alec Zhou b5eb7c1354 修改了before_filter的作用范围
6 years ago
jasder c7a3ef7732 ADD 超级管理员“已发布实训”列表的excel导出,增加实训链接
6 years ago
jasder 6129e17ddb Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
jasder 3cec847e3b ADD 学院统计页面的“课堂”根据进行状态进行排序(正在进行排前面)
6 years ago
jingquan huang 05284a3aba ..
6 years ago
jingquan huang 0efdd839e0 openi ..
6 years ago
jingquan huang 792fe7c71b 实训课程删除权限
6 years ago
jingquan huang a953ebd03b ..
6 years ago
jingquan huang cfdb4f95c2 定义一些管理员才能使用功能的权限
6 years ago
jingquan huang 4e0f674517 运营人员不提供用户删除权限
6 years ago
Alec Zhou 0cea78e89e 修改了获取referer的代码
6 years ago
Alec Zhou d067d4dbed 将request.referer修改为request.original_url
6 years ago
Alec Zhou 0dd03710ae Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
p31729568 92451b9720 fix issue
6 years ago
Alec Zhou 58a278f583 增加日志
6 years ago
Alec Zhou 256e6021f4 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou f103d0fe23 修改了请求来源的判断
6 years ago
jingquan huang c349dd1621 ..
6 years ago
jingquan huang eb12c7cdfb ..
6 years ago
Alec Zhou fb7233777f 修改日志类型debug->info
6 years ago
Alec Zhou 4801ba2917 添加日志信息以供调试
6 years ago
Alec Zhou 0486340146 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 4ee0b2a865 修复了刷新实训相关页面出现500的bug
6 years ago
jingquan huang bffc6c363f Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
jingquan huang 5c6b6f4c95 添加运营定制功能
6 years ago
p31729568 88431ecd73 fix rebase
6 years ago
p31729568 01668fe3f8 school contrast data feature
6 years ago
jingquan huang ca8387e2e6 Merge branch 'educoder' into develop
6 years ago
jingquan huang 7104eee0c5 运营人员权限
6 years ago
Alec Zhou 95e1bc759c 完成了openi单点登录的功能
6 years ago
daiao c140b70818 合作伙伴改版
6 years ago
winse 372db525bd management school report feature
6 years ago
jingquan huang a71064b8e7 Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
cxt 06352bddb7 Merge branch 'develop' into educoder
6 years ago
jingquan huang f82c7b26f8 本地版优化
6 years ago
cxt a3230075ab 学生身份隐藏新建课堂入口
6 years ago
cxt 3e44fe368b 学生身份隐藏新建课堂入口
6 years ago
daiao a85debe484 Merge branch 'develop' into educoder
6 years ago
daiao 245c01a26b 1
6 years ago
daiao 2ff2151170 Merge branch 'develop' into educoder
6 years ago
daiao fc719acffc 1
6 years ago
cxt 52af31be38 超级管理员的导出调整
6 years ago
cxt 22b549cf77 merge
6 years ago
daiao f8fd2488a1 1
6 years ago
cxt 23753d8977 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt efcac7da3d 作业设置的调整
6 years ago
jingquan huang a3e3fa0965 ..
6 years ago
jingquan huang 98c5bcca6e local to shixun
6 years ago
jingquan huang 59ff646a4f 本地数据初始化
6 years ago
daiao 70c47a3c9b 1
6 years ago
daiao f6fc52b09d Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
daiao 49ef49a325 1
6 years ago
jingquan huang f6bbf74a52 Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
jingquan huang 096b958386 线上版本数据导入到临时表,临时表转到线上版
6 years ago
cxt d0178f1a9f 加事务
6 years ago
cxt 4eeb6f1fcc 平台的用户反馈增加“问题页面网址”输入入口,且必填
6 years ago
cxt 5e0b771412 调整
6 years ago
cxt 44f7cebbed 调整
6 years ago
cxt 3f63a51499 个人主页的新建入口
6 years ago
cxt e7c04e8c58 实训课程的教学团队新增删除、上移、下移的功能
6 years ago
daiao 205bfd0799 Merge remote-tracking branch 'remotes/origin/develop' into educoder
6 years ago
daiao 35a99b2ef0 Merge branch 'develop' into educoder
6 years ago
cxt 4f9d818011 导出调整
6 years ago
cxt 431942d7a7 调整
6 years ago
cxt 3499ffd626 调整
6 years ago
daiao b92c4507b5 Merge branch 'educoder' into develop
6 years ago
jingquan huang ba49b555cb Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
jingquan huang 8ffc0d51eb user
6 years ago
daiao 30af40165d 超级管理员用户列表导出报错
6 years ago
cxt 66a1a9027a 找回密码后端加验证
6 years ago
daiao 1780153ba2 Merge branch 'develop' into educoder
6 years ago
daiao 4fb4e7dbc9 1
6 years ago
daiao 44adbf8e82 1
6 years ago
cxt 88b2ff8245 Merge branch 'develop' into educoder
6 years ago
cxt 9f39908587 添加客户的过滤
6 years ago
cxt 18de726bff 调整
6 years ago
jingquan huang efca753994 管理员界面搜索500问题
6 years ago
cxt 885ace98a9 搜索
6 years ago
daiao 58b81b21db 1
6 years ago
daiao aa13f63e90 Merge branch 'dev_partners' into develop
6 years ago
cxt 80cdbd6ad3 调整
6 years ago
cxt c0ef3e0e1c Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
6 years ago
cxt 14be55dca8 权限调整
6 years ago
jasder 402eaa52da Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
6 years ago
jasder 9622698953 FIX
6 years ago
cxt c95a8c60fd 调整
6 years ago
daiao d02fec75db Merge branch 'dev_partners' into develop
6 years ago
cxt 096dd01b8a 删除客户
6 years ago
daiao 72e8056d7b Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
6 years ago
daiao c18c99c7a7 超级管理员消息的实训反馈页面增加按照评论时间检索的功能
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 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 eece0a31ee 添加合作者
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
daiao a01d30f142 删除的实训首页还能显示
6 years ago
SylorHuang 744c021e1c partners
6 years ago
SylorHuang 8ffdad5447 partners
6 years ago
SylorHuang 45bdbab053 partners
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 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 946755f9e0 客户管理列表
6 years ago
jasder 57fb324875 Merge branch 'develop' into dev_partners
6 years ago
cxt bec7b0eb36 Merge branch 'develop' into dev_partners
6 years ago
cxt b66140bcfe 加入题库报错
6 years ago
cxt 00dadf7531 客户列表
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
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
daiao b7b1f35913 导出实训反馈编码格式修改
6 years ago
jingquan huang 5a3447b5cf conflict
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 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 12cb81b3e8 解决冲突
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
cxt e7c8ca039f 讨论区的发送调整
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 f60d8611ed 实训权限控制
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 88972c60a6 实训认证
6 years ago
daiao 40c19ae0d5 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
huang f70c1a49c3 移动云问题
6 years ago
huang ada4254039 ecloud控制器
6 years ago
huang 6137bcc770 实训权限的一些控制
6 years ago
cxt f1b17212b4 调整
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 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 d1b676e479 评测开始清空之前的记录
6 years ago
daiao d1f536b191 增加日志信息
6 years ago
daiao 8b26219bee 字段值
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