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

178 Commits (be1fe5418b3611dbc0933600d3174d1af1611acc)

Author SHA1 Message Date
chenzhi 115bafc067 新增补链日期及取消补链功能 5 years ago
ELF 831456b333 解决冲突 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz db1ea1370a upt 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
Your Name f642fb2c90 游戏充值订单添加CP订单号字段 5 years ago
jbrazz 74be3407b1 upt 5 years ago
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 5f673b346d 月结统计添加部长渠道 5 years ago
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote 5 years ago
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz 68df391d9c upt 5 years ago
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev 5 years ago
zyx 266202c06b 游戏详情查看导出，按日期分成多个sheet 5 years ago
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name 51701a485d SDK菜单添加平台选型 5 years ago
zyx 602e53e82f 合并分支dev_zyx财务部分的代码 5 years ago
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev 5 years ago
zyx 8fd435a324 月结统计，游戏查看名称修改 5 years ago
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev 5 years ago
zyx 4dfec50ba5 月结统计修改 5 years ago
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev 5 years ago
zyx f44a11a915 月结统计提示语修改 5 years ago
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev 5 years ago
zyx 9539b38e86 月结统计提示语修改 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev 5 years ago
zyx cfa33d3e42 月结统计提示语修改 5 years ago
jbrazz a8125bf377 upt 5 years ago
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev 5 years ago
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi f9397efebf 修改总流水统计方式 5 years ago
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev 
# Conflicts:
#	Data/update.sql
 5 years ago
zyx 5a7432ef40 月结统计新增平台比收入字段，将平台币流水改为平台币支出 5 years ago
zyx b6080180ab 测试资源bug修正 5 years ago
jbrazz 48de85a3c3 upt 5 years ago
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev 5 years ago
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏 5 years ago
zyx 414f471ac1 提示栏文字调整 5 years ago
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev 5 years ago
zyx 7167366949 提示栏文字调整 5 years ago
zyx 064a3d0098 搜索框样式调整 5 years ago
zyx 6f77f576d1 标签位置调整 5 years ago
zyx bbc75a419d bug修正，样式更新 5 years ago
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev 5 years ago
zyx 62311eb40d 月结统计bug修正 5 years ago
zyx 515ffa25b9 月结统计bug修正 5 years ago
Your Name dce059abe5 SDK菜单修改 5 years ago
Your Name 7466b90d13 SDK菜单修改 5 years ago
Your Name ed3ce2b4b5 SDK菜单修改 5 years ago
Your Name c3762b420c SDK菜单修改 5 years ago
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name c90c397dd9 SDK菜单修改 5 years ago
zyx 2adc07ec4a 组长月结统计页面文字修正 5 years ago
zyx 4803bd4a1b 组长月结统计页面修正 5 years ago
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev 5 years ago
zyx 63dff98660 月结统计导出bug修正 5 years ago
zyx 1d59721ee2 月结统计导出bug修正 5 years ago
zyx b42f621dbc 财务管理功能提交 5 years ago
zyx ee5dccfaeb 财务管理功能代码完善 5 years ago
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev 5 years ago
jbrazz d4c7727426 upt 5 years ago
zyx 54a01da982 财务管理功能完善 5 years ago
zyx fe8a60093f 新增渠道模板提交 5 years ago
zyx d3de669837 '代码合并' 5 years ago
jbrazz 8859c847f6 upt 5 years ago
jbrazz 459b722c1c upt 5 years ago
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
zyx 24cdd7086b '合并代码' 5 years ago
sunke 021673f657 图片上传补充 5 years ago
sunke 692a1bcc11 webuploader插件 5 years ago
zyx c65aa8d69a 财务管理bug修正，导出功能，合作方列表添加 5 years ago
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 112316c395 财务管理功能添加 5 years ago
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除 5 years ago
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新 5 years ago
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口 5 years ago
chenxiaojun a04f291471 管理后台->删除溪谷入口 5 years ago
ELF e4f1ed99f8 修改后台登录页 5 years ago
ELF 437909d53a 测试 5 years ago
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框，扶持号管理搜索异常修正，去除将text_resource的排序规则改回一般排序 5 years ago
zyx 7ead67f8cb 快捷图标代码修正 5 years ago
zyx c6da6fb705 首页用户注册充值信息修正 5 years ago
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev 5 years ago
jbrazz 736c0fd432 fix 5 years ago
zhengchanglong 5dbfb59f3f Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong a5899444a7 Merge branch 'dev_zyx' into dev 
# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
 5 years ago
chenzhi 2f124bffbb coin_num 5 years ago
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl 5 years ago
chenzhi e3d9d382d9 新增线下充值审核 5 years ago
zyx 0a9dbe6a78 管理后台菜单bug修复 5 years ago
zyx c8f101f40c 管理后台添加测试资源 5 years ago
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标 5 years ago
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago