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-07-25 18:43:36 +08:00
parent 6d13f22a98 451c95d0f0
commit 97dfbedd1a
12 changed files with 104 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/composer.json
View File

@@ -9,9 +9,9 @@
"license": "AGPL-3.0-or-later",
"require": {
"php": "^8.0",
"fleetbase/core-api": "^1.4.30",
"fleetbase/fleetops-api": "^0.5.4",
"fleetbase/registry-bridge": "^0.0.8",
"fleetbase/core-api": "^1.5.0",
"fleetbase/fleetops-api": "^0.5.5",
"fleetbase/registry-bridge": "^0.0.9",
"fleetbase/storefront-api": "^0.3.13",
"fleetbase/billing-api": "^0.1.0",
"fleetbase/internals-api": "^0.0.4",

94
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": "8be9af50697be06266308b06a89bb748",
"content-hash": "2f82c03b93ddb1a4c2efd95fe0a84190",
"packages": [
{
"name": "aloha/twilio",
@@ -2471,16 +2471,16 @@
},
{
"name": "fleetbase/core-api",
"version": "1.4.30",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/core-api.git",
"reference": "83577d0640a13c71be0569a844ce2db051bbe0ca"
"reference": "c8aac9816919e62de765a721e494a107bc9f826d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/83577d0640a13c71be0569a844ce2db051bbe0ca",
"reference": "83577d0640a13c71be0569a844ce2db051bbe0ca",
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/c8aac9816919e62de765a721e494a107bc9f826d",
"reference": "c8aac9816919e62de765a721e494a107bc9f826d",
"shasum": ""
},
"require": {
@@ -2563,29 +2563,29 @@
],
"support": {
"issues": "https://github.com/fleetbase/core-api/issues",
"source": "https://github.com/fleetbase/core-api/tree/v1.4.30"
"source": "https://github.com/fleetbase/core-api/tree/v1.5.0"
},
"time": "2024-07-19T08:00:43+00:00"
"time": "2024-07-25T09:15:34+00:00"
},
{
"name": "fleetbase/fleetops-api",
"version": "0.5.4",
"version": "0.5.5",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops.git",
"reference": "5ac7dd0d4e7c014bb62439bb8788e66ea6878853"
"reference": "65f667d55777a7284f52ca3bc35a0059422d1577"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/5ac7dd0d4e7c014bb62439bb8788e66ea6878853",
"reference": "5ac7dd0d4e7c014bb62439bb8788e66ea6878853",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/65f667d55777a7284f52ca3bc35a0059422d1577",
"reference": "65f667d55777a7284f52ca3bc35a0059422d1577",
"shasum": ""
},
"require": {
"barryvdh/laravel-dompdf": "^2.0",
"brick/geo": "0.7.2",
"cknow/laravel-money": "^7.1",
"fleetbase/core-api": "^1.4.30",
"fleetbase/core-api": "^1.5.0",
"geocoder-php/google-maps-places-provider": "^1.4",
"giggsey/libphonenumber-for-php": "^8.13",
"league/geotools": "^1.1.0",
@@ -2652,9 +2652,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops/issues",
"source": "https://github.com/fleetbase/fleetops/tree/v0.5.4"
"source": "https://github.com/fleetbase/fleetops/tree/v0.5.5"
},
"time": "2024-07-19T08:12:03+00:00"
"time": "2024-07-25T09:30:53+00:00"
},
{
"name": "fleetbase/internals-api",
@@ -2827,20 +2827,20 @@
},
{
"name": "fleetbase/registry-bridge",
"version": "0.0.8",
"version": "0.0.9",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/registry-bridge.git",
"reference": "ba548736aa64e057b40549d77b31bd0e22fbd28c"
"reference": "b35e0da42b2659a753092d7a20c5e91210944dde"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/registry-bridge/zipball/ba548736aa64e057b40549d77b31bd0e22fbd28c",
"reference": "ba548736aa64e057b40549d77b31bd0e22fbd28c",
"url": "https://api.github.com/repos/fleetbase/registry-bridge/zipball/b35e0da42b2659a753092d7a20c5e91210944dde",
"reference": "b35e0da42b2659a753092d7a20c5e91210944dde",
"shasum": ""
},
"require": {
"fleetbase/core-api": "^1.4.30",
"fleetbase/core-api": "^1.5.0",
"laravel/cashier": "^15.2.1",
"php": "^8.0",
"php-http/guzzle7-adapter": "^1.0",
@@ -2903,9 +2903,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/registry-bridge/issues",
"source": "https://github.com/fleetbase/registry-bridge/tree/v0.0.8"
"source": "https://github.com/fleetbase/registry-bridge/tree/v0.0.9"
},
"time": "2024-07-20T05:27:42+00:00"
"time": "2024-07-25T10:05:10+00:00"
},
{
"name": "fleetbase/storefront-api",
@@ -3589,16 +3589,16 @@
},
{
"name": "giggsey/libphonenumber-for-php",
"version": "8.13.40",
"version": "8.13.41",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
"reference": "795e0b760e5c439b6fa1ffa787c1d90c2face1ff"
"reference": "d7131cda85cf9244e7c97d73edd14d8dad73640c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/795e0b760e5c439b6fa1ffa787c1d90c2face1ff",
"reference": "795e0b760e5c439b6fa1ffa787c1d90c2face1ff",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/d7131cda85cf9244e7c97d73edd14d8dad73640c",
"reference": "d7131cda85cf9244e7c97d73edd14d8dad73640c",
"shasum": ""
},
"require": {
@@ -3660,7 +3660,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php"
},
"time": "2024-07-01T11:38:07+00:00"
"time": "2024-07-24T12:24:43+00:00"
},
{
"name": "giggsey/locale",
@@ -4249,16 +4249,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.9.1",
"version": "7.9.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc"
"reference": "d281ed313b989f213357e3be1a179f02196ac99b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a629e5b69db96eb4939c1b34114130077dd4c6fc",
"reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
"reference": "d281ed313b989f213357e3be1a179f02196ac99b",
"shasum": ""
},
"require": {
@@ -4355,7 +4355,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.9.1"
"source": "https://github.com/guzzle/guzzle/tree/7.9.2"
},
"funding": [
{
@@ -4371,7 +4371,7 @@
"type": "tidelift"
}
],
"time": "2024-07-19T16:19:57+00:00"
"time": "2024-07-24T11:22:20+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -5651,16 +5651,16 @@
},
{
"name": "laravel/framework",
"version": "v10.48.16",
"version": "v10.48.17",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "f9a3a50fae399d75e125b0eea637dda90c99eae7"
"reference": "60f3c8f667b24a09e0392e26b1f40fb9067cdc3c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/f9a3a50fae399d75e125b0eea637dda90c99eae7",
"reference": "f9a3a50fae399d75e125b0eea637dda90c99eae7",
"url": "https://api.github.com/repos/laravel/framework/zipball/60f3c8f667b24a09e0392e26b1f40fb9067cdc3c",
"reference": "60f3c8f667b24a09e0392e26b1f40fb9067cdc3c",
"shasum": ""
},
"require": {
@@ -5854,7 +5854,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-07-09T15:25:22+00:00"
"time": "2024-07-23T16:06:06+00:00"
},
{
"name": "laravel/octane",
@@ -6271,16 +6271,16 @@
},
{
"name": "league/commonmark",
"version": "2.5.0",
"version": "2.5.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "0026475f5c9a104410ae824cb5a4d63fa3bdb1df"
"reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/0026475f5c9a104410ae824cb5a4d63fa3bdb1df",
"reference": "0026475f5c9a104410ae824cb5a4d63fa3bdb1df",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ac815920de0eff6de947eac0a6a94e5ed0fb147c",
"reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c",
"shasum": ""
},
"require": {
@@ -6373,7 +6373,7 @@
"type": "tidelift"
}
],
"time": "2024-07-22T18:18:14+00:00"
"time": "2024-07-24T12:52:09+00:00"
},
{
"name": "league/config",
@@ -15776,16 +15776,16 @@
},
{
"name": "laravel/sail",
"version": "v1.30.2",
"version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
"reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887"
"reference": "48d89608a3bb5be763c9bb87121d31e7da27c1cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887",
"reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887",
"url": "https://api.github.com/repos/laravel/sail/zipball/48d89608a3bb5be763c9bb87121d31e7da27c1cb",
"reference": "48d89608a3bb5be763c9bb87121d31e7da27c1cb",
"shasum": ""
},
"require": {
@@ -15835,7 +15835,7 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
"time": "2024-07-05T16:01:51+00:00"
"time": "2024-07-22T14:36:50+00:00"
},
{
"name": "mockery/mockery",