Jack Goh 298da7d24b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend ...

# Conflicts:
#	resources/assets/js/pages/admin/booking/supplierBooking.vue

2018-06-27 14:23:19 +08:00

..

components

update top nav only admin can see

2018-06-26 18:30:41 +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 feature/admin-home-frontend

2018-06-27 14:23:19 +08:00

plugins

complete the admin setting navbar

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

router

show top navigation only if user already login

2018-06-26 18:21:40 +08:00

store

added admin status to booking table

2018-06-22 12:31:51 +08:00

app.js

booking page done except upload

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