Commit Graph

Select branches

Hide Pull Requests

Lingges/Fix/uploadPictureInStep2User

Lingges/feature/addCancelBooking

Lingges/fixpoFormat

deployment/staging

feature/email-verification

feature/notification

fix/bank-branch

fix/billing-charge

fix/bookingtable-bankname

fix/bug

fix/download-report

fix/forgot-password

fix/importer-notification

fix/notification

fix/register-error-message

fix/slice-error

fix/uploadBankSlip

fix/uploadPicture

fix/user-responsive-page

fix/x2-status

fixAdminHomeBug

fixBugBankinSlip

frontend/input-validation

frontend/making-every-admin-page-responsive

master

too/gitlabci

too/gitlabciTest

too/supplierbookingreport

Mono Color

• 21338401c4 update supplierbooking frontend Jack Goh 2018-06-26 17:56:51 +08:00
• f262830b1b Merge branch 'arief/admin-settings-content' into 'master' Jack Goh 2018-06-26 09:42:24 +00:00
• fd03f5b248 updated approvebankslip booking not found updated update status upon userbankslip approved updated update status upon userbankslip rejected updated supplier index to display value and label for input select updated supplierBooking frontend completed booking accept and reject integration Jack Goh 2018-06-26 17:40:44 +08:00
• 045c137dab update dialog name Mohd Arief 2018-06-26 17:28:22 +08:00
• 2bf0df8b62 Merge branch 'arief/admin-setting-frontend' into 'master' Jack Goh 2018-06-26 09:08:15 +00:00
• c8ff54f79a completed the setting content Mohd Arief 2018-06-26 16:55:31 +08:00
• 2023050218 fix conflict Jack Goh 2018-06-26 14:44:48 +08:00
• 66b0c14f5e Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-26 14:43:53 +08:00
• ee59dc69d5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-26 14:41:45 +08:00
• 5366353484 updated loading button param Jack Goh 2018-06-26 14:41:37 +08:00
• 41a265e1a0 Merge branch 'too/ETA' into 'master' Jack Goh 2018-06-26 06:32:48 +00:00
• 366f91352b Merge branch 'too/timelimit' into 'master' Jack Goh 2018-06-26 06:31:53 +00:00
• dec9ba9405 fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller Too 2018-06-26 12:28:17 +08:00
• 852c64f35b completed display user bankslip in verification frontend Jack Goh 2018-06-26 12:27:09 +08:00
• a498d370cf remove eta from booking Too 2018-06-26 12:21:53 +08:00
• 428660a91d Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA Too 2018-06-26 12:19:52 +08:00
• c6ef6219a3 fix conflit Too 2018-06-26 12:19:08 +08:00
• 0a6bd2c405 Add eta Too 2018-06-26 12:17:12 +08:00
• ae85886365 updated user bankslip path in verification frontend Jack Goh 2018-06-26 12:12:02 +08:00
• 9fff113250 updated dockerfile to add storage symlink Jack Goh 2018-06-26 12:08:43 +08:00
• 20923d8f4a updated upload path Jack Goh 2018-06-26 12:07:27 +08:00
• f31f39caec Add seeder and test for setting_credit Too 2018-06-26 11:47:48 +08:00
• ec6db69373 Add ETA for booking table Too 2018-06-26 11:28:53 +08:00
• 6f510c93cc solved merge conflict Mohd Arief 2018-06-26 10:40:35 +08:00
• 3a7edc8401 update admin setting Mohd Arief 2018-06-26 10:30:57 +08:00
• 3129da5df4 get_time_limit Too 2018-06-25 18:16:20 +08:00
• 89f5e34aa8 update booking status on stage 2 Jack Goh 2018-06-25 17:52:41 +08:00
• ffe1023bba added credit limit seeder, it causes error when creating booking Jack Goh 2018-06-25 17:48:51 +08:00
• 62d0d83cb6 attempt to fetch user bankslip Jack Goh 2018-06-25 17:34:34 +08:00
• a3d8eff9e0 Merge branch 'feature/admin-home-frontend' into 'master' Jack Goh 2018-06-25 08:57:41 +00:00
• 1683f5bed5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-25 16:57:20 +08:00
• 069883deeb complete the admin setting navbar Mohd Arief 2018-06-25 16:57:18 +08:00
• b715663d47 updated adminshow function Jack Goh 2018-06-25 16:56:36 +08:00
• 2c6128c564 changed admin status default to 1 added show one booking for admin added booking details for verification page Jack Goh 2018-06-25 16:41:31 +08:00
• 0db893d07b Merge branch 'too/creditlimit' into 'master' Jack Goh 2018-06-25 08:32:22 +00:00
• 9aea239c52 add handle for exceed credit limit Too 2018-06-25 16:03:24 +08:00
• 1e7f076335 updated booking status on upload user bankslip revert back the correct routes for user update user path names Jack Goh 2018-06-25 15:45:02 +08:00
• cf894dd9b7 updated basemiddleware import path revertback jwtauth provider too/gitlabciTest Jack Goh 2018-06-23 01:32:53 +08:00
• 3f8419e53a updated provider Jack Goh 2018-06-23 01:23:21 +08:00
• b01c7ad9ce removed publish jwtauth Jack Goh 2018-06-23 01:15:29 +08:00
• e74ce96faf added few other composer command to clear class map Jack Goh 2018-06-23 01:11:06 +08:00
• dd98bc912b added dumpautoload Jack Goh 2018-06-23 01:04:29 +08:00
• 3b24a31816 removed some unsed apt-get install package removed some docker php ext updated install composer to bin path Jack Goh 2018-06-23 00:58:52 +08:00
• 08b69f8379 updated php version to match our docker version Jack Goh 2018-06-23 00:55:53 +08:00
• feae2c164b added composer update on gitlabci Jack Goh 2018-06-23 00:53:16 +08:00
• bf40262994 added admin booking list controller Jack Goh 2018-06-23 00:40:50 +08:00
• b8883d5a9e remove wrong symbol inside bash command Too 2018-06-23 00:39:19 +08:00
• 3f3df93259 add Tymon\JWTAuth\Providers\LaravelServiceProvider::class Too 2018-06-23 00:32:58 +08:00
• 2c14410a8f add publish bash command for jwt-auth Too 2018-06-23 00:25:10 +08:00
• 37766083fa config some jwt stuff Too 2018-06-23 00:16:26 +08:00
• 19d53139ac change jwt-auth version to dev-develop Too 2018-06-23 00:12:00 +08:00
• a46dbc9d17 composer update and install Too 2018-06-23 00:00:42 +08:00
• 76b0667250 clean reset setting for gitlab ci Too 2018-06-22 23:49:04 +08:00
• dfc896debb generate jwt key Too 2018-06-22 23:22:57 +08:00
• ef989ea1ac config jwt Too 2018-06-22 23:13:54 +08:00
• eba8171588 revert back previous changes. Add tymon to config/app.php Too 2018-06-22 22:52:06 +08:00
• 9485f02b63 fix kernel.php for basemiddleware Too 2018-06-22 22:41:47 +08:00
• 52cbf9a0bb after composer update Too 2018-06-22 22:32:40 +08:00
• 30b72fe2cb uncomment failed test Too 2018-06-22 22:18:06 +08:00
• 0a0d8e1046 revert changes on docker Too 2018-06-22 22:06:09 +08:00
• 4d46288fff Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange into too/gitlabci sengweitoo 2018-06-22 21:26:09 +08:00
• 87778241eb fix .env.testing sengweitoo 2018-06-22 21:14:31 +08:00
• c0e722bca8 add .env.testing sengweitoo 2018-06-22 17:35:26 +08:00
• 1bad5dbd8e Small Updates to Package.Json Mouhamed Lamine 2018-06-22 16:53:53 +08:00
• 620e496f0e update route.js Mohd Arief 2018-06-22 16:53:14 +08:00
• b5862e4c4a add db_port sengweitoo 2018-06-22 16:50:02 +08:00
• 3281aeb43c add dbhost sengweitoo 2018-06-22 16:35:18 +08:00
• 72f9aee7c8 solved conflict Mohd Arief 2018-06-22 16:31:56 +08:00
• a72485b6db remove php artisan optimize sengweitoo 2018-06-22 16:20:34 +08:00
• 496ce622dd rename .env.testing to .env-example sengweitoo 2018-06-22 16:14:30 +08:00
• 4acc51a9c9 remove mcrypt since deprecated in 7.1 and removed in 7.2 sengweitoo 2018-06-22 16:07:55 +08:00
• e2b3d133f6 change php version in gitlab-ci.yml sengweitoo 2018-06-22 16:02:17 +08:00
• cc95347a40 install php7.2 sengweitoo 2018-06-22 15:57:22 +08:00
• 0447481f33 install php7.2-cli Too 2018-06-22 15:32:11 +08:00
• b5e0059874 manually install php7.2 Too 2018-06-22 15:23:08 +08:00
• fad9bcf115 Use jack's version setting Too 2018-06-22 15:14:11 +08:00
• 518647ed08 create dummy user at before_Script Too 2018-06-22 15:07:36 +08:00
• 0fa439c185 change rootpassword in gitlab-ci.yml Too 2018-06-22 15:02:58 +08:00
• 2543b963f0 change db in gitlab-ci.yml Too 2018-06-22 14:58:20 +08:00
• d998d49171 modify db variable Too 2018-06-22 14:47:55 +08:00
• a1becfab70 edit gitlab-ci.sh and gitlab-ci.yml Too 2018-06-22 14:41:47 +08:00
• 8eb6a46bce modify gitlab-ci Too 2018-06-22 14:27:57 +08:00
• 2949800833 change tag Too 2018-06-22 14:24:38 +08:00
• 5cecd7e9da modify gitlab-ci.yml Too 2018-06-22 14:23:54 +08:00
• beda8e28bd add dockerfile Too 2018-06-22 14:20:43 +08:00
• bc49e39df7 added admin status to booking table updated admin progress track steps added dummy template in admin booking Jack Goh 2018-06-22 12:31:51 +08:00
• 1f757fc7b1 make changes in route.js Mohd Arief 2018-06-22 11:33:07 +08:00
• baf2a1b1df Email Verification not completed feature/email-verification Mouhamed Lamine 2018-06-22 11:29:22 +08:00
• 47b2c34bf9 update booking status redirection Jack Goh 2018-06-21 21:55:38 +08:00
• 8ff5abcc2b updated routes name Jack Goh 2018-06-21 19:12:17 +08:00
• 401b016fe0 updated routes Jack Goh 2018-06-21 19:07:21 +08:00
• 81a8505fb1 added nessasary files for the admin pages Jack Goh 2018-06-21 18:02:08 +08:00
• ee66f7614f added admin progress track component Jack Goh 2018-06-21 17:51:47 +08:00
• b9c0bc53fd added booking table to admin home integrate booking list to admin home Jack Goh 2018-06-21 17:35:08 +08:00
• 48f6760153 add .gitlab-ci.sh Too 2018-06-21 17:04:22 +08:00
• b5d8fd4e72 added bookingtable Jack Goh 2018-06-21 16:38:59 +08:00
• 9acf2a773e fix admin routes on vuejs Jack Goh 2018-06-21 16:35:09 +08:00
• f05dc41d45 temporary uncomment bookingcontroller@store to pass test Too 2018-06-21 16:24:18 +08:00
• 0cf6cb2051 Add .gitlab-ci.yml Too 2018-06-21 16:14:55 +08:00
• efb5f21567 Merge branch 'feature/user-uploadpo-frontend' into 'master' Jack Goh 2018-06-21 07:49:10 +00:00