Commit Graph

131 Commits

Author SHA1 Message Date
Jay
57d2b171c2 Merge branch 'master' into release 2018-08-26 18:11:54 +08:00
Jay
909d67ce19 set cron version fixed 2018-08-26 18:11:27 +08:00
Jay
f14be8ea8c Merge branch 'master' into release 2018-08-25 21:13:55 +08:00
Jay
2231c2f8e9 change pool num 2018-08-25 21:13:36 +08:00
Jay
5b730c2347 Merge branch 'master' into release 2018-08-25 21:04:36 +08:00
Jay
c202e83c6a add console 2018-08-25 21:04:08 +08:00
Jay
e5a1677c0a Merge branch 'master' into release 2018-08-25 21:00:05 +08:00
Jay
ece2700714 fix bg 2018-08-25 20:59:44 +08:00
Jay
cfc68243e0 Merge branch 'master' into release 2018-08-25 20:55:45 +08:00
Jay
3e3539d503 change background to fork 2018-08-25 20:54:35 +08:00
Jay
4b9e881599 Merge branch 'master' into release 2018-08-23 23:40:13 +08:00
Jay
f391a6043a fuck .... 2018-08-23 23:39:53 +08:00
Jay
a43dc3d2c8 Merge branch 'master' into release 2018-08-23 23:36:58 +08:00
Jay
af4426315f fix!!! 2018-08-23 23:36:49 +08:00
Jay
d20d5ddbf7 Merge branch 'master' into release 2018-08-23 23:33:48 +08:00
Jay
a652733c3d fix 2018-08-23 23:33:35 +08:00
Jay
f3f08198ff Merge branch 'master' into release 2018-08-23 23:26:16 +08:00
Jay
d8c5c5de5f fix 2018-08-23 23:26:07 +08:00
Jay
e7a476a8dd Merge branch 'master' into release 2018-08-23 23:22:06 +08:00
Jay
9ce747ea8f modify get donate bar api 2018-08-23 23:21:49 +08:00
Jay
740eedbb1d Merge branch 'master' into release 2018-08-23 23:11:02 +08:00
Jay
ade17c8792 add opay data api 2018-08-23 23:10:45 +08:00
Jay
a54cb680fa Merge branch 'master' into release 2018-08-23 20:40:36 +08:00
Jay
12317413b8 fix !!!!!!!!!! 2018-08-23 20:40:19 +08:00
Jay
b7597ae414 Merge branch 'master' into release 2018-08-23 20:31:26 +08:00
Jay
854e9f5063 fuck 2018-08-23 20:31:11 +08:00
Jay
b37b1940ad Merge branch 'master' into release 2018-08-23 20:25:52 +08:00
Jay
aa0309cbe6 fix fix fix !!!!!! 2018-08-23 20:25:34 +08:00
Jay
7e4118817f Merge branch 'master' into release 2018-08-23 20:20:55 +08:00
Jay
dc14d9cbf5 fix pass match 2018-08-23 20:20:35 +08:00
Jay
e123affea2 Merge branch 'master' into release 2018-08-23 20:16:03 +08:00
Jay
3b3efe5791 fix login error 2018-08-23 20:15:42 +08:00
Jay
1fa6b61878 Merge branch 'master' into release 2018-08-23 00:23:33 +08:00
Jay
a02212bbb7 remove console.log 2018-08-23 00:23:16 +08:00
Jay
9300c105fa Merge branch 'master' into release 2018-08-23 00:10:32 +08:00
Jay
754c9f823f fix query 2018-08-23 00:10:17 +08:00
Jay
5a0a39a058 Merge branch 'master' into release 2018-08-22 22:12:03 +08:00
Jay
d2cfcac05f change get opay setting api response struct 2018-08-22 22:11:43 +08:00
Jay
6db4e26173 Merge branch 'master' into release 2018-08-22 20:14:45 +08:00
Jay
0eeb9b49a2 add list order by 2018-08-22 20:14:23 +08:00
Jay
7c11c0ede7 Merge branch 'master' into release 2018-08-21 23:33:00 +08:00
Jay
063b7e277f fix api body parser 2018-08-21 23:32:43 +08:00
Jay
e2cab3adae Merge branch 'release' of https://git.trj.tw/mtfos/mtfosbot into release 2018-08-21 22:49:50 +08:00
Jay
a43ede311e Merge branch 'master' into release 2018-08-21 22:49:44 +08:00
Jay
8224c444c1 Merge branch 'master' of https://git.trj.tw/mtfos/mtfosbot 2018-08-21 22:49:33 +08:00
Jay
eea74a7239 add logout api 2018-08-21 22:49:24 +08:00
Jay
f52d8a2696 Merge branch 'master' into release 2018-08-21 15:13:00 +08:00
Jay
3258f71340 modify 2018-08-21 15:12:47 +08:00
Jay
cbc21a743b Merge branch 'master' into release 2018-08-21 15:10:04 +08:00
Jay
76970da355 fix regex bug 2018-08-21 15:09:44 +08:00