 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
|
修改
|
5 years ago |
|
ELF
|
1bec15c186
|
修改迁移bug
|
5 years ago |
|
ELF
|
f3b323bda8
|
修改
|
5 years ago |
yulingwei
|
eaa25ebcda
|
feature/desposit
|
5 years ago |
|
ELF
|
096e32d581
|
商户配置
|
5 years ago |
|
ELF
|
e8a925b64c
|
游戏统计添加聚合充值数据
|
5 years ago |
|
ELF
|
15d0b454a4
|
修改
|
5 years ago |
|
ELF
|
70c9e26ce4
|
修改bug
|
5 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
5 years ago |
|
ELF
|
102e77267d
|
修改bug
|
5 years ago |
|
ELF
|
e94b6418f1
|
修改
|
5 years ago |
|
ELF
|
8224cfb362
|
修改
|
5 years ago |
|
ELF
|
77c692c44d
|
修改
|
5 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
|
5 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
5 years ago |
|
ELF
|
34691d6baa
|
修改
|
5 years ago |
|
ELF
|
6f2f588617
|
优化
|
5 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
5 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
5 years ago |
|
ELF
|
2d872ed710
|
解决冲突
|
5 years ago |
|
ELF
|
a153fb9a0e
|
修改
|
5 years ago |
|
zhengyongxing
|
9d43914b17
|
汇总单结算代码上传
|
5 years ago |
|
ELF
|
69b09c582f
|
添加落地页限制规则
|
5 years ago |
|
ELF
|
d5d6c255b0
|
优化打包
|
5 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 |
|
sunke
|
e94c64a881
|
平台币统计
|
5 years ago |
|
廖金灵
|
4ee8b21cd5
|
Merge branch 'feature/mark_repeat_user' of wmtx/platform into release
用户重复标识-注册事件通知
|
5 years ago |
|
ELF
|
bda92e4e1a
|
用户重复标识-注册事件通知
|
5 years ago |
|
ELF
|
a06b199068
|
落地页记录下载日志
|
5 years ago |
|
ELF
|
b434d2eacc
|
优化游戏管理
|
5 years ago |
|
ELF
|
dae2dd5fd9
|
优化游戏
|
5 years ago |
|
sunke
|
0c0b2d2f01
|
record_PromoteLogs热修复
|
5 years ago |
|
sunke
|
1f6de9be57
|
操作日志
|
5 years ago |
|
ELF
|
dad83c8d38
|
押金付款方式添加选项
|
5 years ago |
|
ELF
|
e58bb1149f
|
修改落地页授权
|
5 years ago |
|
yulingwei
|
e35f20ee70
|
游戏预警
|
5 years ago |
|
ELF
|
423b4ae77b
|
解决冲突
|
5 years ago |
|
ELF
|
bbb31890f6
|
未收押金会长禁用落地页/下载页
|
5 years ago |
|
ELF
|
ed25d54dc8
|
解决冲突
|
5 years ago |
|
ELF
|
501b8099d4
|
解决冲突
|
5 years ago |
|
ELF
|
b4d35af3cb
|
推广员列表显示
|
5 years ago |
chenxiaojun
|
e48056686d
|
推广平台>数据管理--新增推广员指标
|
5 years ago |
|
liaojinling
|
e596d11cee
|
会长押金
|
5 years ago |
|
liaojinling
|
843a429b43
|
下载添加部门/小组
|
5 years ago |
|
liaojinling
|
d789a175f8
|
推广员/组长添加备注
|
5 years ago |
|
ELF
|
e8a0975981
|
解决冲突
|
5 years ago |
|
ELF
|
b7cf4c28a7
|
修改
|
5 years ago |
|
ELF
|
3af87434b9
|
权限判断修改
|
5 years ago |
|
ELF
|
d3a3b8cdb7
|
修改
|
5 years ago |
|
ELF
|
2195bb4c55
|
修改短信发送
|
5 years ago |
|
ELF
|
79f9801351
|
修改落地页/下载页
|
5 years ago |
|
chenxiaojun
|
535f185e37
|
推广员指标管理
|
5 years ago |
|
ELF
|
c01b0f1083
|
发送短信添加ip地址
|
5 years ago |
|
ELF
|
afa7aa8988
|
修改短信服务bug
|
5 years ago |
|
ELF
|
f6eb5d8008
|
修改bug
|
5 years ago |
|
ELF
|
e4daff1be8
|
修改短信接口
|
5 years ago |
|
ELF
|
c6d99af7a1
|
Merge branch 'hotfix/shift_player_selle' into release
|
5 years ago |
|
ELF
|
a31e42b7c4
|
Merge branch 'hotfix/link_info' into release
|
5 years ago |
zhengchanglong
|
bb08c723a3
|
Merge branch 'feature/group_type' into release-1.0.1
|
5 years ago |
|
ELF
|
04fccce6dc
|
修改上传网络请求限制
|
5 years ago |
|
ELF
|
e6c891a945
|
修改
|
5 years ago |
|
ELF
|
f472f5e9d3
|
文件保存改成cdn
|
5 years ago |
|
ELF
|
91d4c9f753
|
补链/玩家迁移排除已结算订单（cp结算）
|
5 years ago |
liuweiwen
|
0b3ae062b1
|
优化：推广员新增与编辑的推广公司增加万盟天下科技
新增需求：推广员增加工会归属和工会关系属性
|
5 years ago |
|
廖金灵
|
b12b133a06
|
Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
|
5 years ago |
|
elf@home
|
e59a2f7350
|
添加玩家迁移只对同一推广员限制
|
5 years ago |
|
ELF
|
f1dc5f8920
|
推广员继承company_id
|
5 years ago |
|
ELF
|
87fb1f526e
|
修改推广员添加时初始默认状态
|
5 years ago |
|
elf@home
|
6e354fe3b3
|
优化链接归属查询
|
5 years ago |
|
ELF
|
da5e8b9050
|
修改
|
5 years ago |
|
liuweiwen
|
2096c22826
|
注释
|
5 years ago |
|
ELF
|
b36e1f1bc9
|
解决冲突
|
5 years ago |
|
ELF
|
c90851996c
|
修改bug
|
5 years ago |
|
liuweiwen
|
e30f2f9601
|
Merge branch 'dev' into dev_lww
# Conflicts:
# Application/Admin/Controller/FileController.class.php
# Application/Admin/Controller/GameController.class.php
# Application/Admin/View/Game/edit.html
# Application/Home/Controller/HomeController.class.php
# Application/Home/View/default/Home/landingPage.html
# Public/Home/css/index2.css
|
5 years ago |
|
ELF
|
bb2996dbee
|
迁移忽略结算
|
5 years ago |
|
ELF
|
289b40329f
|
添加换绑时金额
|
5 years ago |
|
liuweiwen
|
1693f7fa98
|
推广公司
|
5 years ago |
|
liuweiwen
|
d51725f1af
|
新增推广员时，新增推广所属公司
|
5 years ago |
|
ELF
|
3e7382542d
|
打包区分ios新旧包
|
5 years ago |
|
liaojinling
|
c637a8bfe0
|
打包
|
5 years ago |
|
ELF
|
81a968947b
|
修改bug
|
5 years ago |
|
liaojinling
|
d5dc2396f2
|
修改
|
5 years ago |
|
liaojinling
|
ca4f1954e4
|
修改bug
|
5 years ago |
|
liaojinling
|
1204b1a0e8
|
修改
|
5 years ago |
|
liaojinling
|
fe6dd1ddff
|
改成旧的打包方式
|
5 years ago |
|
ELF
|
ef60ca85cf
|
修改
|
5 years ago |
|
ELF
|
a91a5d5759
|
修改
|
5 years ago |
|
ELF
|
128c11f5b8
|
修改
|
5 years ago |
|
ELF
|
25fa79ea55
|
修改玩家迁移
|
5 years ago |
|
ELF
|
4fc5b08289
|
修改
|
5 years ago |
|
ELF
|
1f167778a7
|
调试
|
5 years ago |
|
ELF
|
88385b2f87
|
调试
|
5 years ago |