1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-23 18:01:35 +02:00

Merge pull request #7862 from turbo124/v5-stable

v5.5.30
This commit is contained in:
David Bomba 2022-10-09 12:34:31 +11:00 committed by GitHub
commit a1d786a42f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions

View File

@ -1 +1 @@
5.5.29
5.5.30

View File

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

View File

@ -3414,7 +3414,7 @@ $LANG = array(
'credit_number_counter' => 'Credit Number Counter',
'reset_counter_date' => 'Reset Counter Date',
'counter_padding' => 'Counter Padding',
'shared_invoice_quote_counter' => 'Shared Invoice Quote Counter',
'shared_invoice_quote_counter' => 'Share Invoice Quote Counter',
'default_tax_name_1' => 'Default Tax Name 1',
'default_tax_rate_1' => 'Default Tax Rate 1',
'default_tax_name_2' => 'Default Tax Name 2',
@ -4199,7 +4199,7 @@ $LANG = array(
'client_id_number' => 'Client ID Number',
'count_minutes' => ':count Minutes',
'password_timeout' => 'Password Timeout',
'shared_invoice_credit_counter' => 'Shared Invoice/Credit Counter',
'shared_invoice_credit_counter' => 'Share Invoice/Credit Counter',
'activity_80' => ':user created subscription :subscription',
'activity_81' => ':user updated subscription :subscription',
@ -4776,7 +4776,8 @@ $LANG = array(
'client_email' => 'Client Email',
'invoice_task_project' => 'Invoice Task Project',
'invoice_task_project_help' => 'Add the project to the invoice line items',
'bulk_action' => 'Bulk Action',
);
return $LANG;

View File

@ -43,7 +43,7 @@
@endsection
@section('gateway_footer')
@if($gateway->forte->company_gateway->getConfigField('testMode'))
@if($gateway->company_gateway->getConfigField('testMode'))
<script type="text/javascript" src="https://sandbox.forte.net/api/js/v1"></script>
@else
<script type="text/javascript" src="https://api.forte.net/js/v1"></script>