jandres/Fleetbase-Mirror-Repo
1
0
Fork 0
mirror of https://github.com/fleetbase/fleetbase.git synced 2026-01-08 07:16:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:fleetbase/fleetbase into cloud

Browse Source
This commit is contained in:
Ronald A. Richardson
2024-03-17 12:32:42 +08:00
parent aa214ccad7 f8ae75d767
commit db8b5c4d6a
4 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/composer.json
View File

@@ -10,7 +10,7 @@
"require": {
"php": "^8.0",
"fleetbase/core-api": "^1.4.14",
"fleetbase/fleetops-api": "^0.4.20",
"fleetbase/fleetops-api": "^0.4.21",
"fleetbase/storefront-api": "^0.3.5",
"fleetbase/billing-api": "dev-main",
"fleetbase/internals-api": "dev-main",

158
api/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b411ec849e467d4450506f5e5a9c0b67",
"content-hash": "65a2255e48aa77ad808b9525624a0bb8",
"packages": [
{
"name": "aloha/twilio",
@@ -136,16 +136,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.301.0",
"version": "3.301.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "a0173e793f244eeedd0a47d40437a3bb9d8f05b8"
"reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a0173e793f244eeedd0a47d40437a3bb9d8f05b8",
"reference": "a0173e793f244eeedd0a47d40437a3bb9d8f05b8",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0a910d2b35e7087337cdf3569dc9b6ce232aafba",
"reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba",
"shasum": ""
},
"require": {
@@ -225,9 +225,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.301.0"
"source": "https://github.com/aws/aws-sdk-php/tree/3.301.1"
},
"time": "2024-03-14T18:09:12+00:00"
"time": "2024-03-15T18:14:42+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -308,16 +308,16 @@
},
{
"name": "barryvdh/laravel-dompdf",
"version": "v2.1.0",
"version": "v2.1.1",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-dompdf.git",
"reference": "c8b8a8490e5f7348cf99054821fb248f103e7d24"
"reference": "cb37868365f9b937039d316727a1fced1e87b31c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/c8b8a8490e5f7348cf99054821fb248f103e7d24",
"reference": "c8b8a8490e5f7348cf99054821fb248f103e7d24",
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/cb37868365f9b937039d316727a1fced1e87b31c",
"reference": "cb37868365f9b937039d316727a1fced1e87b31c",
"shasum": ""
},
"require": {
@@ -369,7 +369,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-dompdf/issues",
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.0"
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.1"
},
"funding": [
{
@@ -381,7 +381,7 @@
"type": "github"
}
],
"time": "2024-03-04T08:18:20+00:00"
"time": "2024-03-15T12:48:39+00:00"
},
{
"name": "beste/clock",
@@ -955,16 +955,16 @@
},
{
"name": "cknow/laravel-money",
"version": "v7.2.0",
"version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/cknow/laravel-money.git",
"reference": "d54ebc59342ed2a68647cc878444ef48af9f21ef"
"reference": "82d506202f95e8b6977a9ffffcdbd218bc58bdc5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cknow/laravel-money/zipball/d54ebc59342ed2a68647cc878444ef48af9f21ef",
"reference": "d54ebc59342ed2a68647cc878444ef48af9f21ef",
"url": "https://api.github.com/repos/cknow/laravel-money/zipball/82d506202f95e8b6977a9ffffcdbd218bc58bdc5",
"reference": "82d506202f95e8b6977a9ffffcdbd218bc58bdc5",
"shasum": ""
},
"require": {
@@ -1017,9 +1017,9 @@
],
"support": {
"issues": "https://github.com/cknow/laravel-money/issues",
"source": "https://github.com/cknow/laravel-money/tree/v7.2.0"
"source": "https://github.com/cknow/laravel-money/tree/v7.2.1"
},
"time": "2023-08-18T11:13:55+00:00"
"time": "2024-03-16T12:43:13+00:00"
},
{
"name": "clue/stream-filter",
@@ -2494,16 +2494,16 @@
},
{
"name": "fleetbase/fleetops-api",
"version": "0.4.20",
"version": "0.4.21",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops.git",
"reference": "fd2f1ea300db6079a78d0917fd3d06fac3406431"
"reference": "90dad6b62cacd095e7f327002b1512008acc3a66"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/fd2f1ea300db6079a78d0917fd3d06fac3406431",
"reference": "fd2f1ea300db6079a78d0917fd3d06fac3406431",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/90dad6b62cacd095e7f327002b1512008acc3a66",
"reference": "90dad6b62cacd095e7f327002b1512008acc3a66",
"shasum": ""
},
"require": {
@@ -2577,9 +2577,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops/issues",
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.20"
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.21"
},
"time": "2024-03-15T08:42:01+00:00"
"time": "2024-03-17T04:14:08+00:00"
},
{
"name": "fleetbase/internals-api",
@@ -3486,16 +3486,16 @@
},
{
"name": "google/cloud-core",
"version": "v1.56.1",
"version": "v1.56.2",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-cloud-php-core.git",
"reference": "c1ac9c2b89734b5e5f826af9919ae59cbaaadadc"
"reference": "686ffd0bb1328cd2ee963c4444e2ab4b111ba3ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/c1ac9c2b89734b5e5f826af9919ae59cbaaadadc",
"reference": "c1ac9c2b89734b5e5f826af9919ae59cbaaadadc",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/686ffd0bb1328cd2ee963c4444e2ab4b111ba3ba",
"reference": "686ffd0bb1328cd2ee963c4444e2ab4b111ba3ba",
"shasum": ""
},
"require": {
@@ -3546,22 +3546,22 @@
],
"description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
"support": {
"source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.56.1"
"source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.56.2"
},
"time": "2024-03-01T11:25:35+00:00"
"time": "2024-03-15T18:39:38+00:00"
},
{
"name": "google/cloud-storage",
"version": "v1.39.1",
"version": "v1.40.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-cloud-php-storage.git",
"reference": "448e0db09e598c796aa7c68eaf20fdf9b10296ef"
"reference": "fb2cc48fbdda164d457df3107464b3d205a25529"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/448e0db09e598c796aa7c68eaf20fdf9b10296ef",
"reference": "448e0db09e598c796aa7c68eaf20fdf9b10296ef",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/fb2cc48fbdda164d457df3107464b3d205a25529",
"reference": "fb2cc48fbdda164d457df3107464b3d205a25529",
"shasum": ""
},
"require": {
@@ -3603,9 +3603,9 @@
],
"description": "Cloud Storage Client for PHP",
"support": {
"source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.39.1"
"source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.40.0"
},
"time": "2024-03-01T11:25:35+00:00"
"time": "2024-03-15T18:39:38+00:00"
},
{
"name": "google/common-protos",
@@ -5357,16 +5357,16 @@
},
{
"name": "laravel/framework",
"version": "v10.48.2",
"version": "v10.48.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "32a8bb151d748b579c3794dea53b56bd40dfbbd3"
"reference": "5791c052b41c6b593556adc687076bfbdd13c501"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/32a8bb151d748b579c3794dea53b56bd40dfbbd3",
"reference": "32a8bb151d748b579c3794dea53b56bd40dfbbd3",
"url": "https://api.github.com/repos/laravel/framework/zipball/5791c052b41c6b593556adc687076bfbdd13c501",
"reference": "5791c052b41c6b593556adc687076bfbdd13c501",
"shasum": ""
},
"require": {
@@ -5560,7 +5560,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-03-12T16:35:43+00:00"
"time": "2024-03-15T10:17:07+00:00"
},
{
"name": "laravel/octane",
@@ -6226,16 +6226,16 @@
},
{
"name": "league/flysystem",
"version": "3.25.0",
"version": "3.25.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "4c44347133618cccd9b3df1729647a1577b4ad99"
"reference": "abbd664eb4381102c559d358420989f835208f18"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4c44347133618cccd9b3df1729647a1577b4ad99",
"reference": "4c44347133618cccd9b3df1729647a1577b4ad99",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/abbd664eb4381102c559d358420989f835208f18",
"reference": "abbd664eb4381102c559d358420989f835208f18",
"shasum": ""
},
"require": {
@@ -6300,7 +6300,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.25.0"
"source": "https://github.com/thephpleague/flysystem/tree/3.25.1"
},
"funding": [
{
@@ -6312,20 +6312,20 @@
"type": "github"
}
],
"time": "2024-03-09T17:06:45+00:00"
"time": "2024-03-16T12:53:19+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
"version": "3.24.0",
"version": "3.25.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
"reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"
"reference": "6a5be0e6d6a93574e80805c9cc108a4b63c824d8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
"reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
"url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/6a5be0e6d6a93574e80805c9cc108a4b63c824d8",
"reference": "6a5be0e6d6a93574e80805c9cc108a4b63c824d8",
"shasum": ""
},
"require": {
@@ -6365,7 +6365,7 @@
"storage"
],
"support": {
"source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.24.0"
"source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.25.1"
},
"funding": [
{
@@ -6377,20 +6377,20 @@
"type": "github"
}
],
"time": "2024-01-26T18:43:21+00:00"
"time": "2024-03-15T19:58:44+00:00"
},
{
"name": "league/flysystem-google-cloud-storage",
"version": "3.23.1",
"version": "3.25.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-google-cloud-storage.git",
"reference": "d13af3a410dce938f0b03f93d9e0e943e535f0c5"
"reference": "4b201fb9abc1a8162f227c28855035117a29ae65"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-google-cloud-storage/zipball/d13af3a410dce938f0b03f93d9e0e943e535f0c5",
"reference": "d13af3a410dce938f0b03f93d9e0e943e535f0c5",
"url": "https://api.github.com/repos/thephpleague/flysystem-google-cloud-storage/zipball/4b201fb9abc1a8162f227c28855035117a29ae65",
"reference": "4b201fb9abc1a8162f227c28855035117a29ae65",
"shasum": ""
},
"require": {
@@ -6423,8 +6423,7 @@
"google cloud storage"
],
"support": {
"issues": "https://github.com/thephpleague/flysystem-google-cloud-storage/issues",
"source": "https://github.com/thephpleague/flysystem-google-cloud-storage/tree/3.23.1"
"source": "https://github.com/thephpleague/flysystem-google-cloud-storage/tree/3.25.1"
},
"funding": [
{
@@ -6436,20 +6435,20 @@
"type": "github"
}
],
"time": "2024-01-26T18:25:23+00:00"
"time": "2024-03-15T19:58:44+00:00"
},
{
"name": "league/flysystem-local",
"version": "3.23.1",
"version": "3.25.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-local.git",
"reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00"
"reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/b884d2bf9b53bb4804a56d2df4902bb51e253f00",
"reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00",
"url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92",
"reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92",
"shasum": ""
},
"require": {
@@ -6483,8 +6482,7 @@
"local"
],
"support": {
"issues": "https://github.com/thephpleague/flysystem-local/issues",
"source": "https://github.com/thephpleague/flysystem-local/tree/3.23.1"
"source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1"
},
"funding": [
{
@@ -6496,7 +6494,7 @@
"type": "github"
}
],
"time": "2024-01-26T18:25:23+00:00"
"time": "2024-03-15T19:58:44+00:00"
},
{
"name": "league/geotools",
@@ -8580,16 +8578,16 @@
},
{
"name": "php-http/promise",
"version": "1.3.0",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/php-http/promise.git",
"reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07"
"reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/promise/zipball/2916a606d3b390f4e9e8e2b8dd68581508be0f07",
"reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07",
"url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
"reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
"shasum": ""
},
"require": {
@@ -8626,9 +8624,9 @@
],
"support": {
"issues": "https://github.com/php-http/promise/issues",
"source": "https://github.com/php-http/promise/tree/1.3.0"
"source": "https://github.com/php-http/promise/tree/1.3.1"
},
"time": "2024-01-04T18:49:48+00:00"
"time": "2024-03-15T13:55:21+00:00"
},
{
"name": "phpoffice/phpspreadsheet",
@@ -9911,16 +9909,16 @@
},
{
"name": "psy/psysh",
"version": "v0.12.1",
"version": "v0.12.2",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "39621c73e0754328252f032c6997b983afc50431"
"reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/39621c73e0754328252f032c6997b983afc50431",
"reference": "39621c73e0754328252f032c6997b983afc50431",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/9185c66c2165bbf4d71de78a69dccf4974f9538d",
"reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d",
"shasum": ""
},
"require": {
@@ -9984,9 +9982,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.12.1"
"source": "https://github.com/bobthecow/psysh/tree/v0.12.2"
},
"time": "2024-03-15T03:22:57+00:00"
"time": "2024-03-17T01:53:00+00:00"
},
{
"name": "ralouphie/getallheaders",

4
console/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@fleetbase/console",
"version": "0.4.13",
"version": "0.4.14",
"private": true,
"description": "Fleetbase Console",
"repository": "https://github.com/fleetbase/fleetbase",
@@ -31,7 +31,7 @@
"dependencies": {
"@fleetbase/ember-core": "^0.2.8",
"@fleetbase/ember-ui": "^0.2.11",
"@fleetbase/fleetops-engine": "^0.4.20",
"@fleetbase/fleetops-engine": "^0.4.21",
"@fleetbase/fleetops-data": "^0.1.14",
"@fleetbase/storefront-engine": "^0.3.5",
"@fleetbase/dev-engine": "^0.2.1",

8
console/pnpm-lock.yaml generated
View File

@@ -25,8 +25,8 @@ dependencies:
specifier: ^0.1.14
version: 0.1.14
'@fleetbase/fleetops-engine':
specifier: ^0.4.20
version: 0.4.20(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
specifier: ^0.4.21
version: 0.4.21(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
'@fleetbase/iam-engine':
specifier: ^0.0.9
version: 0.0.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
@@ -2854,8 +2854,8 @@ packages:
- supports-color
dev: false
/@fleetbase/fleetops-engine@0.4.20(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
resolution: {integrity: sha512-gCQgslcRXTNQymrrPY3UbnvDpGW2OZ+D5PlWV7TE6gxt8KHzV3lYJLwzTbFvilpKYBFa6rY5Z7PH0yoIoCO9uA==, tarball: https://npm.pkg.github.com/download/@fleetbase/fleetops-engine/0.4.20/e3e58e2b30aa3b35e26aeb3b5063b1e3c2a3b3bd}
/@fleetbase/fleetops-engine@0.4.21(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
resolution: {integrity: sha512-tFAh/qr7mN2wmDtI5xazc36zqL4Xe++CfCt1VlU0bcBkBP6dl2lLjIQIshjGB1VQgMDootegJQbp6PZLMNiooQ==, tarball: https://npm.pkg.github.com/download/@fleetbase/fleetops-engine/0.4.21/f13b900e938cc9abff2a1a62c17270a012349efb}
engines: {node: '>= 18'}
peerDependencies:
ember-engines: ^0.9.0