Commit Graph

753 Commits

Author SHA1 Message Date
Jack Goh 1b6284bad9 Merge branch 'fix/forgot-password' into 'master'
fix forgot-password

See merge request CIEFWorldwideSdnBhd/exchange!108
2018-08-09 07:32:38 +00:00
Jack Goh c2b1c9aa38 fix storage link error 2018-08-09 15:20:26 +08:00
Jack Goh c4ff2684de remove debug on chinabankslip test 2018-08-09 15:05:23 +08:00
Jack Goh 9b78b8c669 temporary fix bank_branch not null 2018-08-09 15:04:03 +08:00
Jack Goh c09fdabe5a fix bank_branch not found 2018-08-09 14:49:34 +08:00
Jack Goh 114aab975b fix forgot-password 2018-08-09 14:37:47 +08:00
Jack Goh caf58ac4cf Merge branch 'fix/green-report' into 'master'
Fix/green report

See merge request CIEFWorldwideSdnBhd/exchange!107
2018-08-09 04:13:04 +00:00
Jack Goh a9b30e2bb9 added supplier booking report to complete page at admin side 2018-08-09 12:08:03 +08:00
Jack Goh 5eb1771ae1 added supplier booking report to upload china bankslip at admin side 2018-08-09 11:30:31 +08:00
Jack Goh 45391317ef added supplier booking report to upload invoice at admin side 2018-08-09 11:24:15 +08:00
Jack Goh e67dabfb5b fix user track status bug 2018-08-09 10:55:05 +08:00
Jack Goh 5d3ab327ca fix progress track bug for admin side 2018-08-09 10:50:59 +08:00
Jack Goh 2f3b9baf9b added x2 progress track 2018-08-09 10:44:21 +08:00
Jack Goh b2022c652b Merge branch 'fix/x2-status' into 'master'
Fix/x2 status

See merge request CIEFWorldwideSdnBhd/exchange!106
2018-08-09 02:01:21 +00:00
Jack Goh 594c6a74fe fix admin x2 status track 2018-08-08 17:11:08 +08:00
Jack Goh 06bacfcaf9 fixed x2 status for user side 2018-08-08 16:31:35 +08:00
Jack Goh 526486f95a fix supplier booking nullable
fix booking seeder wrong status
2018-08-08 10:55:41 +08:00
Jack Goh ae081ddddf fix booking internal server error due to db not accepting null value
fixed copy right on booking form
update notification seeder
2018-08-08 10:41:29 +08:00
Jack Goh 8999fac2e6 Merge branch 'fix/billing-charge' into 'master'
fix billing charge for x2 to 0

See merge request CIEFWorldwideSdnBhd/exchange!104
2018-08-08 02:24:29 +00:00
Jack Goh f5809e8c8b fix billing charge for x2 to 0 2018-08-08 10:19:21 +08:00
Jack Goh c89df52393 Merge branch 'too/gitlabci' into 'master'
Too/gitlabci

See merge request CIEFWorldwideSdnBhd/exchange!103
2018-08-07 11:34:39 +00:00
Jack Goh e2ae54a8eb remove build frontend because too slow
fix public file 404
2018-08-07 19:28:50 +08:00
Jack Goh 12213d9505 update cd scripts for commit merge 2018-08-07 18:26:41 +08:00
Jack Goh 4f27fb8258 fix bootstrap permission denied error 2018-08-07 18:25:22 +08:00
Jack Goh 12e48b133d Merge branch 'fix/notification' into 'master'
Fix/notification

See merge request CIEFWorldwideSdnBhd/exchange!101
2018-08-07 07:12:45 +00:00
Jack Goh ef9acab07f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/notification
# Conflicts:
#	composer.lock
2018-08-07 14:48:03 +08:00
Jack Goh e50d6a72a7 Merge branch 'too/gitlabci' into 'master'
Too/gitlabci

See merge request CIEFWorldwideSdnBhd/exchange!102
2018-08-07 04:49:33 +00:00
Jack Goh b0557c220c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci
# Conflicts:
#	public/mix-manifest.json
2018-08-07 12:44:13 +08:00
Jack Goh 1061adc094 remove composer.lock
fixed navbar error
2018-08-07 12:43:21 +08:00
Mohd Arief 4b24363994 solved discussion 2018-08-07 12:22:14 +08:00
Mohd Arief 8b362044d3 fixed the notification bug 2018-08-07 12:16:31 +08:00
Jack Goh 70f51bda58 updated changes log
added build npm in docker
2018-08-06 17:16:28 +08:00
Jack Goh e0a7a5e5d4 updated key permission 2018-08-02 15:46:28 +08:00
Jack Goh c28903a165 ignore composer.lock 2018-08-02 15:35:40 +08:00
Jack Goh 4cab3aeb76 update deploy script 2018-08-02 15:23:39 +08:00
Jack Goh 2eae133a24 fix host not found when deploying 2018-08-02 15:15:57 +08:00
Jack Goh 7bcbdaa3aa update deploy scripts 2018-08-02 15:01:19 +08:00
Jack Goh 49308fc5f3 update staging deploy config 2018-08-02 14:43:07 +08:00
Jack Goh 3339ebe1ce make field in china bank slips nullable 2018-08-02 14:26:19 +08:00
Jack Goh d2f5cade81 fix apt-get install error 2018-08-02 14:07:04 +08:00
Jack Goh 5be1858537 add gd to docker installation 2018-08-02 14:04:03 +08:00
Jack Goh 15b73e8ea2 update phpunit setting 2018-08-02 12:29:21 +08:00
Jack Goh 0a672eda6e change test db connection to mysql 2018-08-02 12:22:02 +08:00
Jack Goh 305fc2cedc update migration 2018-08-02 12:09:17 +08:00
Jack Goh 504474ab29 update migration 2018-08-02 11:58:33 +08:00
Jack Goh fd1020fb8c update migration 2018-08-02 11:43:34 +08:00
Jack Goh 0a510804bf update migration 2018-08-02 11:37:02 +08:00
Jack Goh 67b8fd46f7 update migration 2018-08-02 11:29:23 +08:00
Jack Goh 3302d5cb65 update migration 2018-08-02 11:17:13 +08:00
Jack Goh bc34983d6d update migration 2018-08-02 11:09:59 +08:00