 ELF
|
1ba77738f3
|
解决冲突
|
5 years ago |
|
ELF
|
b0bc4c0496
|
解决冲突
|
5 years ago |
|
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
sunke
|
5f6611fc30
|
资质认证
|
5 years ago |
chenxiaojun
|
c42e0be4cd
|
更新
|
5 years ago |
|
chenxiaojun
|
7550bafdf7
|
充值玩家--更新
|
5 years ago |
|
sunke
|
4c4f46ed4b
|
添加条件 过滤
|
5 years ago |
|
sunke
|
c5febf0b9a
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
sunke
|
10fb1aec73
|
过滤规则
|
5 years ago |
yulingwei
|
b5d71ae215
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
7ea2a465bf
|
修复问题
|
5 years ago |
|
sunke
|
5b5c7876d2
|
会长权限
|
5 years ago |
|
chenxiaojun
|
0732ff3d6d
|
开服预告正序显示
|
5 years ago |
|
chenxiaojun
|
b3ba4f0edf
|
更新
|
5 years ago |
|
chenxiaojun
|
cf0680eddf
|
开服预告正序显示
|
5 years ago |
|
yulingwei
|
808a901d7f
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
56b0216ff0
|
修改问题
|
5 years ago |
|
chenxiaojun
|
864b200561
|
更新
|
5 years ago |
|
chenxiaojun
|
0c0d59dd43
|
财务管理--更新
|
5 years ago |
|
yulingwei
|
5cb129e95f
|
修复冲突
|
5 years ago |
|
yulingwei
|
e3f0a24e43
|
弹窗推广后台更新
|
5 years ago |
|
sunke
|
dc03c8a07a
|
认证限制排除协议
|
5 years ago |
|
sunke
|
015e7bc506
|
强制资质认证优化
|
5 years ago |
|
sunke
|
df2919f44b
|
账号加密
|
5 years ago |
|
sunke
|
cbb1436e41
|
玩家账号加密
|
5 years ago |
|
ELF
|
74fa3946ec
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
6cdde605cb
|
Merge branch 'hotfix/download_cdn' into dev
|
5 years ago |
|
ELF
|
fb64d574cb
|
修改包下载bug
|
5 years ago |
|
sunke
|
f172c3bfb2
|
新增会长强制认证功能
|
5 years ago |
|
chenxiaojun
|
d792e34348
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
90eed6f5ca
|
结算管理--更新
|
5 years ago |
|
ELF
|
7c5b3bb5e7
|
Merge branch 'feature/account_safe' into dev
|
5 years ago |
|
ELF
|
0a0cedafd5
|
各个系统登录提示安全优化，sessionon_id变更
|
5 years ago |
|
chenxiaojun
|
0baf97f717
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |
|
ELF
|
f1dc5f8920
|
推广员继承company_id
|
5 years ago |
|
ELF
|
c054595a94
|
修改微信分享bug
|
5 years ago |
|
ELF
|
9bf45ae0d3
|
修改
|
5 years ago |
|
chenxiaojun
|
40da308a08
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
cc83e0e585
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
ee6c6e62b2
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
5cf9ad9fd1
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
31e045bdba
|
充值玩家--更新
|
5 years ago |
|
ELF
|
31723fbc0b
|
修改bug
|
5 years ago |
|
ELF
|
a1862fd240
|
修改
|
5 years ago |
|
ELF
|
48b18db141
|
修改落地页
|
5 years ago |
|
ELF
|
6e55b657a4
|
修改落地页
|
5 years ago |
|
ELF
|
182a241f4e
|
修改落地页
|
5 years ago |
|
chenxiaojun
|
92b0bc2c87
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
ec273ab157
|
公会分成管理--更新
|
5 years ago |
zhengchanglong
|
4968ace29d
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Common/function.php
# Application/Home/Controller/DownloadController.class.php
|
5 years ago |
|
ELF
|
b36e1f1bc9
|
解决冲突
|
5 years ago |
|
ELF
|
c90851996c
|
修改bug
|
5 years ago |
|
chenxiaojun
|
5da02389ac
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
81306967d2
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
7e68257724
|
充值玩家
|
5 years ago |
|
zhengchanglong
|
39b6e98f3b
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
# Data/update.sql
|
5 years ago |
|
chenxiaojun
|
9843b5d885
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
28efebf8d0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
7709163e03
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f132189ea4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
25ae12a72c
|
增加extend判断
|
5 years ago |
|
sunke
|
8ccb78e7af
|
线上行为日志bug
|
5 years ago |
|
sunke
|
b2ab2c9df0
|
隐藏信息
|
5 years ago |
|
sunke
|
1cd4e94840
|
平台币充值区服隐藏
|
5 years ago |
|
zhengchanglong
|
e08a2eb3ce
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/access_data_foldline.txt
# Data/update.sql
|
5 years ago |
|
sunke
|
74d1deb9a0
|
cp订单号
|
5 years ago |
|
sunke
|
0f997da819
|
订单号
|
5 years ago |
|
chenxiaojun
|
3d3b96abc1
|
安卓落地页视频样式修复
|
5 years ago |
|
chenxiaojun
|
cf8f6d007f
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
|
5 years ago |
|
ELF
|
56d261288d
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
sunke
|
ec2bbab76f
|
sever
|
5 years ago |
|
chenxiaojun
|
48614da52d
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
bc166771e4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
ELF
|
b861c7fb3e
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
ELF
|
22be3a5d95
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
chenxiaojun
|
a76214ee22
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1989915767
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
bb17441528
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
ad0b88553b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
ff1981ba59
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenxiaojun
|
62c54cda7f
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
0459b99da0
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
chenxiaojun
|
0da7f8e7df
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
60fff33fca
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1b8fb8cad5
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
chenxiaojun
|
3e5588ff3d
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
chenxiaojun
|
894f174390
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenxiaojun
|
a19a7b530e
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
sunke
|
fc2596a7cc
|
充值玩家当天时间包办
|
5 years ago |
|
chenxiaojun
|
3e0e2d29fc
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0f3038ea18
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
7d644de6e3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
4d070462ac
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
3ecf939c5b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0679e5709b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
yulingwei
|
838ef64dfe
|
Merge branch 'hotfix/search' into release-1.0.0
|
5 years ago |
|
chenxiaojun
|
c417fd5a64
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
8fa2a6cef3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
elf@home
|
4d7366fdbc
|
Merge branch 'hotfix/open-shift' into dev
|
5 years ago |
|
elf@home
|
4123774a95
|
开放迁移推广账号
|
5 years ago |
|
yulingwei
|
36131961b4
|
Merge branch 'hotfix/search' into dev
|
5 years ago |
|
yulingwei
|
04dd31e945
|
修复选择问题
|
5 years ago |
liuweiwen
|
7293bf158f
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/View/BehaviorLog/index.html
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
chenxiaojun
|
a29f6bfc14
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
d341789460
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
fee36cb7ff
|
防错
|
5 years ago |
|
chenxiaojun
|
4586105e49
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
8a8a193248
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
d795fb74f7
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
583756e9f7
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
deb3e4d189
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
5038291876
|
关联防错
|
5 years ago |
|
chenxiaojun
|
2771b705b4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
becddfca83
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
47bad41bfa
|
行为日志 时间检索
|
5 years ago |
|
sunke
|
fa5a47ea75
|
数据问题行为日志
|
5 years ago |
|
chenxiaojun
|
df7c165d12
|
推广平台>数据管理>充值玩家--检索bug修复
|
5 years ago |
|
chenxiaojun
|
dc2c4ee652
|
推广平台>数据管理>充值玩家--检索bug修复
|
5 years ago |
|
sunke
|
cb89467f6b
|
时间
|
5 years ago |
|
chenxiaojun
|
03edc87f4f
|
推广平台>数据管理>充值玩家--检索bug修复
|
5 years ago |
|
chenxiaojun
|
9c9396351b
|
推广平台>数据管理>订单查询--检索bug修复
|
5 years ago |
|
liuweiwen
|
cdf8f51007
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
d6b7bc811d
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
ea07864f98
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
sunke
|
b47eced096
|
日志分页
|
5 years ago |
|
liuweiwen
|
587da83973
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
sunke
|
0cb7a40ea9
|
行为日志角色id
|
5 years ago |
|
sunke
|
92523d7429
|
充值状态
|
5 years ago |
|
sunke
|
4c1471f6bb
|
行为日志
|
5 years ago |
|
chenxiaojun
|
01ef816ee1
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
|
chenxiaojun
|
69fd83a2f0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f05034486c
|
推广平台>数据管理>充值玩家
|
5 years ago |
|
sunke
|
660397bf4f
|
双乾支付
|
5 years ago |
|
sunke
|
2c17a4c24f
|
双乾支付
|
5 years ago |
|
sunke
|
cbca0b0d51
|
行为日志检索修复
|
5 years ago |
|
sunke
|
54f288133e
|
下载修改
|
5 years ago |
|
ELF
|
0a7054c4f9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
32a73f0386
|
Merge branch 'hotfix/close-shift-player' into dev
|
5 years ago |
|
ELF
|
ad7c276fdf
|
测试
|
5 years ago |
|
sunke
|
d426395607
|
充值玩家下载增加游戏累计登陆天数
|
5 years ago |
|
chenxiaojun
|
9d09913bd0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
64eb3ce4cb
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
b27906d470
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
49408030f0
|
行为日志
|
5 years ago |
|
liuweiwen
|
f8df1d57dd
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
188abdcbdd
|
落地页视频置顶判断
|
5 years ago |
|
chenxiaojun
|
3b5a915bda
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
|
ELF
|
c61a3e200a
|
解决冲突
|
5 years ago |
|
ELF
|
c451921b92
|
后台添加IOS打包方式选择
|
5 years ago |
|
liuweiwen
|
cdeea23034
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
14644b44a2
|
落地页图片改为使用游戏截图
|
5 years ago |
zhanglingsheng
|
ac0132575f
|
Merge branch 'hotfix/log' into dev
|
5 years ago |
|
liuweiwen
|
aff492b470
|
超级签新增需求-》后台增加超级签级签状态，手机端验证状态是否可下载与显示
|
5 years ago |
|
sunke
|
5ee4ce6552
|
修改下载日志
|
5 years ago |
|
sunke
|
7bcbb6c9d1
|
订单查询充值状态增加
|
5 years ago |
|
liuweiwen
|
fb5d9afded
|
落地页视频上传和显示
|
5 years ago |
|
chenxiaojun
|
45f061d81c
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
chenzhi
|
3abfc47677
|
优化推广后台显示的开服公告
|
5 years ago |
|
chenxiaojun
|
a128fff331
|
推广平台->首页--更新
|
5 years ago |
|
chenxiaojun
|
e8a4da70cc
|
推广平台->首页--更新
|
5 years ago |
|
chenxiaojun
|
097240f5ec
|
推广平台->首页--更新
|
5 years ago |
|
chenxiaojun
|
e9bfaef26b
|
推广平台->首页--更新
|
5 years ago |
|
ELF
|
ebbe43d918
|
Merge branch 'master' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
ELF
|
69708490ba
|
Merge branch 'hotfix/download'
|
5 years ago |
|
sunke
|
34b53c4ec1
|
数据汇总合计
|
5 years ago |
|
sunke
|
b82803c1e5
|
合计
|
5 years ago |
|
chenxiaojun
|
d53ca22dd0
|
推广平台->首页--更新
|
5 years ago |
|
chenxiaojun
|
747c97ceec
|
推广平台->首页--更新
|
5 years ago |
|
chenxiaojun
|
58d13124d9
|
推广平台->首页--更新
|
5 years ago |
|
chenxiaojun
|
ef9fe76454
|
推广平台->首页更新
|
5 years ago |
|
sunke
|
9f60171191
|
每日概况合计
|
5 years ago |
|
liuweiwen
|
bfb14a84f0
|
落地页
|
5 years ago |
|
sunke
|
ff224f4b7d
|
玩家注册 充值玩家下载优化
|
5 years ago |
|
liuweiwen
|
a8273472ae
|
落地页
|
5 years ago |
|
sunke
|
4ee415ac77
|
删除变量
|
5 years ago |
|
chenxiaojun
|
ff713b9ea3
|
推广平台->数据管理->充值玩家->导出--更新
|
5 years ago |
|
sunke
|
20d8fb5599
|
冲突
|
5 years ago |
|
liaojinling
|
7513d427f0
|
修改冲突
|
5 years ago |
|
liuweiwen
|
1752e16f8d
|
落地页安卓使用旧版本
|
5 years ago |
|
chenxiaojun
|
3c72aebe83
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
c8d515a0ee
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
sunke
|
33184df45c
|
Merge branch 'hotfix/download'
|
5 years ago |
|
sunke
|
8d4d689491
|
充值
|
5 years ago |
|
sunke
|
d062affc16
|
bug
|
5 years ago |
|
chenxiaojun
|
7de0b54773
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
781d6d408a
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1a4bdc424a
|
推广平台->数据管理->订单查询--更新
|
5 years ago |
|
sunke
|
a49f313113
|
时间提示
|
5 years ago |
|
ELF
|
8d3d0ad726
|
Merge branch 'master' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
ELF
|
4afe365e40
|
Merge branch 'hotfix/add_bans_type'
|
5 years ago |
|
sunke
|
5597410ac2
|
bug
|
5 years ago |
|
sunke
|
255f68836e
|
时间
|
5 years ago |
|
sunke
|
a782121581
|
排版
|
5 years ago |
|
sunke
|
e5891a9d45
|
结算明细
|
5 years ago |
|
sunke
|
876268c3b7
|
结算
|
5 years ago |
|
ELF
|
9cf1ab13db
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
a02b9f1f1a
|
Merge branch 'hotfix/oldpack' into dev
|
5 years ago |
|
chenxiaojun
|
7b0c453c71
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
13be456146
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |