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

..

components

commented out some undone feature navigation bar

2018-07-03 18:23:26 +08:00

lang

integrated frontend

2018-05-07 15:26:23 +08:00

layouts

integrated frontend

2018-05-07 15:26:23 +08:00

middleware

solved merge conflict

2018-06-26 10:40:35 +08:00

pages

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage

2018-07-04 11:17:44 +08:00

plugins

complete the admin setting navbar

2018-06-25 16:57:18 +08:00

router

make welcome page to be login page

2018-07-02 18:04:29 +08:00

store

fix register page submit button. Check duplicated user register. Fix typo in register page.Add Marking seeder.

2018-07-02 22:44:41 +08:00

app.js

booking page done except upload

2018-06-08 11:55:39 +08:00