elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,688 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'master'
${ noResults }
Commit Graph

525 Commits (master)

Author SHA1 Message Date
ELF 9f37c6db3c 有害 4 years ago
ELF 23feb76e09 有害 4 years ago
ELF b9092a4501 有害 4 years ago
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi c4849ffc7c 新增商户固定 4 years ago
ELF 80e02733e7 封禁推广员推广链接 4 years ago
廖金灵 95da7866d1 Merge pull request 'feature/op_player_shift' (#332) from feature/op_player_shift into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/332
 4 years ago
ELF 90d82b1a8d 有害 4 years ago
ELF 8440c5d384 优化 4 years ago
ELF a9ec0f0116 优化 4 years ago
ELF fea86b964c 优化 4 years ago
ELF 11b9ec62ba 优化 4 years ago
ELF 0888779250 优化 4 years ago
廖金灵 56e28d216e Merge pull request '版本更新' (#285) from release into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/285
 4 years ago
ELF bfa0c5c5b8 迁移优化 4 years ago
zhengyongxing 9080d521fd 4.22号功能提交 4 years ago
ELF c7341d149d 优化 4 years ago
ELF c7b90f54a6 优化 4 years ago
ELF d7d78e748d 修改跨区bug 4 years ago
ELF 7bb9aa833c 优化 4 years ago
ELF 8dee426c5f 优化 4 years ago
郑永星 f078bfd8b6 Merge pull request '2.10号功能提交' (#171) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/171
 4 years ago
zhengyongxing 4419f1539c 2.10号功能提交 4 years ago
郑永星 3c760984ab Merge pull request '2.10号功能提交' (#170) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/170
 4 years ago
zhengyongxing 9b2f7b1a61 2.10号功能提交 4 years ago
廖金灵 e84f8c174a Merge pull request '优化' (#165) from feature/testing_quota_up into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/165
 4 years ago
ELF 8a815af691 优化 4 years ago
ly 4a69622b01 额外额度备注信息显示 4 years ago
陈志 9b3b982df7 Merge pull request '优化所属会长判断' (#154) from feature/testing_daily_count into release 
优化所属会长判断
 4 years ago
chenzhi d7a787c0fc 优化所属会长判断 4 years ago
郑永星 12eb8aa9f0 Merge pull request '2.7号功能提交' (#153) from feature/add_item into release 
2.7号功能提交
 4 years ago
zhengyongxing 53ba2c7698 2.7号功能提交 4 years ago
chenzhi 290b48dc3b 优化测试统计导出 4 years ago
ELF a355c2b579 优化 4 years ago
elf@home 23643d2e0b 修改 4 years ago
廖金灵 ea21c1ee49 Merge pull request '修改i哎' (#133) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/133
 4 years ago
ELF 874ba3a705 修改i哎 4 years ago
廖金灵 9af9edef0a Merge pull request '优化' (#129) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
 4 years ago
ELF a3d3b5722c 优化 4 years ago
郑永星 3d09dcf4b5 Merge pull request '1.28功能提交' (#127) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
 4 years ago
zhengyongxing 338c0369d1 1.28功能提交 4 years ago
廖金灵 dcbc152712 Merge pull request '优化' (#125) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
 4 years ago
ELF 4f3c21263d 优化 4 years ago
廖金灵 7194d5a945 Merge pull request '优化' (#112) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
 4 years ago
ELF 0aa3c514d7 优化 4 years ago
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' (#107) from feature/testing_daily_count into release 
优化首页提醒
 4 years ago
chenzhi 13d0c6fa59 优化首页提醒 4 years ago
ELF 9e68e40200 解决冲突 4 years ago
chenzhi 2658c50c3a 新增测试资源统计 4 years ago
ELF 531b94bae8 版本 4 years ago
elf@home 34e25f293a 推广员添加每级id 4 years ago
郑永星 6c1c82b649 Merge pull request '1.28功能提交' (#100) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
 4 years ago
zhengyongxing deff984922 1.28功能提交 4 years ago
ELF d08df7feba 修改 4 years ago
ELF 07c95d2ea7 剑破长空测试资源 4 years ago
zhengyongxing c9ef39ada9 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing 6e767a739c 市场业绩功能提交 4 years ago
ELF 3dfc92ecc3 修改下载超时 4 years ago
ELF a70bffaee3 修改bug 4 years ago
ELF 4f4929ad72 修改 4 years ago
ELF 932a082134 剑仙诀添加资源发放接口 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
 4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211 
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
 4 years ago
ELF f2be33c427 修改 4 years ago
tping 31ce7b071c 1211 4 years ago
ELF 1b74318619 修改 4 years ago
ELF c8f082cee8 优化显示 4 years ago
ELF 78caa452b2 测试资源添加审核人 4 years ago
ELF 88402dfac0 修改 4 years ago
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check 4 years ago
ELF f95125892a 优化推广员后台汇总查询 4 years ago
ELF 7468057834 推广员结算订单归属 4 years ago
ELF a0f57749c4 优化当前域名获取 4 years ago
ELF c339623c78 优化 4 years ago
elf@home dd66846e68 根据推广公司配置推广后台 4 years ago
ELF 89332c0d54 解决冲突 4 years ago
ELF c550846454 修改 4 years ago
ELF 977cfcba3c 修改 4 years ago
ELF c20d071817 修改 4 years ago
ELF 40123f8c50 修改 4 years ago
ELF 530dded4e7 优化 4 years ago
ELF ceadb8562f 新增60/90日留存率统计 4 years ago
ELF 5253a76963 优化 4 years ago
ELF 3a6b912399 优化 4 years ago
ELF afc95791d2 优化 4 years ago
ELF 1f3eaa06da 修改 4 years ago
ELF 07f7bca3ee 修改 4 years ago
ELF 47ca2f2b9e 修改 4 years ago
ELF e1352fea1e 修改 4 years ago
ELF dd71ccdf83 修改 4 years ago
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin 4 years ago
ELF 34586b228e 修改 4 years ago
ELF 8c8d01a446 修改评级 4 years ago
ELF 3a4fb51222 修改支付商户规则bug 4 years ago
ELF 65c5a221fc 修改 4 years ago
ELF b44a5118cf 修改 4 years ago
ELF 36c240c608 修改 4 years ago
ELF a10bb888da 修改bug 4 years ago
ELF c5fe80639f 修改 4 years ago
ELF 06bd640c79 修改 4 years ago
ELF 263e35c097 初步提交 4 years ago
ELF 2ae89b9edb 解决冲突 4 years ago
ELF 9b11202deb 修改 4 years ago
elf@home c4eb04428e 修改 4 years ago
ELF afad195062 修改 4 years ago
ELF ca99068a0e 修改 4 years ago
ELF 19c782b053 解决冲突 4 years ago
ELF 268ea4e34d 修改 4 years ago
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change 
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
 4 years ago
ELF 6fcaa1362c 重置权限缓存 4 years ago
ELF 6da122550c 优化 4 years ago
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change 
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
 4 years ago
zhengyongxing 3c698adba9 上游导出修正 4 years ago
ELF 16122d5d9f 修改 4 years ago
chenzhi f169d65c1c 优化推广公司添加排序 4 years ago
ELF 050eb98843 xiugai 4 years ago
ELF 2c9092273f 修改 4 years ago
elf@home 1dd594f46f 修改bug 4 years ago
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
 4 years ago
ELF 268e084241 修改 4 years ago
廖金灵 931c837d7e Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
 4 years ago
ELF 9d67a4c842 优化 4 years ago
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
 4 years ago
ELF 6596e01a29 修改 4 years ago
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other 
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
 4 years ago
ELF 6e2fda1e26 解决冲突 4 years ago
ELF 32bc839dcd 合并 4 years ago
ELF e0bbec0978 修改 4 years ago
ELF 7614d5feca 修改 4 years ago
ELF e441f030c0 优化 4 years ago
ELF e9038d7471 ss 4 years ago
ELF 296e378501 修改 4 years ago
ELF e4854aca3a 修改 4 years ago
ELF 1a14ed8dc7 修改 4 years ago
ELF 7adabb54f9 修改 4 years ago
elf@home 50755b89c5 修改 4 years ago
ELF cc6c5d4e74 修改 4 years ago
ELF 2867a05bb3 修改 4 years ago
ELF c7390f4c2e bug修复 4 years ago
ELF e249596014 修改 4 years ago
ELF 550da5cb37 测试 4 years ago
ELF 06c4d5f1f1 优化测试资源 4 years ago
zhengyongxing b5e49e850d 上下游聚合打款信息修改 4 years ago
ELF fa90dc0bc8 修改 4 years ago
ELF c9cd377d4f 修改 4 years ago
ELF 367345ea8d 修改 4 years ago
ELF ecf460e7c9 修改 4 years ago
ELF 9c59ba06e2 修改 4 years ago
zhengyongxing 62f4ce3362 上下游聚合打款信息修改 4 years ago
ELF 3383b3d2d9 修改 4 years ago
ELF 49751b8760 测试资源修改 4 years ago
ELF edb090feca 解决冲突 4 years ago
ELF 004b540a63 解决冲突 4 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
 4 years ago
ELF 56282658fc 解决冲突 4 years ago
ELF 0206a422f9 解决冲突 4 years ago
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign 4 years ago
zhengyongxing 4c3112b70e 充值信息查看权限添加 4 years ago
ELF 46fc13a91e 修改 4 years ago
ELF 1bec15c186 修改迁移bug 4 years ago
ELF f3b323bda8 修改 4 years ago
yulingwei eaa25ebcda feature/desposit 4 years ago
ELF 096e32d581 商户配置 4 years ago
ELF e8a925b64c 游戏统计添加聚合充值数据 4 years ago
ELF 15d0b454a4 修改 4 years ago
ELF 70c9e26ce4 修改bug 4 years ago
ELF 990a2bd206 解决冲突 4 years ago
ELF 102e77267d 修改bug 4 years ago
ELF e94b6418f1 修改 4 years ago
ELF 8224cfb362 修改 4 years ago
ELF 77c692c44d 修改 4 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
 4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
 4 years ago
ELF 34691d6baa 修改 4 years ago
ELF 6f2f588617 优化 4 years ago
ELF 76fcfec7c2 修改 4 years ago
ELF 5f5a6ee1af 修改 4 years ago
ELF 2d872ed710 解决冲突 4 years ago
ELF a153fb9a0e 修改 4 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 4 years ago
ELF 69b09c582f 添加落地页限制规则 4 years ago
ELF d5d6c255b0 优化打包 4 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
万盟天下 f7a0d82314 Merge branch 'hotfix/upload_oss' of wmtx/platform into release 
修改
 5 years ago
ELF 4b852cf071 修改 5 years ago
万盟天下 e4be42865b Merge branch 'hotfix/upload_oss' of wmtx/platform into release 
修改推广平台游戏上下架bug
 5 years ago
ELF ce990d3181 修改bug 5 years ago
万盟天下 48abd2d464 Merge branch 'hotfix/upload_oss' of wmtx/platform into master 
修改分包
 5 years ago
万盟天下 7c0ba028b1 Merge branch 'hotfix/upload_oss' of wmtx/platform into release 
优化分包
 5 years ago
ELF c871575e23 修改打包失败提示 5 years ago
廖金灵 5d0b9d65ed Merge branch 'feature/ylw-4-27' of wmtx/platform into release 
市场专员新增合作团队可自动匹配到市场总监
 5 years ago
ELF b217695c3f 修改分包oss文件上传 5 years ago
ELF d9cc82f73a 修改网站注册 5 years ago
yulingwei bbc1f6b89a upt 5 years ago
ELF 908722c5be 修改 5 years ago
ELF ed19727f91 修改bug 5 years ago
ELF a0cfee5466 修改 5 years ago
ELF 4a1ffd2955 解决冲突 5 years ago
sunke 9878ba45e5 取消平台转移 5 years ago