Commit Graph

Select branches

Hide Pull Requests

Aqeeb/company

Aqeeb/shippingorder-frontend

asif/contact

companyFrontend

fix/bug

jack/auth

master

zain/delivery-info

zain/shipment-arrangement

zain/shipping-order

zain/warehouse-receive-note

Mono Color

• 1361538f8b solve multiple error Zain Fauzan Rofie Azizi 2018-06-07 09:55:43 +08:00
• 956d1072fa Merge branch 'companyFrontend' into 'master' Jack Goh 2018-06-06 08:52:48 +00:00
• c7b8cd76c0 added country code added to the front end companyFrontend Aqeeb Imtiaz Harun 2018-06-06 16:03:05 +08:00
• 9619cab407 solved some functions error, empty function Zain Fauzan Rofie Azizi 2018-06-06 15:36:55 +08:00
• 041c643bb1 ongoing testing zain/shipment-arrangement Zain Fauzan Rofie Azizi 2018-06-06 15:27:46 +08:00
• 670eb012ed added alternative bootstrap alert to frontends during the signup process Aqeeb Imtiaz Harun 2018-06-06 09:53:26 +08:00
• 490cf88c9e added migration, model, controller for the shipment arrangement Zain Fauzan Rofie Azizi 2018-06-05 16:20:30 +08:00
• 9046d70b5c completed the testing for the wrn, fixing testing error for so Zain Fauzan Rofie Azizi 2018-06-04 14:03:35 +08:00
• e6b08a6cba added the company profile frontend integration Aqeeb Imtiaz Harun 2018-06-01 09:58:27 +08:00
• 12e071d260 fix merge problem, create factory, fix controller problem in SO and WRN, setup a testing database Zain Fauzan Rofie Azizi 2018-05-31 15:59:59 +08:00
• d1023faeb4 fix update profile error fix update profile frontend unauthorize jack 2018-05-31 09:56:15 +08:00
• f4610f7596 merging with so Zain Fauzan Rofie Azizi 2018-05-30 16:33:16 +08:00
• c43643c00f post test Zain Fauzan Rofie Azizi 2018-05-30 11:28:28 +08:00
• 2f7ceb77c1 ongoing testing Zain Fauzan Rofie Azizi 2018-05-30 11:12:59 +08:00
• ef9aff6868 testing Zain Fauzan Rofie Azizi 2018-05-30 11:05:01 +08:00
• e3632fce8d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into companyFrontend Aqeeb Imtiaz Harun 2018-05-30 10:57:18 +08:00
• cdf6c67db3 update company profile frontend Aqeeb Imtiaz Harun 2018-05-28 17:27:11 +08:00
• 3ad7a029f4 Merge branch 'Aqeeb/company' into 'master' Jack Goh 2018-05-28 09:15:48 +00: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" Aqeeb/company jack 2018-05-28 17:14:09 +08:00
• e838d36905 Merge branch 'jack/auth' into 'master' Jack Goh 2018-05-28 09:02:54 +00:00
• 371006887b completed PUT request Zain Fauzan Rofie Azizi 2018-05-28 16:40:47 +08:00
• b7f1fb9a6c Added company profile frontend Aqeeb Imtiaz Harun 2018-05-28 13:51:03 +08:00
• c589fd5431 done frontend integration: verify phone, verify code, first profile pages, company profile page is on going jack/auth Aqeeb Imtiaz Harun 2018-05-26 10:24:12 +08:00
• ff4e7764d5 added relationship for company and user jack 2018-05-26 09:37:56 +08:00
• bc8be30692 Merge branch 'Aqeeb/company' into 'master' Jack Goh 2018-05-26 01:27:32 +00:00
• ea95e8767d completed POST,PUT,GET,DELETE Zain Fauzan Rofie Azizi 2018-05-24 16:55:58 +08:00
• ba827bf27d fixed the issues that were pointed out except the pdf test Aqeeb Imtiaz Harun 2018-05-24 12:16:37 +08:00
• bd5d0076fe added upload image for wrni, and POST for wrn wrni Zain Fauzan Rofie Azizi 2018-05-23 16:00:51 +08:00
• 947d7ff15f Merge branch 'jack/auth' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth Aqeeb Imtiaz Harun 2018-05-23 13:54:45 +08:00
• 0a5745b95b added integration for request verification code page Aqeeb Imtiaz Harun 2018-05-23 13:54:11 +08:00
• 2bf4eb2b05 remove companycontroller index function jack 2018-05-23 12:20:44 +08:00
• 3996157187 clean up routes jack 2018-05-23 12:18:19 +08:00
• 1519a203a9 removed company routes from web jack 2018-05-23 12:17:12 +08:00
• 3d00b6f040 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/company jack 2018-05-23 12:16:36 +08:00
• a8425e7b95 Merge branch 'jack/auth' into 'master' Jack Goh 2018-05-23 04:12:11 +00:00
• ad68a93165 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth jack 2018-05-23 11:59:42 +08:00
• 45dea363ec changed route and controller name from verifyUser to verifyPhone jack 2018-05-23 11:21:16 +08:00
• d140ecf10f added image upload for wrn Zain Fauzan Rofie Azizi 2018-05-23 11:19:13 +08:00
• 587234f205 added auto seed on dockerup updated jwt kernel from getuserfromtoken to autenticate updated verify response from data.token to token updated user factory changed routes for update user profile to from PUT to PATCH added register with actingAs user added test update freightforwarder user added test update importer user jack 2018-05-23 11:15:38 +08:00
• 8c8c66572c added testing for shipping order and shipping order item Zain Fauzan Rofie Azizi 2018-05-23 09:41:53 +08:00
• 5909f50cd3 edit routes Zain Fauzan Rofie Azizi 2018-05-23 08:59:15 +08:00
• cbcd538eda ongoing controller Zain Fauzan Rofie Azizi 2018-05-23 08:56:58 +08:00
• f333b68dff fix conflict jack 2018-05-22 20:26:45 +08:00
• 392cd42b5d Merge branch 'jack/auth' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth jack 2018-05-22 19:57:15 +08:00
• 3381ce1bd8 removed example test addded verify sms code test jack 2018-05-22 19:55:04 +08:00
• 70d455ac64 added send verification test jack 2018-05-22 18:11:24 +08:00
• 98113c0544 Merge branch 'Aqeeb/company' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/company jack 2018-05-22 17:19:15 +08:00
• b08b7cf81f added model, migration Zain Fauzan Rofie Azizi 2018-05-22 10:56:33 +08:00
• 32db666e09 completed multiple item order Zain Fauzan Rofie Azizi 2018-05-22 09:12:38 +08:00
• 302238047d completed add multiple item Zain Fauzan Rofie Azizi 2018-05-21 17:12:01 +08:00
• d8a439fa42 Front end integrated with the backend for loginpage and successfully redirects to homepage Aqeeb Imtiaz Harun 2018-05-21 17:10:42 +08:00
• 16c1a22ebf can insert both so and soitem into db, but have an error Zain Fauzan Rofie Azizi 2018-05-21 17:04:24 +08:00
• 0969c8647b can insert both so and soitem into db, but have an error Zain Fauzan Rofie Azizi 2018-05-21 17:01:07 +08:00
• e6855eb844 added frontend & login function tested completely Aqeeb Imtiaz Harun 2018-05-19 11:53:39 +08:00
• 6797f63383 contact approval and testing Asif 2018-05-18 15:30:35 +08:00
• 137b9dc576 remove id at store, rename cancel order Zain Fauzan Rofie Azizi 2018-05-17 09:18:03 +08:00
• 4a96a75890 new migration Zain Fauzan Rofie Azizi 2018-05-17 09:03:58 +08:00
• 8e82387bfd added migration, controller, model Zain Fauzan Rofie Azizi 2018-05-16 17:20:54 +08:00
• 20209f9e36 search company and id storing test Asif 2018-05-16 16:23:04 +08:00
• 88605f2ec4 ongoing task Zain Fauzan Rofie Azizi 2018-05-16 14:32:54 +08:00
• f72645e2c2 Company Profile has been completed and tested Aqeeb Imtiaz Harun 2018-05-16 09:57:03 +08:00
• 525a313676 added routes for the warehouse receive note Zain Fauzan Rofie Azizi 2018-05-15 15:31:07 +08:00
• 3d1509d784 Upload function testing Aqeeb Imtiaz Harun 2018-05-15 15:23:18 +08:00
• bf8e67327f completed testing Zain Fauzan Rofie Azizi 2018-05-15 12:48:25 +08:00
• 4d7b9b931f complete the model, controller, and migration Zain Fauzan Rofie Azizi 2018-05-15 12:13:06 +08:00
• 0895eabce5 updated dockerfile with migration jack 2018-05-15 11:42:00 +08:00
• 5a7066969a Test Company Information Page Aqeeb Imtiaz Harun 2018-05-15 11:17:14 +08:00
• a1ebdb9767 added the upload functions for both company image and registration certificate, stored under /storage/app directory Aqeeb Imtiaz Harun 2018-05-15 10:36:41 +08:00
• d8c4ea1bcd added update role in update profile jack 2018-05-14 17:12:59 +08:00
• c0dab3c496 contact migration Asif 2018-05-14 16:23:56 +08:00
• 47c12e5e97 added user seeder added example to get user info jack 2018-05-14 15:29:24 +08:00
• 6057f48d9e updated controller for both SO and SOitem Zain Fauzan Rofie Azizi 2018-05-14 15:00:12 +08:00
• 182ac3e653 added PUT, DELETE, GET Zain Fauzan Rofie Azizi 2018-05-14 00:14:23 +08:00
• 796373e671 added POST for so Zain Fauzan Rofie Azizi 2018-05-13 23:38:19 +08:00
• 9162d86512 added migration, model, controller Zain Fauzan Rofie Azizi 2018-05-07 16:24:59 +08:00
• d31258cc82 contact controller model table Asif 2018-05-07 14:38:40 +08:00
• 1e923a3368 contact controller model table Asif 2018-05-07 14:36:48 +08:00
• 2da890f36e added file upload for both company profile picture and registration certificate Aqeeb Imtiaz Harun 2018-05-07 11:11:57 +08:00
• 7c0c86e4fe added route for shipping-order Zain Fauzan Rofie Azizi 2018-05-04 16:39:17 +08:00
• f7d468e2d5 remove slash Zain Fauzan Rofie Azizi 2018-05-04 16:19:21 +08:00
• 19f97d0662 added unit testing Zain Fauzan Rofie Azizi 2018-05-04 16:13:51 +08:00
• c8883c3e4c contact-list Asif 2018-05-03 10:51:31 +08:00
• 6c5e0b6e0e added the image upload for company profile Aqeeb Imtiaz Harun 2018-05-02 16:34:39 +08:00
• 21ef45e6a4 added put post update show Asif 2018-04-27 17:38:02 +08:00
• 838e5150a3 added reset password method jack 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 jack 2018-04-26 17:18:53 +08:00
• a08c107ef7 remove css and js Zain Fauzan Rofie Azizi 2018-04-26 16:57:00 +08:00
• c6b5c0d3f2 added create company added update company aqeebimtiaz 2018-04-26 16:43:40 +08:00
• 3b00c6aba7 added update company added create company aqeebimtiaz 2018-04-26 16:43:19 +08:00
• 4c5c65c289 added POST,GET,PUT,DELETE controller Zain Fauzan Rofie Azizi 2018-04-26 16:27:15 +08:00
• a16a9350cd updated return jwt after verify phone jack 2018-04-26 12:12:46 +08:00
• a85e58af54 added phone verification jack 2018-04-26 11:44:04 +08:00
• 456b5a8028 added twilio library updated run laravel app after db started temporary added login and register test jack 2018-04-25 22:09:11 +08:00
• 1ed60d5c4a gitignored data files jack 2018-04-25 17:44:52 +08:00
• b166712039 added vendor to dockerignore added doctrine for renaming database column changed email to phone number added confirm_password upon signup jack 2018-04-25 17:44:18 +08:00
• 3314e3eb33 company migration aqeebimtiaz 2018-04-24 14:19:14 +08:00
• 2c6921ea3f edit cotroller Zain Fauzan Rofie Azizi 2018-04-23 15:55:46 +08:00
• 5953408634 edit controller Zain Fauzan Rofie Azizi 2018-04-23 15:49:04 +08:00
• 4a8a075414 added migration, model, and controller Zain Fauzan Rofie Azizi 2018-04-23 14:47:34 +08:00
• 737c7da54f added verification jack 2018-04-23 11:49:26 +08:00