Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10360 from turbo124/v5-develop 

v5.11.0
This commit is contained in:
David Bomba 2024-12-09 08:46:01 +11:00 committed by GitHub
parent 5b13a24ed4 90c3da574a
commit ca2af2e9fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/react_release.yml vendored
View File

@ -49,6 +49,7 @@ jobs:
cd ui cd ui
git checkout develop git checkout develop
sed -i 's/VITE_IS_TEST=true/VITE_IS_TEST=false/' .env.example sed -i 's/VITE_IS_TEST=true/VITE_IS_TEST=false/' .env.example
cp .env.example .env cp .env.example .env
cp ../vite.config.ts.react ./vite.config.js cp ../vite.config.ts.react ./vite.config.js
sed -i '/"version"/c\ "version": " Latest Build - ${{ env.current_date }}",' package.json sed -i '/"version"/c\ "version": " Latest Build - ${{ env.current_date }}",' package.json

2
VERSION.txt
View File

@ -1 +1 @@
5.10.62 5.11.0

2
app/Http/Controllers/ActivityController.php
View File

@ -132,6 +132,8 @@ class ActivityController extends BaseController
$file = $backup->getFile(); $file = $backup->getFile();
$html_backup = $file;
if(!$file) if(!$file)
return response()->json(['message' => ctrans('texts.no_backup_exists'), 'errors' => new stdClass()], 404); return response()->json(['message' => ctrans('texts.no_backup_exists'), 'errors' => new stdClass()], 404);

2
app/Models/Backup.php
View File

@ -73,7 +73,7 @@ class Backup extends BaseModel
$filename = now()->format('Y_m_d').'_'.md5(time()).'.html'; //@phpstan-ignore-line $filename = now()->format('Y_m_d').'_'.md5(time()).'.html'; //@phpstan-ignore-line
$file_path = $path.$filename; $file_path = $path.$filename;
$disk = Ninja::isHosted() ? config('filesystems.backup') : config('filesystems.default'); $disk = Ninja::isHosted() ? 'backup' : config('filesystems.default');
Storage::disk($disk)->put($file_path, $html); Storage::disk($disk)->put($file_path, $html);

4
config/ninja.php
View File

@ -17,8 +17,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.10.62'), 'app_version' => env('APP_VERSION', '5.11.0'),
'app_tag' => env('APP_TAG', '5.10.62'), 'app_tag' => env('APP_TAG', '5.11.0'),
'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', false), 'api_secret' => env('API_SECRET', false),