Mouhamed Lamine 4007c4103d Merge conflicts Fixed

2018-08-25 11:45:54 +08:00

..

2014_10_12_000000_create_users_table.php

init

2018-04-16 15:37:03 +08:00

2014_10_12_100000_create_password_resets_table.php

init

2018-04-16 15:37:03 +08:00

2018_04_22_080323_create_user_verifications_table.php

added verification

2018-04-23 11:49:26 +08:00

2018_04_24_034401_create_companies_table.php

added file upload for both company profile picture and registration certificate

2018-05-07 11:11:57 +08:00

2018_04_25_024318_create_deliveryinfos_table.php

completed the user intergration

2018-06-12 09:49:24 +08:00

2018_04_25_083636_rename_column_in_company.php

added create company

2018-04-26 16:43:40 +08:00

2018_04_25_084609_change_email_to_mobile_from_user.php

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into companyFrontend

2018-05-30 10:57:18 +08:00

2018_04_25_145608_add_timestamp_to_verification.php

added phone verification

2018-04-26 11:44:04 +08:00

2018_04_26_020634_change_nullable_in_user_table.php

added phone verification

2018-04-26 11:44:04 +08:00

2018_04_26_055706_laratrust_setup_tables.php

added role based user management

2018-04-26 17:18:53 +08:00

2018_04_26_060746_laratrust_setup_teams.php

changed the listing function on contacts frontend, still got issues

2018-07-06 18:05:12 +08:00

2018_04_26_082810_change_email_to_phone_from_passwordreset_table.php

added role based user management

2018-04-26 17:18:53 +08:00

2018_04_27_021807_add_id_to_password_reset.php

added reset password method

2018-04-27 10:30:18 +08:00

2018_04_27_083152_create_warehouses_table.php

added put post update show

2018-04-27 17:38:02 +08:00

2018_05_08_081508_add_nullable_to_companies.php

added the upload functions for both company image and registration certificate, stored under /storage/app directory

2018-05-15 10:36:41 +08:00

2018_05_14_022103_create_contacts_table.php

changed the listing function on contacts frontend, still got issues

2018-07-06 18:05:12 +08:00

2018_05_26_014004_add_user_to_company_table.php

updated docker to fix faker image error

2018-05-28 17:14:09 +08:00

2018_06_11_033330_add_column_to_table_delivery_info.php

completed the user intergration

2018-06-12 09:49:24 +08:00

2018_06_22_072528_add_foreign_key_to_warehouses_table.php

Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses

2018-06-27 10:00:44 +08:00

2018_06_26_075427_drop_and_add_company_id.php

Merge branch 'asif/warehouses' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact

2018-06-27 09:51:56 +08:00

2018_06_26_080331_drop_company_id.php

Merge branch 'asif/warehouses' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact

2018-06-27 09:51:56 +08:00

2018_06_26_082438_drop_com__id_for_warehouses_table.php

fixed warehouses FK relation error

2018-06-26 16:31:13 +08:00

2018_06_26_083014_change_reference_id_for_warehouses_table.php

fixed warehouses FK relation error

2018-06-26 16:31:13 +08:00

2018_07_05_030738_change_user_id_and_com_id_in_contacts.php

changed the listing function on contacts frontend, still got issues

2018-07-06 18:05:12 +08:00

2018_08_03_034914_remove_branch_from_deliveryinfos.php

Delivery Info Insert

2018-08-06 09:30:08 +08:00