Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 00:53:10 +01:00
Code Issues Releases Activity

Merge branch 'v5-develop' into v5-stable

Browse Source
This commit is contained in:
David Bomba 2021-04-07 21:33:36 +10:00
commit 0c958ff73b
4 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.39
5.1.40

4
composer.json
View File

@ -41,7 +41,7 @@
"turbo124/laravel-gmail": "^5",
"doctrine/dbal": "^2.10",
"fideloper/proxy": "^4.2",
"fakerphp/faker": "^1.9.1",
"fakerphp/faker": "^1.14",
"google/apiclient": "^2.7",
"guzzlehttp/guzzle": "^7.0.1",
"hashids/hashids": "^4.0",
@ -79,7 +79,7 @@
"facade/ignition": "^2.3.6",
"filp/whoops": "^2.7",
"friendsofphp/php-cs-fixer": "^2.16",
"fzaninotto/faker": "^1.9.1",
"fakerphp/faker": "^1.14",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0",

52
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": "4abefd659932cc08bc942db44a78d06e",
"content-hash": "5a0dfc90f7a612df2b8cfe1013787e88",
"packages": [
{
"name": "authorizenet/authorizenet",
@ -1739,35 +1739,43 @@
},
{
"name": "fakerphp/faker",
"version": "v1.9.2",
"version": "v1.14.1",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
"reference": "84220cf137a9344acffb10374e781fed785ff307"
"reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/84220cf137a9344acffb10374e781fed785ff307",
"reference": "84220cf137a9344acffb10374e781fed785ff307",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
"reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0"
"php": "^7.1 || ^8.0",
"psr/container": "^1.0",
"symfony/deprecation-contracts": "^2.2"
},
"conflict": {
"ergebnis/faker": "!=1.9.2",
"fzaninotto/faker": "!=1.9.2"
},
"replace": {
"ergebnis/faker": "1.9.2",
"fzaninotto/faker": "1.9.2"
"fzaninotto/faker": "*"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4.1",
"ext-intl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7",
"squizlabs/php_codesniffer": "^2.9.2"
"symfony/phpunit-bridge": "^4.4 || ^5.2"
},
"suggest": {
"ext-curl": "Required by Faker\\Provider\\Image to download images.",
"ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
"ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
"ext-mbstring": "Required for multibyte Unicode string functionality."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "v1.15-dev"
}
},
"autoload": {
"psr-4": {
"Faker\\": "src/Faker/"
@ -1790,9 +1798,9 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
"source": "https://github.com/FakerPHP/Faker/tree/v1.9.2"
"source": "https://github.com/FakerPHP/Faker/tree/v.1.14.1"
},
"time": "2020-12-11T14:32:13+00:00"
"time": "2021-03-30T06:27:33+00:00"
},
{
"name": "fideloper/proxy",
@ -10366,16 +10374,16 @@
},
{
"name": "barryvdh/laravel-debugbar",
"version": "v3.5.4",
"version": "v3.5.5",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "b8af309dea71eab3f2c942652969f518130228ee"
"reference": "6420113d90bb746423fa70b9940e9e7c26ebc121"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b8af309dea71eab3f2c942652969f518130228ee",
"reference": "b8af309dea71eab3f2c942652969f518130228ee",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/6420113d90bb746423fa70b9940e9e7c26ebc121",
"reference": "6420113d90bb746423fa70b9940e9e7c26ebc121",
"shasum": ""
},
"require": {
@ -10435,7 +10443,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-debugbar/issues",
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.4"
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.5"
},
"funding": [
{
@ -10443,7 +10451,7 @@
"type": "github"
}
],
"time": "2021-04-06T18:11:42+00:00"
"time": "2021-04-07T11:19:20+00:00"
},
{
"name": "brianium/paratest",

2
config/ninja.php
View File

@ -14,7 +14,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.39',
'app_version' => '5.1.40',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),