Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-02 22:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7907 from turbo124/v5-develop

Browse Source 
v5.5.36
This commit is contained in:
David Bomba 2022-10-30 09:53:25 +11:00 committed by GitHub
commit b0b00a4faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.5.35 5.5.36

7
app/Exceptions/Handler.php
View File

@ -205,11 +205,14 @@ class Handler extends ExceptionHandler
return response()->json(['message' => $exception->getMessage()], 400); return response()->json(['message' => $exception->getMessage()], 400);
} elseif ($exception instanceof StripeConnectFailure) { } elseif ($exception instanceof StripeConnectFailure) {
return response()->json(['message' => $exception->getMessage()], 400); return response()->json(['message' => $exception->getMessage()], 400);
} elseif ($exception instanceof QueryException) {
return response()->json(['message' => 'We had a problem executing this query. Please retry.'], 500);
} }
// elseif ($exception instanceof QueryException) {
// return response()->json(['message' => 'We had a problem executing this query. Please retry.'], 500);
// }
return parent::render($request, $exception); return parent::render($request, $exception);
} }

2
app/Http/Requests/Setup/StoreSetupRequest.php
View File

@ -43,7 +43,7 @@ class StoreSetupRequest extends Request
'terms_of_service' => 'required', 'terms_of_service' => 'required',
'first_name' => 'required', 'first_name' => 'required',
'last_name' => 'required', 'last_name' => 'required',
'email' => 'required|email:rfc,dns', 'email' => 'required|email',
'password' => 'required', 'password' => 'required',
]; ];

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.5.35', 'app_version' => '5.5.36',
'app_tag' => '5.5.35', 'app_tag' => '5.5.36',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),