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

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

Browse Source
This commit is contained in:
= 2020-12-30 08:32:33 +11:00
commit 02ef83213a
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Constants.php
View File

@ -361,7 +361,7 @@ if (! defined('APP_NAME')) {
define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest'));
define('NINJA_DATE', '2000-01-01'); define('NINJA_DATE', '2000-01-01');
define('NINJA_VERSION', '4.5.24' . env('NINJA_VERSION_SUFFIX')); define('NINJA_VERSION', '4.5.25' . env('NINJA_VERSION_SUFFIX'));
define('NINJA_TERMS_VERSION', '1.0.1'); define('NINJA_TERMS_VERSION', '1.0.1');
define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));

2
docs/conf.py
View File

@ -59,7 +59,7 @@ author = u'Invoice Ninja'
# The short X.Y version. # The short X.Y version.
version = u'4.5' version = u'4.5'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = u'4.5.24' release = u'4.5.25'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

14
resources/lang/en/texts.php
View File

@ -3882,6 +3882,20 @@ $LANG = array(
'restored_invoices' => 'Successfully restored :value invoices', 'restored_invoices' => 'Successfully restored :value invoices',
'restored_payments' => 'Successfully restored :value payments', 'restored_payments' => 'Successfully restored :value payments',
'restored_quotes' => 'Successfully restored :value quotes', 'restored_quotes' => 'Successfully restored :value quotes',
'update_app' => 'Update App',
'started_import' => 'Successfully started import',
'duplicate_column_mapping' => 'Duplicate column mapping',
'uses_inclusive_taxes' => 'Uses Inclusive Taxes',
'is_amount_discount' => 'Is Amount Discount',
'map_to' => 'Map To',
'first_row_as_column_names' => 'Use first row as column names',
'no_file_selected' => 'No File Selected',
'import_type' => 'Import Type',
'draft_mode' => 'Draft Mode',
'draft_mode_help' => 'Preview updates faster but is less accurate',
'show_product_discount' => 'Show Product Discount',
'show_product_discount_help' => 'Display a line item discount field',
'tax_name3' => 'Tax Name 3',
); );
return $LANG; return $LANG;