Jack Goh 87442520a9 Fix test ...

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php

2018-06-13 15:57:08 +08:00

..

Console

init

2018-04-20 14:03:37 +08:00

Exceptions

fix conflict

2018-05-14 10:45:15 +08:00

Http

Fix test

2018-06-13 15:57:08 +08:00

Notifications

integrated frontend

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

Providers

merge master

2018-05-15 12:35:52 +08:00

Booking.php

add verification status

2018-05-22 17:29:12 +08:00

ChinaBankSlip.php

new upload china bankslip

2018-05-08 15:24:21 +08:00

OAuthProvider.php

integrated frontend

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

Permission.php

added entrust role based permission

2018-05-07 16:25:42 +08:00

Rate.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

Role.php

added entrust role based permission

2018-05-07 16:25:42 +08:00

SettingBeneficiary.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

SettingCredit.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

SettingSupplier.php

add model,controller,migration,api

2018-04-27 18:03:16 +08:00

User.php

added booking seeder

2018-05-19 12:33:48 +08:00