Commit Graph

924 Commits

Author SHA1 Message Date
omair saleh d744eb4f6a Merge branch 'Lingges/fixpoFormat' into 'master'
serviceChargeCorrection

See merge request CIEFWorldwideSdnBhd/exchange!143
2018-10-10 07:00:41 +00:00
lonetrinity ad7a74a901 serviceChargeCorrection 2018-10-10 12:31:05 +08:00
omair saleh 6a5c0be6ed Merge branch 'Lingges/fixpoFormat' into 'master'
Lingges/fixpo format

See merge request CIEFWorldwideSdnBhd/exchange!142
2018-10-09 03:36:01 +00:00
lonetrinity bd075e61a5 unitTestingCorrection 2018-10-09 11:25:32 +08:00
lonetrinity 235525fe6e fixpipelineTesing 2018-10-08 17:59:25 +08:00
lonetrinity 9320c90517 fixpipelineTesing 2018-10-08 17:39:35 +08:00
lonetrinity 3edd91f09e fixpipelineTesing 2018-10-08 17:26:54 +08:00
lonetrinity 6a7084f75e fixBug 2018-10-08 16:30:05 +08:00
lonetrinity 94b08cb04d fix/uploadPoandMinorBugs 2018-10-08 16:18:56 +08:00
lonetrinity b4da087385 fix/importerBookingNameOrder 2018-10-05 16:54:51 +08:00
lonetrinity af91e85efa Fix/RegisterErrorMessage 2018-10-05 16:32:30 +08:00
omair saleh 1ab9510e6e Merge branch 'fix/uploadPicture' into 'master'
Fix/upload picture

See merge request CIEFWorldwideSdnBhd/exchange!141
2018-10-01 04:12:11 +00:00
lonetrinity 6ab05f81a4 fix/testingTwo 2018-10-01 12:04:19 +08:00
lonetrinity 4b6bd15aa1 fox/bookingTest 2018-10-01 10:52:46 +08:00
lonetrinity 860dec47e9 fix/uploadPictureInCompressedMethod 2018-09-28 18:10:50 +08:00
lonetrinity aeb1329338 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into lingges/fix/uploadPictureInStep2User 2018-09-27 11:13:28 +08:00
lonetrinity 6425f66cd4 overwritePublic/mix-manifest.json 2018-09-27 11:11:42 +08:00
Ahmad Shah Hafizan Hamidin b49ad86845 Merge branch 'fix/uploadBankSlip' into 'master'
fix/submitButtonDisabled

See merge request CIEFWorldwideSdnBhd/exchange!139
2018-09-26 18:07:41 +00:00
lonetrinity 6022a8fccd fix/removeDeleteandAddBankStatus 2018-09-25 15:04:03 +08:00
lonetrinity bcf83b167c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/uploadBankSlip 2018-09-25 10:00:46 +08:00
lonetrinity 5e8d4f3631 fix/submitButtonDisabled 2018-09-19 14:28:00 +08:00
Jack Goh c368a8c5aa fix real time update rate not working 2018-09-18 11:24:38 +08:00
Jack Goh af9d052684 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange 2018-09-18 11:11:34 +08:00
Jack Goh 0bc668d6a4 before merge 2018-09-18 11:11:14 +08:00
Jack Goh c7ac30a990 Merge branch 'fix/uploadBankSlip' into 'master'
Fix/upload bank slip

See merge request CIEFWorldwideSdnBhd/exchange!137
2018-09-13 05:01:28 +00:00
lonetrinity 76d06372b6 savechanges 2018-09-12 22:01:17 +08:00
lonetrinity 31febb4b49 npmErrorSolved 2018-09-12 20:59:45 +08:00
lonetrinity 85217451f7 fixNpmError2 2018-09-12 20:41:03 +08:00
lonetrinity a999d92b05 npmError 2018-09-12 20:35:28 +08:00
Jack Goh 5168808c07 Merge branch 'fix/button-name' into 'master'
fix/ButtonName

See merge request CIEFWorldwideSdnBhd/exchange!136
2018-09-12 08:34:22 +00:00
lonetrinity aab3de8246 fix/ButtonName 2018-09-12 16:29:20 +08:00
lonetrinity c639f04db4 fix/ButtonName 2018-09-12 16:24:57 +08:00
Jack Goh 1277240304 Merge branch 'addAdminIndexPagination' into 'master'
fixBankInSlip

See merge request CIEFWorldwideSdnBhd/exchange!135
2018-09-12 08:12:35 +00:00
lonetrinity 245e722ae5 fixMergeConflicts3 2018-09-12 15:51:02 +08:00
lonetrinity 8617df285f fixMergeConflicts2 2018-09-12 15:47:34 +08:00
lonetrinity d8c993ab31 fixMergeConflicts 2018-09-12 15:45:09 +08:00
lonetrinity ced8c02203 fixBankInSlip 2018-09-12 15:36:49 +08:00
Jack Goh 9aaafd24d6 Merge branch 'feature/sorting' into 'master'
Feature/sorting

See merge request CIEFWorldwideSdnBhd/exchange!131
2018-09-03 06:47:07 +00:00
Jack Goh 0a754075de Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting
# Conflicts:
#	resources/assets/js/pages/home.vue
2018-09-03 14:41:39 +08:00
Jack Goh f8edb5c159 update changelog 2018-09-03 14:40:17 +08:00
Jack Goh af9967a864 remove USD sorting
fixed term sorting
2018-09-03 14:39:38 +08:00
Jack Goh 25d1dd4e9f temporary disable cancel booking button due to untested feature 2018-09-03 14:19:36 +08:00
Jack Goh 0a165961db Merge branch 'addMarkingColumn' into 'master'
Add marking column

See merge request CIEFWorldwideSdnBhd/exchange!132
2018-09-03 06:16:38 +00:00
Jack Goh 7a2f55bca5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting
# Conflicts:
#	public/mix-manifest.json
2018-09-03 14:14:43 +08:00
Jack Goh 87dc08aabf WIP changelog 2018-09-03 14:13:52 +08:00
Jack Goh 994ef1b261 temporary disabled cancel button, due to not tested 2018-09-03 14:11:32 +08:00
Jack Goh 32986788dd Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into addMarkingColumn 2018-09-03 14:09:03 +08:00
Jack Goh 37a95e6d05 added po format 2018-09-03 13:35:31 +08:00
lonetrinity fa752a087d column marking 2018-08-28 11:01:23 +08:00
lonetrinity ac9681956d addMarkingcolumnToAdmin 2018-08-27 18:00:25 +08:00