Commit Graph

18 Commits

Author SHA1 Message Date
Jack Goh 32986788dd Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into addMarkingColumn 2018-09-03 14:09:03 +08:00
Jack Goh c28903a165 ignore composer.lock 2018-08-02 15:35:40 +08:00
Jack Goh 61066c4366 removed ali pay / wechat pay at place holder
removed mix-manifest.json from git
2018-07-28 09:49:57 +08:00
Jack Goh 73c3e8654b added mix-manifest to gitignore, because it differ from production and dev 2018-07-19 11:02:04 +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 4a83cebad8 added back composer lock because it required by deployment 2018-07-16 14:47:28 +08:00
Jack Goh 0180694d72 gitignored autoload_classmap
removed setting-credit for post, delete and get one routes
completed admin credit limit and time out update feature
fixed drop down rate issue
fixed the controller show and update issue
2018-07-05 15:47:19 +08:00
Jack Goh d5c7597307 added back name field to user table
fixed unable to login issue
2018-07-05 13:27:38 +08:00
Jack Goh 560035be09 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
# Conflicts:
#	package-lock.json
#	package.json
#	resources/assets/js/pages/settings/admin-supplier.vue
#	vendor/composer/autoload_static.php
2018-07-05 11:52:38 +08:00
Mouhamed Lamine 0f9a9581fd Removing gitignore mess 2018-07-04 15:14:55 +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
Mouhamed Lamine e073bfdba8 GitIgnored my package-lock.json 2018-07-03 16:36:55 +08:00
Mouhamed Lamine d082918d37 GitIgnored my package-lock.json 2018-07-03 15:56:29 +08:00
Jack Goh 1e6d38646e update ignore file 2018-06-21 15:05:16 +08:00
Jack Goh 90fcbcda73 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
2018-06-13 14:43:30 +08:00
jack 4278419aaa added SPA bootstrap frontend with login, register and admin routes 2018-05-07 19:13:38 +08:00
jack 7db2a95665 remove persistent data 2018-04-30 09:52:43 +08:00
jack 5d0cf138b8 removed vendor fixed docker 2018-04-23 17:28:22 +08:00