Commit Graph

847 Commits (b426ee47a0be798efe202bc145e72f7b5b7785db)

Author SHA1 Message Date
Alec Zhou b24547f9e0 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 923d702d01 将current_user修改为User.current
6 years ago
cxt 28191b71ea Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt 39423255da 实训报告导出报500
6 years ago
p31729568 8c3767cfa2 fix my account page reject trial auth notify modal bug
6 years ago
p31729568 dbaed7bc12 modify reject trial auth modal
6 years ago
cxt aa6e3dddbf 试用授权未审批页面增加学校统计链接
6 years ago
Alec Zhou 584da88eca Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou 4b7d55cbef 创建openi记录之后建立起user与openi之间的联系
6 years ago
cxt 6a80a0bbf1 Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
cxt 31635eb93f 试卷题的表格样式
6 years ago
p31729568 fcfda1f9a2 fix export school statistic xls empty bug
6 years ago
Alec Zhou fbf86d64dc 解除openi单点登录相关代码的注释
6 years ago
p31729568 495cc01315 not statistic deleted courses to school statistic report
6 years ago
p31729568 35e26e22f7 remove debug code
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 3c76641df3 调整
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 6c53f561d8 modify reject trial auth tiding content
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
杨树明 745597348d b
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
杨树明 859e3e9a62 后台撤销授权功能优化 (前端)
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
杨树明 c7cc754046 b
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
p31729568 0f6e2b0bf8 do not save useless school daily report data && clear school daily report useless data rake
6 years ago
daiao 27b59fa3cc 1
6 years ago
daiao 09c221b5b5 实训报告取分
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 bfe8f6800f fix css display issue && fix export school report 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 c28692ffc5 调整
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 5f8341dcf5 1
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 14b2ce10da Merge branch 'educoder' into develop
6 years ago
cxt fdec1f663d 超级管理员的试用授权“已审批”增加学院统计
6 years ago
cxt 5002fd8a5c 搜索实训时过滤掉删除的实训
6 years ago
daiao 8cce3e27ba 隐藏和已经删除的实训,不能通过连接访问
6 years ago
jingquan huang 14f83779a3 Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
jingquan huang da8d83c8ef 导航问题
6 years ago
Alec Zhou 16d285d2fd Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
Alec Zhou b5eb7c1354 修改了before_filter的作用范围
6 years ago
daiao 9d48537c73 Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
daiao ef5095c070 1
6 years ago
杨树明 ff9a199f1f 配置js丢失
6 years ago
jingquan huang 7cee6ac4ce ..
6 years ago
daiao 0c82824439 1
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
jingquan huang a715d33728 Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
jingquan huang a8d347bbe4 用户权限角色配置默认错误
6 years ago
p31729568 35ec3b1744 fix school data contrast percentage zero issue
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
p31729568 26455d0efb add index to fix order slow issue
6 years ago
jingquan huang 1864620376 Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
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 01017c3bd3 checkout box选择运营人员
6 years ago
jingquan huang fb1ba699cb ..
6 years ago
jingquan huang c349dd1621 ..
6 years ago
jingquan huang b68720ee38 运营人员
6 years ago
p31729568 2be42bebe5 remove order in school data contrast feature
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 e13cbaef60 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
daiao c140b70818 合作伙伴改版
6 years ago
jingquan huang 2651225563 Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
jingquan huang 085e1ec44d 首页的一些优化
6 years ago
p31729568 f37d02bcfb fix low ruby version support bug
6 years ago
p31729568 f1b1ea0cd3 fix not support &. operation in low ruby version
6 years ago
p31729568 44dadbc173 fix ruby version not support ** operation
6 years ago
winse 372db525bd management school report feature
6 years ago
杨树明 3135f36cae Merge remote-tracking branch 'origin/educoder' into educoder
6 years ago
jingquan huang 978fbf47e5 个人主页的一些优化
6 years ago
杨树明 1832e91b4e build 测试
6 years ago
jingquan huang a71064b8e7 Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
6 years ago
jingquan huang cdfda26c99 登录页面优化
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
daiao 84769b7e53 删除实例单位的示例2字
6 years ago
杨树明 22e5e7f60a Merge remote-tracking branch 'origin/develop' into develop
6 years ago
杨树明 597a66b764 【后台管理】新增需求(运营统计报表 对比报表 新增对比报表 (前端
6 years ago
caishi 882b6acd1f 培养目标页面列表行信息显示修改
6 years ago
cxt 52af31be38 超级管理员的导出调整
6 years ago
杨树明 9fe6c7322b Merge remote-tracking branch 'origin/develop' into develop
6 years ago
杨树明 33d4027a8c 客户项目列表页调整
6 years ago
cxt 22b549cf77 merge
6 years ago
daiao f8fd2488a1 1
6 years ago
hjm c3ed1bbf14 b
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
caishi ca9e721dfe Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
caishi 73e890aaf6 超级管理员-合作伙伴新增菜单操作选项
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
daiao 20b1f3c533 Merge branch 'develop' into educoder
6 years ago
daiao 688c721bd3 1
6 years ago
cxt d0178f1a9f 加事务
6 years ago
caishi e836d333ea Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
caishi 23860440ff 评测设置保存后刷新页面
6 years ago
cxt 787acee2ea 滚动到顶部
6 years ago
cxt b9da38e82a 调整
6 years ago
杨树明 edf1762ae2 新建入口调整
6 years ago
cxt 432fe28c54 在用户与超级管理员的私信窗口,增加发送问题页网址的文字说明
6 years ago
cxt 4eeb6f1fcc 平台的用户反馈增加“问题页面网址”输入入口,且必填
6 years ago
cxt e1fc755f49 调整
6 years ago
cxt deaf1c78d1 调整
6 years ago
cxt 63ac324477 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt 5e0b771412 调整
6 years ago
杨树明 ffdbf3c782 暂无数据显示新建入口
6 years ago
cxt d62ffc27ff “合作伙伴”的管理员用户在“客户管理”页面中增加最新课堂动态时间
6 years ago
cxt 44f7cebbed 调整
6 years ago
cxt 728c0f3ba1 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt 3f63a51499 个人主页的新建入口
6 years ago
杨树明 81eb573c03 最新课堂动态时间 根据测试要求调整滑动样式
6 years ago
cxt 5e0cea8e88 Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
6 years ago
cxt e7c04e8c58 实训课程的教学团队新增删除、上移、下移的功能
6 years ago
杨树明 685bc6cc93 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
杨树明 6c599e362e 个人主页新增新建“课堂”、“实训”、“实训课程”、“项目”入口
6 years ago
daiao 9f67c4afb4 平台已经认证的老师可以直接查看测试集
6 years ago
杨树明 ff98ef9463 实训课程“教学团队”排序功能优化
6 years ago
daiao 24084c303e 实训制作者排序变化
6 years ago
daiao affb47f79e 1:
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 bf19cc6920 已发布的实训运行创建者修改脚本
6 years ago
jingquan huang 210d138fb9 vnc
6 years ago
jingquan huang 99bb535bcc message 500
6 years ago
jingquan huang 4a6d84487a message 500
6 years ago
daiao ad84f98c37 1
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 94e3289746 调试
6 years ago
cxt 9f39908587 添加客户的过滤
6 years ago
cxt 18de726bff 调整
6 years ago
jingquan huang efca753994 管理员界面搜索500问题
6 years ago
cxt 1d25444159 滚动翻页
6 years ago
cxt 885ace98a9 搜索
6 years ago
cxt 4cfc9a6171 Merge branch 'dev_partners' into develop
6 years ago
cxt 062f117191 搜索
6 years ago
daiao 58b81b21db 1
6 years ago
caishi afc456c9a3 Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
6 years ago
daiao aa13f63e90 Merge branch 'dev_partners' into develop
6 years ago
caishi c332ea4b0f 清空搜索框内容
6 years ago
cxt 80cdbd6ad3 调整
6 years ago
cxt 2e3c438d79 去掉多余的客户管理
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
daiao 10ee52c22c 1
6 years ago
cxt c95a8c60fd 调整
6 years ago
daiao d02fec75db Merge branch 'dev_partners' into develop
6 years ago
cxt 096dd01b8a 删除客户
6 years ago
cxt 30a5b1a4e6 Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
6 years ago
cxt d1d28d2209 头像名称
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 770538f16f Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
6 years ago
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