11 Commits

Author SHA1 Message Date
Jack Goh 3f37b50c5c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	app/Http/Kernel.php
#	composer.lock
2018-07-31 16:30:26 +08:00
Too 55455b89d7 integrate delete supplier 2018-07-04 14:35:42 +08:00
Jack Goh bf40262994 added admin booking list controller 2018-06-23 00:40:50 +08:00
Too ef989ea1ac config jwt 2018-06-22 23:13:54 +08:00
Too eba8171588 revert back previous changes. Add tymon to config/app.php 2018-06-22 22:52:06 +08:00
Too 9485f02b63 fix kernel.php for basemiddleware 2018-06-22 22:41:47 +08:00
Too 30b72fe2cb uncomment failed test 2018-06-22 22:18:06 +08:00
jack 3373524bc1 added entrust role based permission 2018-05-07 16:25:42 +08:00
jack a1db64d1c1 integrated frontend 2018-05-07 15:26:23 +08:00
jack 5d0cf138b8 removed vendor fixed docker 2018-04-23 17:28:22 +08:00
jack cd217f9db8 init 2018-04-20 14:03:37 +08:00