omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 4b6bd15aa1 fox/bookingTest lonetrinity 2018-10-01 10:52:46 +08:00
  • 860dec47e9 fix/uploadPictureInCompressedMethod Lingges/Fix/uploadPictureInStep2User lonetrinity 2018-09-28 18:10:50 +08:00
  • aeb1329338 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into lingges/fix/uploadPictureInStep2User lonetrinity 2018-09-27 11:13:28 +08:00
  • 6425f66cd4 overwritePublic/mix-manifest.json lonetrinity 2018-09-27 11:11:42 +08:00
  • b49ad86845 Merge branch 'fix/uploadBankSlip' into 'master' Ahmad Shah Hafizan Hamidin 2018-09-26 18:07:41 +00:00
  • 6022a8fccd fix/removeDeleteandAddBankStatus fix/uploadBankSlip lonetrinity 2018-09-25 15:04:03 +08:00
  • bcf83b167c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/uploadBankSlip lonetrinity 2018-09-25 10:00:46 +08:00
  • 5e8d4f3631 fix/submitButtonDisabled lonetrinity 2018-09-19 14:28:00 +08:00
  • c368a8c5aa fix real time update rate not working Jack Goh 2018-09-18 11:24:38 +08:00
  • af9d052684 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange Jack Goh 2018-09-18 11:11:34 +08:00
  • 0bc668d6a4 before merge Jack Goh 2018-09-18 11:11:14 +08:00
  • c7ac30a990 Merge branch 'fix/uploadBankSlip' into 'master' Jack Goh 2018-09-13 05:01:28 +00:00
  • 76d06372b6 savechanges lonetrinity 2018-09-12 22:01:17 +08:00
  • 31febb4b49 npmErrorSolved lonetrinity 2018-09-12 20:59:45 +08:00
  • 85217451f7 fixNpmError2 lonetrinity 2018-09-12 20:41:03 +08:00
  • a999d92b05 npmError lonetrinity 2018-09-12 20:35:28 +08:00
  • 5168808c07 Merge branch 'fix/button-name' into 'master' Jack Goh 2018-09-12 08:34:22 +00:00
  • aab3de8246 fix/ButtonName lonetrinity 2018-09-12 16:29:20 +08:00
  • c639f04db4 fix/ButtonName lonetrinity 2018-09-12 16:24:57 +08:00
  • 1277240304 Merge branch 'addAdminIndexPagination' into 'master' Jack Goh 2018-09-12 08:12:35 +00:00
  • 245e722ae5 fixMergeConflicts3 lonetrinity 2018-09-12 15:51:02 +08:00
  • 8617df285f fixMergeConflicts2 lonetrinity 2018-09-12 15:47:34 +08:00
  • d8c993ab31 fixMergeConflicts lonetrinity 2018-09-12 15:45:09 +08:00
  • ced8c02203 fixBankInSlip lonetrinity 2018-09-12 15:36:49 +08:00
  • 1773a94fb8 mergeConflict fixAdminHomeBug lonetrinity 2018-09-07 12:14:43 +08:00
  • 04351e1f92 adminPaging lonetrinity 2018-09-07 12:00:57 +08:00
  • 872ada9aee fixUploadBankInSlip fixBugBankinSlip lonetrinity 2018-09-06 14:23:55 +08:00
  • 9aaafd24d6 Merge branch 'feature/sorting' into 'master' Jack Goh 2018-09-03 06:47:07 +00:00
  • 0a754075de Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting Jack Goh 2018-09-03 14:41:39 +08:00
  • f8edb5c159 update changelog Jack Goh 2018-09-03 14:40:17 +08:00
  • af9967a864 remove USD sorting fixed term sorting Jack Goh 2018-09-03 14:39:38 +08:00
  • 25d1dd4e9f temporary disable cancel booking button due to untested feature Jack Goh 2018-09-03 14:19:36 +08:00
  • 0a165961db Merge branch 'addMarkingColumn' into 'master' Jack Goh 2018-09-03 06:16:38 +00:00
  • 7a2f55bca5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting Jack Goh 2018-09-03 14:14:43 +08:00
  • 87dc08aabf WIP changelog Jack Goh 2018-09-03 14:13:52 +08:00
  • 994ef1b261 temporary disabled cancel button, due to not tested Jack Goh 2018-09-03 14:11:32 +08:00
  • 32986788dd Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into addMarkingColumn Jack Goh 2018-09-03 14:09:03 +08:00
  • 37a95e6d05 added po format Jack Goh 2018-09-03 13:35:31 +08:00
  • 467f924a30 updated notification with pagination and loading indicator feature/notification Jack Goh 2018-09-03 12:09:56 +08:00
  • 5cecb731f6 fix some error in notification frontend Jack Goh 2018-08-30 16:48:29 +08:00
  • bd1e38273e fix navbar dissapear Jack Goh 2018-08-30 16:17:34 +08:00
  • 4a02732eb7 fix non-premitive key Jack Goh 2018-08-30 16:12:38 +08:00
  • d56f185c69 added vue time ago component added custom field for booking updated notification updated fetch notification on frontend Jack Goh 2018-08-30 16:04:14 +08:00
  • 8cfad4af99 fix refactor navbar error fix this.user not found error Jack Goh 2018-08-30 10:52:35 +08:00
  • f027d18aea fix supplier report download not working on firefox fix/download-report Jack Goh 2018-08-29 14:44:51 +08:00
  • e866eca3bc Merge branch 'fix/download-report' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/download-report Jack Goh 2018-08-29 13:32:44 +08:00
  • 5c8263861e update the download report in x2 completed page Mohd Arief 2018-08-29 11:49:28 +08:00
  • cb19c7735d update the download function Mohd Arief 2018-08-29 11:16:43 +08:00
  • 3a25b67de0 refactor navbar code Jack Goh 2018-08-29 10:34:30 +08:00
  • 6ed5e3d85a removed duplicated operation on home mounted fixed authorization error due to null token Jack Goh 2018-08-29 10:31:30 +08:00
  • dfe092f89c WIP booking updated feature Jack Goh 2018-08-29 09:38:55 +08:00
  • 16bb5cd7bc solved the discussion Mohd Arief 2018-08-28 13:13:16 +08:00
  • defff70584 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/download-report Mohd Arief 2018-08-28 11:18:40 +08:00
  • fa752a087d column marking lonetrinity 2018-08-28 11:01:23 +08:00
  • 88d704b368 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/notification Jack Goh 2018-08-28 10:00:16 +08:00
  • ac9681956d addMarkingcolumnToAdmin lonetrinity 2018-08-27 18:00:25 +08:00
  • a31d1ddf3f lingges/featureSorting lonetrinity 2018-08-27 17:46:48 +08:00
  • d38a3f16e9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting lonetrinity 2018-08-27 17:45:16 +08:00
  • 6b74883789 no message Jack Goh 2018-08-27 14:34:58 +08:00
  • 3b8b988155 WIP test notification Jack Goh 2018-08-27 14:32:02 +08:00
  • 181278f5e1 fixed the download button for supplier report on admin side Mohd Arief 2018-08-27 13:58:51 +08:00
  • 440942de4d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/download-report Mohd Arief 2018-08-27 11:06:21 +08:00
  • 31653556f5 lingges/featureSorting lonetrinity 2018-08-25 13:04:48 +08:00
  • 81112e4080 cancelationBooking lonetrinity 2018-08-25 11:55:01 +08:00
  • 31710d2b88 fix no realtime notification on user home page temporary added notification bell ui Jack Goh 2018-08-25 11:27:08 +08:00
  • 3972bf2f63 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into cancelBooking lonetrinity 2018-08-24 16:07:23 +08:00
  • a88fdb62ae merge lonetrinity 2018-08-24 16:07:09 +08:00
  • 4f4c646b92 update ssh login username Jack Goh 2018-08-24 12:08:54 +08:00
  • fd15a7e111 update gitlab cd host address Jack Goh 2018-08-24 11:39:05 +08:00
  • 5f94f54371 update storage permission error Jack Goh 2018-08-24 11:17:11 +08:00
  • 1450014e23 fix laravel.log permission Jack Goh 2018-08-24 11:09:26 +08:00
  • abc48ed6a4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/download-report Mohd Arief 2018-08-24 09:09:49 +08:00
  • da55ae0c3d Merge branch 'fix/admin-status-button' into 'master' Jack Goh 2018-08-23 10:06:58 +00:00
  • 62ed955021 Merge branch 'minor-change/active-bank' into 'master' Jack Goh 2018-08-23 03:00:42 +00:00
  • 98732a6d62 fix all user's booking in booking table to specifc user only Jack Goh 2018-08-23 10:55:14 +08:00
  • 351e0ce467 Merge branch 'minor-change/active-bank' into 'master' Jack Goh 2018-08-23 02:17:13 +00:00
  • 19ba992608 added bank name label to active bank setting dropdown list Jack Goh 2018-08-23 10:11:56 +08:00
  • 5a78eed4aa Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/download-report Mohd Arief 2018-08-23 09:22:50 +08:00
  • 7472cac286 update MIT license to closed source license Jack Goh 2018-08-21 22:41:09 +08:00
  • 8c3358c462 fixed conflict Mohd Arief 2018-08-21 12:12:08 +08:00
  • c3cd1d70ea fixed the View status button on admin completed order Mohd Arief 2018-08-21 12:02:35 +08:00
  • 068cdb18e7 added back service charge updated change log Jack Goh 2018-08-20 17:56:10 +08:00
  • 89890e93b3 Merge branch 'fix/bank-setting' into 'master' Jack Goh 2018-08-20 09:37:19 +00:00
  • f15dbe44db fix bank setting cannot be null error Jack Goh 2018-08-20 17:31:25 +08:00
  • 9891d1fde1 Merge branch 'admin_Completed_Order' into 'master' Jack Goh 2018-08-20 09:25:47 +00:00
  • 9a3bd8dade Merge branch 'fix/notification' into 'master' Jack Goh 2018-08-20 09:25:17 +00:00
  • b26727e5e6 fixed admin and user normal booking table with completed booking bug Jack Goh 2018-08-20 17:18:39 +08:00
  • a85b8eb41e fixBookingTable lonetrinity 2018-08-17 14:57:33 +08:00
  • 408be5d367 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order lonetrinity 2018-08-17 12:13:43 +08:00
  • 67cce6e91e Merge branch 'fix/refresh-button' into 'master' Jack Goh 2018-08-17 03:33:18 +00:00
  • 9740392d4c fixed conflict Mohd Arief 2018-08-17 11:26:14 +08:00
  • 16e7efa108 updated the refresh button function Mohd Arief 2018-08-17 11:21:41 +08:00
  • d6eb6576d3 updated refresh button Mohd Arief 2018-08-17 11:13:17 +08:00
  • 249894d5b2 fixAdminCommit lonetrinity 2018-08-17 11:12:15 +08:00
  • df068d8c71 Revert "fixed the refresh button for completed order" Mohd Arief 2018-08-17 11:07:26 +08:00
  • 7d1155651b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order lonetrinity 2018-08-17 11:04:51 +08:00
  • 5db9908a57 prepare to merge lonetrinity 2018-08-17 11:04:44 +08:00
  • 424097e035 fixed the refresh button for completed order fix/importer-notification Mohd Arief 2018-08-17 11:00:35 +08:00
  • 94d770bcba fix migration error fix/notification Jack Goh 2018-08-17 10:55:40 +08:00
  • 02c393184c Merge branch 'fix/notification' into 'master' Jack Goh 2018-08-17 01:41:30 +00:00