Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8814 from turbo124/v5-develop

Browse Source 
v5.7.16
This commit is contained in:
David Bomba 2023-09-20 16:36:56 +10:00 committed by GitHub
commit 4b6f04928f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.15 5.7.16

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -423,7 +423,7 @@ class LoginController extends BaseController
if ($user) { if ($user) {
$account = request()->input('account'); $account = request()->input('account');
$email = $user->getMail() ?: $user->getUserPrincipalName(); $email = $user->getUserPrincipalName() ?: $user->getMail();
$query = [ $query = [
'oauth_user_id' => $user->getId(), 'oauth_user_id' => $user->getId(),

4
config/ninja.php
View File

@ -15,8 +15,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' => env('APP_VERSION','5.7.15'), 'app_version' => env('APP_VERSION','5.7.16'),
'app_tag' => env('APP_TAG','5.7.15'), 'app_tag' => env('APP_TAG','5.7.16'),
'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', ''),