Jack Goh 536c67bbc6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice ...

# Conflicts:
#	database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php
#	database/seeds/DatabaseSeeder.php

2018-06-28 15:55:58 +08:00

..

components

added new status for user tracking nav bar

2018-06-28 12:08:12 +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 integration/upload-invoice

2018-06-28 15:55:58 +08:00

plugins

complete the admin setting navbar

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

router

added new status for user tracking nav bar

2018-06-28 12:08:12 +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