Commit Graph

484 Commits

Author SHA1 Message Date
Jack Goh 8b8f0f7bf0 removed nginx
added caddy
2018-07-18 15:24:01 +08:00
Jack Goh 9339997d7e recommit files 2018-07-18 14:59:45 +08:00
Jack Goh 454726d83d added docker compose production config
added apache vhost config
added deployment dockerfile
2018-07-18 14:58:33 +08:00
Jack Goh 888519f546 removed db:seed at docker
update timezone
fixed production and staging frontend not showing issue
2018-07-18 11:57:36 +08:00
Jack Goh af792e79eb updated readme 2018-07-18 10:08:39 +08:00
Jack Goh 10514ca2bf fix docker up error 2018-07-17 17:49:25 +08:00
Jack Goh 5f050e9c74 fix build error 2018-07-17 17:42:36 +08:00
Jack Goh 2560ac185c fix composer up error 2018-07-17 17:40:11 +08:00
Jack Goh 3aca31cdeb Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into deployment/staging 2018-07-17 17:31:09 +08:00
Jack Goh ba78c313b2 fix application not found in bootstrap app.php 2018-07-17 17:29:22 +08:00
Jack Goh fb8951265d Merge branch 'frontend/making-uploaded-images-responsive' into 'master'
Showing Completed Orders Task Done

See merge request CIEFWorldwideSdnBhd/exchange!68
2018-07-17 08:53:22 +00:00
Mouhamed Lamine 3410008dd4 final commit 2018-07-17 16:52:30 +08:00
Jack Goh e92e9b551f updated readme 2018-07-17 11:28:14 +08:00
Jack Goh 31ee05cbe9 added .env-example 2018-07-17 11:21:58 +08:00
Jack Goh e81b9d1f20 Merge branch 'too/frontend-notification' into 'master'
temporary remove the notification from navbar

See merge request CIEFWorldwideSdnBhd/exchange!73
2018-07-16 14:06:12 +00:00
Jack Goh 040cc5afc0 temporary remove the notification from navbar 2018-07-16 22:03:35 +08:00
Jack Goh 934de5d7a2 Merge branch 'too/frontend-notification' into 'master'
Too/frontend notification

See merge request CIEFWorldwideSdnBhd/exchange!72
2018-07-16 14:03:10 +00:00
Jack Goh 629b00d8a5 change login expire to 10 minutes
revert back to local build
2018-07-16 21:55:29 +08:00
Mouhamed Lamine fb102df36c Fixed Merge Conflicts 2018-07-16 19:32:56 +08:00
Mouhamed Lamine e868c99440 Added the track status thing 2018-07-16 19:26:09 +08:00
Mouhamed Lamine d29d3c49eb Adding Completed Orders Link on Admin Nav Bar 2018-07-16 19:15:01 +08:00
weiweitoo 1474f87488 change axios to normal axios 2018-07-16 17:36:55 +08:00
weiweitoo 278d62b5a9 modify messaage to become json 2018-07-16 16:13:15 +08:00
Jack Goh e4fa43ae0b updated procfile 2018-07-16 15:35:05 +08:00
Jack Goh 4a83cebad8 added back composer lock because it required by deployment 2018-07-16 14:47:28 +08:00
Jack Goh f25de1ec6b updated composer app description name and keywords 2018-07-16 14:39:45 +08:00
Jack Goh 3c1c123bd4 added heroku post build
added build with manifest in local since it's not building manifest
2018-07-16 14:37:01 +08:00
Jack Goh 3f0efd4634 heroku deployment 2018-07-16 14:22:37 +08:00
weiweitoo 81278c4273 add notification icon in navbar component 2018-07-16 14:19:00 +08:00
Jack Goh dcca2d62f6 Merge branch 'too/bookingflowforx2' into 'master'
Too/bookingflowforx2

See merge request CIEFWorldwideSdnBhd/exchange!70
2018-07-16 01:50:14 +00:00
Jack Goh aab0ecd18e Merge branch 'too/dynamicshowmalaysiaacc' into 'master'
Too/dynamicshowmalaysiaacc

See merge request CIEFWorldwideSdnBhd/exchange!69
2018-07-16 01:47:05 +00:00
weiweitoo b21eaf4522 add new branch for booking flow for x2_chequeand x2_ba 2018-07-14 17:31:21 +08:00
weiweitoo 1c9a9aca20 missing change beneficiaries to beneficiary in seeder 2018-07-13 18:31:29 +08:00
weiweitoo d9dfe84c2e rename beneficiaries tobeneficiary 2018-07-13 09:58:32 +08:00
weiweitoo 440d05c900 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/dynamicshowmalaysiaacc 2018-07-12 23:00:29 +08:00
weiweitoo 62e8a9b9b6 close loading only when all resource load finish 2018-07-12 22:59:16 +08:00
weiweitoo 19ea22141e dynamically show chinabank in supplier report 2018-07-12 22:42:16 +08:00
weiweitoo ad5f8df8af revert back changes during debug 2018-07-12 01:12:26 +08:00
weiweitoo 1535b54f04 revert back changes during debug 2018-07-12 01:09:49 +08:00
weiweitoo 39d5646155 dynamically show malaysia bank acc for booking step 2018-07-12 00:52:46 +08:00
Mouhamed Lamine d38d801638 Showing Completed Orders Task Done 2018-07-11 16:24:55 +08:00
Jack Goh b6e278a49a Merge branch 'too/fixsettingvalidationbug' into 'master'
Too/fixsettingvalidationbug

See merge request CIEFWorldwideSdnBhd/exchange!67
2018-07-11 04:12:54 +00:00
weiweitoo 1bc2ab91c0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fixsettingvalidationbug 2018-07-11 01:43:42 +08:00
weiweitoo 6a892e093c fix validation at register page 2018-07-11 01:42:58 +08:00
weiweitoo edbd8887c5 fix bug for validation. Remove nullable for malaysia bank table 2018-07-11 01:39:35 +08:00
Jack Goh 0d687279e6 Merge branch 'too/markingsettingpage' into 'master'
add marking setting page and integrate it

See merge request CIEFWorldwideSdnBhd/exchange!66
2018-07-10 16:19:58 +00:00
Mouhamed Lamine 28a6f43b0a Showing Completed Orders To Admin Done Except Making Table Sortable 2018-07-10 18:08:59 +08:00
Mouhamed Lamine a35e4fd3c8 Showing Completed Orders To Admin 2018-07-10 15:32:22 +08:00
weiweitoo 97453bb084 add marking setting page and integrate it 2018-07-09 20:47:55 +08:00
Jack Goh 7b638766e4 Merge branch 'fix/marking' into 'master'
fix seed contraints error

See merge request CIEFWorldwideSdnBhd/exchange!65
2018-07-08 03:55:44 +00:00