Commit Graph

1561 Commits (8fb73e6fede24f2f71205a0edd0ccfead3922eae)

Author SHA1 Message Date
ELF d7d78e748d 修改跨区bug
廖金灵 8323361a9e Merge pull request '强制落地页转换' () from hotfix/force_landing_page into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/243
ELF 15e1fff0ac 优化
ELF 5d92af7dcc 优化
廖金灵 d6dfae336b Merge pull request '修改九天仙尘落地页名称显示' () from hotfix/special_game_name into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/235
ELF 6bc17ad982 修改九天仙尘落地页名称显示
ELF a2bd05ceac Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
liyang a960ed7c0c 修复
ELF e5d4c2e231 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
ELF 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
ELF 8dee426c5f 优化
liyang da588a3d86 修复
liyang 42a8fc94f7 角色查询-本推广号
liyang 5cd8ca2857 角色查询、额外额外、测试资源权限修改
liyang a457750390 角色查询、额外额度、测试资源权限修改
liyang 8617ad3e91 Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309
liyang f8b93616ce 菜单封装中
ELF 1ab1db12ab 修复苹果落地页无法滚动bug
廖金灵 36becfb8d6 Merge pull request '1' () from feature/0207zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/166
liyang 65ca417a2e 推广后台资源申请页面
tping fb3bcdd107 1
张谷成 76f6c77160 Merge pull request '1' () from hotfix/0203 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/148
tping f3efd97a19 1
tping 792508bd64 1
tping e5b6af3771 1
tping d14cb334af Merge branch 'release' into feature/0207zgc
tping fbf0b27ca3 推广后台充值导出
ELF 2ecaa742d5 优化
ELF 91996da3a2 优化
ELF a3d3b5722c 优化
ELF 4f3c21263d 优化
ELF 531b94bae8 版本
ELF 3dfc92ecc3 修改下载超时
chenzhi 343ecc8587 优化登陆
tping e4ef55531a 特殊公司评级管理权限
tping e495105ed0 会长可以看
tping 15c841e883 Merge branch 'release' into feature/1211
tping 553ce102df 特殊公司
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
tping 5cf8f2ea10 特殊公司
tping 33ef14e1af 特殊外团
ELF f58e565fe7 修改
ELF e5a0117912 修改
tping 31ce7b071c 1211
ELF 1b74318619 修改
ELF 88402dfac0 修改
廖金灵 1b3a365409 Merge branch 'hotfix/promote_group_view_recharge' of wmtx/platform into release
雷雨等导量公会组长可以看到充值信息
ELF d43d0c2628 雷雨等导量公会组长可以看到充值信息
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check