Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• a985da5c44 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx zyx 2019-10-21 11:44:26 +0800
• 66ced8930e 首页bug解决 zyx 2019-10-21 11:43:31 +0800
• 5889b69b71 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-21 11:36:22 +0800
• 0b70159a66 123 chenzhi 2019-10-21 11:35:41 +0800
• ba4219dc64 更新忘记密码 chenzhi 2019-10-21 11:35:00 +0800
• 8a7bcb13d3 Merge branch 'dev_zcl' into dev zhengchanglong 2019-10-21 10:39:17 +0800
• ee6e3a8624 修改测试金额 zhengchanglong 2019-10-21 10:38:46 +0800
• 2b8cbf0021 Merge branch 'dev_zcl' into dev zhengchanglong 2019-10-21 09:49:48 +0800
• 05cb87a9ae Merge branch 'dev-cz' into dev zhengchanglong 2019-10-21 09:34:14 +0800
• 5f4dca0a77 1018修改 chenzhi 2019-10-21 09:04:13 +0800
• 5ec203aa10 Merge branch 'dev' elf@home 2019-10-18 23:03:34 +0800
• e94675c93c 修改 elf@home 2019-10-18 23:03:19 +0800
• 25f58c7ef6 Merge branch 'dev' elf@home 2019-10-18 21:45:02 +0800
• 848e07238d 修改 elf@home 2019-10-18 21:44:31 +0800
• c79dc4d243 Merge branch 'release-1.0.1' ELF 2019-10-18 19:16:44 +0800
• 90c5ccc734 Merge branch 'dev' into release-1.0.1 ELF 2019-10-18 19:16:32 +0800
• 9b42942900 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev ELF 2019-10-18 19:16:11 +0800
• ae911f62a0 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-18 19:15:52 +0800
• 5805880e0c 更新推广 chenzhi 2019-10-18 19:14:37 +0800
• 24b1441632 修改超级签链接 ELF 2019-10-18 19:08:57 +0800
• 3202874aca Merge branch 'release-1.0.1' ELF 2019-10-18 19:00:48 +0800
• 09d64cf9eb Merge branch 'dev' into release-1.0.1 ELF 2019-10-18 19:00:26 +0800
• c367a965f2 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-18 18:57:19 +0800
• 61f4bec085 login chenzhi 2019-10-18 18:56:27 +0800
• f00ff01f95 php版本问题bug zyx 2019-10-18 18:19:12 +0800
• 6bf4f26c15 Merge branch 'release-1.0.1' ELF 2019-10-18 17:59:23 +0800
• a1a5510bfb Merge branch 'dev' into release-1.0.1 ELF 2019-10-18 17:59:04 +0800
• 433219c3f6 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-18 17:54:55 +0800
• 2e8f7ba410 更新 chenzhi 2019-10-18 17:51:27 +0800
• 46e5b1198c 修改金额 zhengchanglong 2019-10-18 17:50:50 +0800
• 5ef6cda158 首页开服信息区分平台bug修正 zyx 2019-10-18 17:40:40 +0800
• 6a3b3cd114 超级签网页端充值地址修改 zhengchanglong 2019-10-18 17:26:05 +0800
• be9586bc5b 支付流程修改 zhengchanglong 2019-10-18 17:22:07 +0800
• f0dc10cd60 支付流程修改 zhengchanglong 2019-10-18 17:11:21 +0800
• 84327c1315 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev zyx 2019-10-18 17:09:52 +0800
• ae1986b4a8 已读日志为零时不显示 zyx 2019-10-18 17:09:28 +0800
• 4539c163a4 首页alert恢复 chenzhi 2019-10-18 17:04:51 +0800
• 464e9f244b 正常充值不需要验证spend表 是否重复充值 tpingzhang 2019-10-18 17:04:44 +0800
• e30580791e 超级前购买测试金额改为0.01 zhengchanglong 2019-10-18 16:35:17 +0800
• dd3e56d27c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev zyx 2019-10-18 16:28:50 +0800
• 72036e51e3 首页时间问题修正，快捷菜单10个限制添加 zyx 2019-10-18 16:28:31 +0800
• 4367052f77 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-18 16:16:54 +0800
• 86040c88c6 超级签购买错误信息页面 zhengchanglong 2019-10-18 16:15:58 +0800
• d24fa30651 优化 chenzhi 2019-10-18 16:13:50 +0800
• 9ac3bf3397 测试 tpingzhang 2019-10-18 15:54:09 +0800
• b5b43b0875 支付状态 tpingzhang 2019-10-18 15:45:15 +0800
• 7863eb1be3 Merge branch 'dev-cz' into dev_zcl zhengchanglong 2019-10-18 15:31:53 +0800
• 5f5be5d57e 超级签充值流程修改 zhengchanglong 2019-10-18 15:30:55 +0800
• 5a25e5dec1 验证码简化 chenzhi 2019-10-18 15:25:29 +0800
• 992ef831b5 验证码简化 chenzhi 2019-10-18 15:24:54 +0800
• 5be8421011 旧版 tpingzhang 2019-10-18 15:05:42 +0800
• e9f8449468 eregi php5.3 废弃 preg_match apple 支付页面 tpingzhang 2019-10-18 14:54:48 +0800
• 2ba3b915b9 超级前充值金额修改 zhengchanglong 2019-10-18 14:50:17 +0800
• 11515e87e2 Merge branch 'release-1.0.1' ELF 2019-10-18 14:38:40 +0800
• e2fc2e5128 修改超级签充值流程 zhengchanglong 2019-10-18 14:30:12 +0800
• ca79a3f627 css ok chenzhi 2019-10-18 14:24:03 +0800
• 95fc99816f 价格 chenzhi 2019-10-18 14:13:47 +0800
• b112a5548f 123 chenzhi 2019-10-18 14:11:22 +0800
• 2638929031 通过帐号隐藏目录 ELF 2019-10-18 14:07:34 +0800
• cc78f094ad 去除blank chenzhi 2019-10-18 14:06:51 +0800
• e4b72a1847 新增blank页 chenzhi 2019-10-18 13:57:46 +0800
• 629c803e87 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl chenzhi 2019-10-18 13:47:26 +0800
• b5484a07c6 blank chenzhi 2019-10-18 13:46:58 +0800
• 5236c7a6f1 优化css1 chenzhi 2019-10-18 11:05:35 +0800
• 5d5879021f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx zyx 2019-10-18 08:44:17 +0800
• f7aaa9030e 修改bug elf@home 2019-10-18 07:56:20 +0800
• 4c5473a27f 修改bug elf@home 2019-10-18 07:34:17 +0800
• f338c3d210 超级签充值金额修改 zhengchanglong 2019-10-17 21:46:17 +0800
• c261e88932 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-17 21:28:00 +0800
• f4a26b2cc2 账号验证 chenzhi 2019-10-17 21:25:37 +0800
• caf5f0aff1 Merge branch 'dev-cz' into dev_zcl zhengchanglong 2019-10-17 21:16:12 +0800
• 3757281985 弹窗 chenzhi 2019-10-17 21:15:06 +0800
• 0d50d94a42 123456 chenzhi 2019-10-17 21:14:02 +0800
• e826b22d56 1234 chenzhi 2019-10-17 21:13:00 +0800
• f87853a9f7 123 chenzhi 2019-10-17 21:11:31 +0800
• 8f5f4ba9bc 礼包领取 chenzhi 2019-10-17 21:05:07 +0800
• f80ebc8583 修改超级签名BUG zhengchanglong 2019-10-17 21:00:21 +0800
• 5635519c17 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz chenzhi 2019-10-17 20:18:46 +0800
• 0a62987665 修改超级签名BUG zhengchanglong 2019-10-17 20:12:20 +0800
• e3315ca26e Merge remote-tracking branch 'origin/dev' into dev zhengchanglong 2019-10-17 20:09:58 +0800
• 0dbbfb763d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev zyx 2019-10-17 20:08:57 +0800
• 90665c3dc5 新增礼包bug修正 zyx 2019-10-17 20:08:12 +0800
• a544978349 新增密码复杂度验证 chenzhi 2019-10-17 19:55:43 +0800
• 7a1b537d98 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-17 19:38:23 +0800
• 4441f2844c bug3 chenzhi 2019-10-17 19:36:09 +0800
• 2693172cda 修复3 chenzhi 2019-10-17 19:32:29 +0800
• b69ca03856 bug修复2 chenzhi 2019-10-17 19:26:29 +0800
• 145144ba51 解决冲突 ELF 2019-10-17 18:47:00 +0800
• 4a403076b9 解决冲突 ELF 2019-10-17 18:46:11 +0800
• 9bc356cf43 Merge branch 'master' of 47.111.118.107:/srv/git/platform ELF 2019-10-17 18:43:15 +0800
• 106e5818e7 Merge branch 'hotfix/mobile' ELF 2019-10-17 18:42:58 +0800
• 983b707d69 修改手机端显示 ELF 2019-10-17 18:42:34 +0800
• 02043044b5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev zyx 2019-10-17 18:16:30 +0800
• a12002a567 扶持账号的登录bug修正 zyx 2019-10-17 18:16:00 +0800
• a550435883 Merge remote-tracking branch 'origin/dev' into dev zhengchanglong 2019-10-17 18:15:21 +0800
• 9cebace169 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-17 18:15:03 +0800
• 99f4d30af0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev tpingzhang 2019-10-17 18:14:58 +0800
• 41075f8abc Merge branch 'serveridnull' into dev tpingzhang 2019-10-17 18:14:13 +0800
• b8945e8655 修复bug chenzhi 2019-10-17 18:11:02 +0800
• 604fe050d0 Merge branch 'dev-cz' into dev zhengchanglong 2019-10-17 18:07:04 +0800