Commit Graph

19 Commits

Author SHA1 Message Date
weiweitoo 3e60ec8e86 fix conflit 2018-07-21 00:15:43 +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 4a83cebad8 added back composer lock because it required by deployment 2018-07-16 14:47:28 +08:00
Jack Goh 8798c83b97 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
# Conflicts:
#	package-lock.json
#	package.json
#	vendor/composer/autoload_static.php
#	yarn.lock
2018-07-04 11:17:44 +08:00
Mohd Arief 3a7edc8401 update admin setting 2018-06-26 10:30:57 +08:00
Too 3060aa1c1f Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye 2018-06-15 17:13:53 +08:00
Jack Goh 87442520a9 Fix test
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
2018-06-13 15:57:08 +08:00
Mohd Arief ec4d72c316 solve merge conflict 2018-06-12 12:05:07 +08:00
Jack Goh a3cb5344ee updated readme 2018-06-12 09:46:42 +08:00
Mohd Arief 1b64a3d744 user-dashboard completed 2018-05-24 16:23:06 +08:00
Mohd Arief 315ed64520 added booking seeder
updated booking controller
added test for booking
2018-05-19 12:33:48 +08:00
jack 06aa931eb5 added wait for mysql to start in docker
fix role not found on register/login
2018-05-14 12:45:30 +08:00
Nazri 47975d6de2 fix conflict 2018-05-14 10:45:15 +08:00
Nazri f56a858e18 new upload china bankslip 2018-05-08 15:24:21 +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
Nazri Hamzah 805d357048 add model,controller,migration,api 2018-04-27 18:03:16 +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