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 |
ELF
|
1e976d620b
|
调试
|
5 years ago |
ELF
|
b08c7748c9
|
调试
|
5 years ago |
ELF
|
494098abc1
|
修改分包
|
5 years ago |
elf@home
|
8d6c547468
|
支持分片文件上传
|
5 years ago |
chenxiaojun
|
efb4a771b0
|
推广平台->数据管理->每日概况|数据汇总--更新
|
5 years ago |
chenxiaojun
|
98fe853743
|
推广平台->数据管理--更新
|
5 years ago |
chenxiaojun
|
80f76c4490
|
推广平台->数据管理--更新
|
5 years ago |
ELF
|
112d7462bc
|
修改bug
|
5 years ago |
ELF
|
5a98b86a07
|
修改bug
|
5 years ago |
ELF
|
809191e0f2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
e2a2a07f03
|
修改bug
|
5 years ago |
sunke
|
401edecd61
|
target_level
|
5 years ago |
ELF
|
c0f19228d2
|
修改bug
|
5 years ago |
ELF
|
639e7117b8
|
修改bug
|
5 years ago |
ELF
|
de00fe5e48
|
修改bug
|
5 years ago |
ELF
|
3ebaf13810
|
修改bug
|
5 years ago |
ELF
|
270e24346d
|
修改bug
|
5 years ago |
ELF
|
1fd7023c5f
|
代码优化
|
5 years ago |
ELF
|
9e1c25a2a3
|
修改bug
|
5 years ago |
ELF
|
b4afa5d8b2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
065245d657
|
优化查询
|
5 years ago |
chenxiaojun
|
15373077b7
|
推广平台->数据管理->每日概况|数据汇总--登录统计优化
|
5 years ago |
chenxiaojun
|
1c79152b5c
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
chenxiaojun
|
1cfa474b83
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
ELF
|
a1c1cb44ae
|
修改bug
|
5 years ago |
ELF
|
01dfe50442
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
3092dcb237
|
修改
|
5 years ago |
chenxiaojun
|
232760c351
|
推广平台->数据管理->每日概况|数据汇总--sql优化
|
5 years ago |
elf@home
|
1036589f3b
|
修改代码
|
5 years ago |
ELF
|
3af8fe116d
|
修改bu
|
5 years ago |
sunke
|
8951a502c2
|
修改bug
|
5 years ago |
sunke
|
94bede9a41
|
平台币修改
|
5 years ago |
sunke
|
c3caed08b3
|
bug
|
5 years ago |
ELF
|
3b681670df
|
上传
|
5 years ago |
ELF
|
6cdee448c0
|
修改bug
|
5 years ago |
ELF
|
1bffd62357
|
修改bug
|
5 years ago |
ELF
|
2c608a73c9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
1a0175e583
|
修改结构
|
5 years ago |
zhengchanglong
|
16d54e6add
|
Merge branch 'feature/promote' into dev
|
5 years ago |
ELF
|
9e83202467
|
修改bug
|
5 years ago |
chenxiaojun
|
e2fa14c1c8
|
推广平台->数据管理->数据汇总->合计--更新
|
5 years ago |
ELF
|
175e38f712
|
修改bug
|
5 years ago |
ELF
|
16d458155a
|
修改打包日志
|
5 years ago |
ELF
|
ed82ea4103
|
添加打包日志记录
|
5 years ago |
ELF
|
f2765313fd
|
优化打包
|
5 years ago |
ELF
|
6c636a92f5
|
修改
|
5 years ago |
ELF
|
e56256ba1d
|
修改bug
|
5 years ago |
ELF
|
c4d35c26d4
|
修改bug
|
5 years ago |
ELF
|
85e466c3fd
|
修改bug
|
5 years ago |
ELF
|
e27c5a5266
|
修改bug
|
5 years ago |
ELF
|
b2df7e0fe3
|
修改bug
|
5 years ago |
ELF
|
fbce375679
|
修改bug
|
5 years ago |
ELF
|
3d46a55811
|
修改bug
|
5 years ago |
ELF
|
c88892ec59
|
修改
|
5 years ago |
ELF
|
784de48bf9
|
修改bug
|
5 years ago |
ELF
|
c2c8f11d01
|
修改
|
5 years ago |
ELF
|
47e2706e26
|
修改bug
|
5 years ago |
ELF
|
070cc2e7c2
|
修改bug
|
5 years ago |
ELF
|
679acf6cf1
|
修改分包
|
5 years ago |
ELF
|
09672d13b4
|
修改分包bug
|
5 years ago |
ELF
|
c6627a53c2
|
将plist demo写入php文件
|
5 years ago |
ELF
|
327bf6cd87
|
修改配置
|
5 years ago |
ELF
|
edc6a7be73
|
修改冲突
|
5 years ago |
ELF
|
9abb4ebb2c
|
修改
|
5 years ago |
chenzhi
|
7e37f3a2df
|
优化迁移用户addshifttask
|
5 years ago |
ELF
|
a8bc52df33
|
修改
|
5 years ago |
ELF
|
6f1e4551ac
|
修改bug
|
5 years ago |
ELF
|
e0d542b5f6
|
解决冲突
|
5 years ago |
ELF
|
eb15fc7dfc
|
Merge branch 'feature/pack' into feature/promote
|
5 years ago |
ELF
|
f056143dee
|
修改bug
|
5 years ago |
ELF
|
08774a0954
|
完善添加推广员
|
5 years ago |
ELF
|
89b243930d
|
落地页下载页优化
|
5 years ago |
chenxiaojun
|
7220247ecd
|
推广后台->数据管理->数据汇总|每日概况--更新
|
5 years ago |
ELF
|
c3502c6120
|
打包添加ios13兼容
|
5 years ago |
ELF
|
fc89281a48
|
3级变4级修改
|
5 years ago |
ELF
|
ae44fc79bd
|
修改
|
5 years ago |
elf@home
|
fc1cef9ec1
|
修改落地页/下载页
|
5 years ago |
ELF
|
b4168a23f1
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
ELF
|
edc40b8a1b
|
ss
|
5 years ago |
chenxiaojun
|
b1b10645fc
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
ELF
|
689cc08b69
|
修改
|
5 years ago |
ELF
|
22dcca566b
|
修改
|
5 years ago |
ELF
|
5b62b99765
|
三级变四级
|
5 years ago |
ELF
|
c6a52282d5
|
修改bug
|
5 years ago |
ELF
|
5ff559cf11
|
修改bug
|
5 years ago |
ELF
|
37ef999710
|
修改
|
5 years ago |
ELF
|
4d0359aaba
|
修改bug
|
5 years ago |
ELF
|
2816054361
|
修改bug
|
5 years ago |
ELF
|
53e0395674
|
修改
|
5 years ago |
ELF
|
bcc34cbd0c
|
打包逻辑重构
|
5 years ago |
ELF
|
69a6f9612f
|
打包优化
|
5 years ago |
elf@home
|
4c5473a27f
|
修改bug
|
5 years ago |
ELF
|
84174b18e9
|
修改bug
|
5 years ago |
ELF
|
d9e7a55af4
|
修改bug
|
5 years ago |
ELF
|
c715996821
|
修改bug
|
5 years ago |
ELF
|
24cbe37faa
|
修改bugt
|
5 years ago |
ELF
|
06bfdbca93
|
解决冲突
|
5 years ago |
elf@home
|
cda67249ac
|
修改
|
5 years ago |
ELF
|
d3412cc3ce
|
测试
|
5 years ago |