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

# Conflicts:
#	package-lock.json
#	vendor/composer/autoload_static.php

2018-07-05 14:07:37 +08:00

..

components

fix inline update rate dialog

2018-07-05 13:39:28 +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-05 14:07:37 +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

added back name field to user table

2018-07-05 13:27:38 +08:00

app.js

move vee-validate to index.js

2018-07-04 17:30:06 +08:00