Commit Graph

105 Commits

Author SHA1 Message Date
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
Jay
add1c305ea Merge branch 'master' into release 2018-08-20 23:08:08 +08:00
Jay
54e0daf198 remove param 2018-08-20 23:07:43 +08:00
Jay
86f0fad1a5 Merge branch 'master' into release 2018-08-20 22:58:50 +08:00
Jay
217608d6e4 fix sql query 2018-08-20 22:58:34 +08:00
Jay
8f90c257d6 Merge branch 'master' into release 2018-08-20 21:16:49 +08:00
Jay
930163aa15 fix toInt func 2018-08-20 21:16:16 +08:00
Jay
e5eeba3538 Merge branch 'master' into release 2018-08-19 21:24:39 +08:00
Jay
81e1305bff fix loginUser data 2018-08-19 21:24:19 +08:00
Jay
19bd19f0f3 Merge branch 'master' into release 2018-08-19 20:50:02 +08:00
Jay
473d0a63f8 fix 2018-08-19 20:49:34 +08:00
Jay
8419757e56 Merge branch 'master' into release 2018-08-19 20:29:14 +08:00
Jay
b2c45d19d8 add get session reponse data 2018-08-19 20:28:52 +08:00
Jay
3cb06fde80 Merge branch 'master' into release 2018-08-17 23:50:05 +08:00
Jay
1f326715fd fix cors 2018-08-17 23:49:50 +08:00
Jay
1607f22ac6 Merge branch 'master' into release 2018-08-17 23:32:21 +08:00
Jay
06f237314c add check session api 2018-08-17 23:32:07 +08:00
Jay
c906efb17c Merge branch 'master' into release 2018-08-17 23:16:06 +08:00
Jay
3a08cbb1fb fix response obj is null 2018-08-17 23:15:51 +08:00
Jay
8017893174 Merge branch 'master' into release 2018-08-17 23:13:11 +08:00
Jay
8cbffe42bd update 2018-08-17 23:12:57 +08:00
Jay
dc4cde886f Merge branch 'master' into release 2018-08-17 23:08:35 +08:00
Jay
989ae620b3 fix api response 2018-08-17 23:08:21 +08:00
Jay
f78ff4ac15 Merge branch 'master' into release 2018-08-17 23:03:24 +08:00
Jay
4f6d7a771f fix 2018-08-17 23:03:10 +08:00
Jay
d5147987f7 Merge branch 'master' into release 2018-08-17 22:52:56 +08:00
Jay
3a07dfbacf add cors setting 2018-08-17 22:52:41 +08:00