Commit Graph

367 Commits

Author SHA1 Message Date
Dillon Ngo bb5a473fe4 Fix a problem in merge conflict done wrong 2024-06-23 20:03:01 +08:00
Dillon Ngo 4e197d4d5d Merge branch 'development' into vapor/development 2024-06-20 17:03:59 +08:00
Dillon Ngo 22b1b5cbcb Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-18 11:43:51 +08:00
Dillon Ngo fcaee29be3 Export pdf file from Laravel Vapor through S3 bucket 2024-06-18 11:38:43 +08:00
Dillon Ngo 6d638009e9 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-18 10:34:58 +08:00
Dillon Ngo 38aa670528 Export excel file from Laravel Vapor through S3 bucket, code touch up 2024-06-18 10:34:04 +08:00
Dillon Ngo f38a05c181 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-18 09:17:45 +08:00
Dillon Ngo 700b72900a Export excel file directly from Laravel Vapor without going through S3 bucket 2024-06-18 09:16:04 +08:00
Dillon Ngo 143d4ed6c9 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 13:59:11 +08:00
Dillon Ngo 4bda041c08 Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 13:59:00 +08:00
Dillon Ngo bad537d797 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 13:07:54 +08:00
Dillon Ngo d976b8b42b Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 13:07:42 +08:00
Dillon Ngo 6d7d06ca1f Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 12:43:31 +08:00
Dillon Ngo 9395c51d4c Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 12:43:23 +08:00
Dillon Ngo 77febea023 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 12:15:33 +08:00
Dillon Ngo 5c39d4555e Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 12:15:22 +08:00
Dillon Ngo 97aede0440 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 11:57:42 +08:00
Dillon Ngo 3e50431b9f Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 11:57:23 +08:00
Dillon Ngo 7d20c33156 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 11:26:27 +08:00
Dillon Ngo c4edcdf814 Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 11:26:16 +08:00
Dillon Ngo 8244ea56b4 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 11:07:40 +08:00
Dillon Ngo e4a1836f23 Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 11:07:28 +08:00
Dillon Ngo 8ad68e8bf9 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 10:35:17 +08:00
Dillon Ngo 9ac9a50519 Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 10:35:10 +08:00
Dillon Ngo 6615ddc200 Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 10:09:08 +08:00
Dillon Ngo b24c9149ce Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 10:08:57 +08:00
Dillon Ngo 8091cb7d6d Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-06-17 09:37:00 +08:00
Dillon Ngo acbdd79677 Export file directly from Laravel Vapor without going through S3 bucket 2024-06-17 09:36:25 +08:00
Dillon Ngo db28b3adac Merge branch 'dillon/34.4-jenkins-vapor' into vapor/development 2024-05-25 02:24:52 +08:00
Dillon Ngo a2276ac977 Merge branch 'master' into dillon/34.4-jenkins-vapor 2024-05-25 02:06:50 +08:00
Dillon Ngo 9074e1ef5d Merge branch 'dillon/34.3-jenkins-vapor' into vapor/development 2024-05-17 14:57:02 +08:00
Dillon Ngo f9d7e48b58 Merge branch 'master' into dillon/34.3-jenkins-vapor 2024-05-17 14:55:01 +08:00
Dillon Ngo 11ba52fbb9 Laravel Vapor - code sync from shipping portal to solve issue related to AWS S3 2024-05-17 14:49:42 +08:00
Aqqil Azman 3b4f3281b1 Merge branch 'export-currency-vendor-order-module' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-17 10:46:54 +08:00
edmondlang 0797f26fe1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-16 17:58:47 +08:00
edmondlang 7f2af7adf4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-16 10:56:23 +08:00
edmondlang 531b65686f export white form transactions 2024-05-16 10:56:02 +08:00
Aqqil Azman 97a8e34f3d initial commit 2024-05-13 09:58:28 +08:00
JiaSheng 2775b21cd5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-06 17:20:53 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +08:00
Dillon Ngo 82bf073d09 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development 2024-04-30 13:07:42 +08:00
Dillon Ngo 608297c77c Laravel Vapor - sync code for download files in bulk from S3 to more files 2024-04-30 13:07:25 +08:00
Dillon Ngo 4437f272b5 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development 2024-04-29 14:57:26 +08:00
Dillon Ngo 357a4fde66 Laravel Vapor - sync code for download files in bulk from S3 to more files 2024-04-29 14:57:15 +08:00
edmondlang f63351b715 Merge branch 'remark-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/api.php
#	routes/web.php
2024-04-25 16:50:48 +08:00
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +08:00
JiaSheng b7505e4501 Merge branch '1688-integration' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-31 22:21:40 +08:00
JiaSheng 9c08805d32 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-integration
# Conflicts:
#	routes/api.php
2024-03-31 22:21:01 +08:00
Dillon Ngo 330103bc79 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development 2024-03-24 20:15:58 +08:00
Dillon Ngo bd7fd92cf0 Laravel Vapor - Delete comments 2024-03-24 20:14:38 +08:00