e8b2b8009b
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into zain/shipping-order
...
# Conflicts:
# Dockerfile
# app/Http/Controllers/AuthController.php
# app/User.php
# database/factories/UserFactory.php
# database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php
# database/seeds/DatabaseSeeder.php
# public/home.html
# public/index.html
# public/profile-first-setup.html
# public/verify-code-number.html
# public/verify-phone-number.html
# routes/api.php
# routes/web.php
# tests/Feature/LoginTest.php
# tests/Feature/RegisterTest.php
2018-06-28 16:58:01 +08:00
94327b6a4d
updated docker
...
removed unused files
2018-06-28 16:51:21 +08:00
efdf546885
solved some user id error, added fk id
2018-06-20 11:21:13 +08:00
8037733f2e
fixed merged conflict
2018-06-12 09:54:54 +08:00
f463d0b6b2
completed the user intergration
2018-06-12 09:49:24 +08:00
0226847eea
dropped order_id column in soitem table
2018-06-07 17:21:08 +08:00
1361538f8b
solve multiple error
2018-06-07 09:55:43 +08:00
e3632fce8d
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into companyFrontend
...
# Conflicts:
# public/company-profile.html
2018-05-30 10:57:18 +08:00
c64c526d98
updated docker to fix faker image error
...
updated on user phone verification, create a company profile
removed company store function
updated company with user relationship
added company factory
moved company routes into authenticated routes
updated company test
renamed "verify" routes to "verify-phone"
2018-05-28 17:14:09 +08:00
98113c0544
Merge branch 'Aqeeb/company' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/company
...
# Conflicts:
# Dockerfile
# composer.json
# composer.lock
# config/app.php
2018-05-22 17:19:15 +08:00
0969c8647b
can insert both so and soitem into db, but have an error
2018-05-21 17:01:07 +08:00
4d7b9b931f
complete the model, controller, and migration
2018-05-15 12:13:06 +08:00
a1ebdb9767
added the upload functions for both company image and registration certificate, stored under /storage/app directory
2018-05-15 10:36:41 +08:00
9162d86512
added migration, model, controller
2018-05-07 16:24:59 +08:00
2da890f36e
added file upload for both company profile picture and registration certificate
2018-05-07 11:11:57 +08:00
6c5e0b6e0e
added the image upload for company profile
2018-05-02 16:34:39 +08:00
838e5150a3
added reset password method
2018-04-27 10:30:18 +08:00
b4c257b2d0
added role based user management
...
added send reset link method
updated jwt expire to one week
added seeder
2018-04-26 17:18:53 +08:00
c6b5c0d3f2
added create company
...
added update company
2018-04-26 16:43:40 +08:00
3b00c6aba7
added update company
...
added create company
2018-04-26 16:43:19 +08:00
4c5c65c289
added POST,GET,PUT,DELETE controller
2018-04-26 16:27:15 +08:00
a85e58af54
added phone verification
2018-04-26 11:44:04 +08:00
b166712039
added vendor to dockerignore
...
added doctrine for renaming database column
changed email to phone number
added confirm_password upon signup
2018-04-25 17:44:18 +08:00
3314e3eb33
company migration
2018-04-24 14:19:14 +08:00
2c6921ea3f
edit cotroller
2018-04-23 15:55:46 +08:00
4a8a075414
added migration, model, and controller
2018-04-23 14:47:34 +08:00
737c7da54f
added verification
2018-04-23 11:49:26 +08:00
407179f8f8
init
2018-04-16 15:37:03 +08:00
Jack Goh
Zain Fauzan Rofie Azizi
Aqeeb Imtiaz Harun
jack