From 7401e632b488b26bb06f4b71a121571bc610eb33 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 26 Jul 2018 18:41:30 +0300 Subject: [PATCH] Fix links to docs --- README.md | 10 +++++----- app/Constants.php | 2 +- app/Models/Gateway.php | 2 ++ docs/install.rst | 2 +- resources/views/accounts/email_settings.blade.php | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b432daf139..93171568fa 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # Invoice Ninja [![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=master)](https://travis-ci.org/invoiceninja/invoiceninja) -[![Docs](https://readthedocs.org/projects/invoice-ninja/badge/?version=latest)](http://docs.invoiceninja.com/en/latest/?badge=latest) +[![Docs](https://readthedocs.org/projects/invoice-ninja/badge/?version=latest)](https://invoice-ninja.readthedocs.io/en/latest/?badge=latest) ## [Hosted](https://www.invoiceninja.com) | [Self-Hosted](https://www.invoiceninja.org) @@ -17,7 +17,7 @@ The self-host zip includes all third party libraries whereas downloading the cod * [Features](https://www.invoiceninja.com/invoicing-features/) * [Videos](https://www.youtube.com/channel/UCXAHcBvhW05PDtWYIq7WDFA/videos) -* [User Guide](http://docs.invoiceninja.com/en/latest/) +* [User Guide](https://invoice-ninja.readthedocs.io/en/latest/) * [Support Forum](https://www.invoiceninja.com/forums/forum/support/) * [Roadmap](https://trello.com/b/63BbiVVe/) @@ -37,7 +37,7 @@ The self-host zip includes all third party libraries whereas downloading the cod ## Installation Options * [Ansible](https://github.com/invoiceninja/ansible-installer) -* [Self-Host Zip](http://docs.invoiceninja.com/en/latest/install.html) +* [Self-Host Zip](https://invoice-ninja.readthedocs.io/en/latest/install.html) * [Docker File](https://hub.docker.com/r/invoiceninja/invoiceninja/) * [Cloudron](https://cloudron.io/store/com.invoiceninja.cloudronapp.html) * [Softaculous](https://www.softaculous.com/apps/ecommerce/Invoice_Ninja) @@ -47,10 +47,10 @@ The self-host zip includes all third party libraries whereas downloading the cod * [Postmark](https://postmarkapp.com/) ## Development -* [API Documentation](http://docs.invoiceninja.com/en/latest/api.html) +* [API Documentation](https://invoice-ninja.readthedocs.io/en/latest/api.html) * [PHP SDK](https://github.com/invoiceninja/sdk-php) * [Zend Framework](https://github.com/alexz707/InvoiceNinjaModule) -* [Custom Module](http://docs.invoiceninja.com/en/latest/custom_modules.html) | [Watch Video](https://www.youtube.com/watch?v=8jJ-PYuq85k) +* [Custom Module](https://invoice-ninja.readthedocs.io/en/latest/custom_modules.html) | [Watch Video](https://www.youtube.com/watch?v=8jJ-PYuq85k) ## Third Party Modules * [Event Scheduler](https://github.com/cytech/Scheduler-InvoiceNinja) diff --git a/app/Constants.php b/app/Constants.php index 8975b183ce..1a23f5f8e2 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -359,7 +359,7 @@ if (! defined('APP_NAME')) { define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG'); define('NINJA_WEB_URL', env('NINJA_WEB_URL', 'https://www.invoiceninja.com')); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); - define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/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_VERSION', '4.5.1' . env('NINJA_VERSION_SUFFIX')); define('NINJA_TERMS_VERSION', '1.0.1'); diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php index e42675e828..1df60b53f2 100644 --- a/app/Models/Gateway.php +++ b/app/Models/Gateway.php @@ -95,6 +95,8 @@ class Gateway extends Eloquent 'sandbox', // Payfast 'pdtKey', + // Realex + '3dSecure', ]; /** diff --git a/docs/install.rst b/docs/install.rst index e8f09e08a4..036d0a84b7 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -79,7 +79,7 @@ Once you can access the site the initial setup screen will enable you to configu Step 5: Configure the application """"""""""""""""""""""""""""""""" -See the `details here `_ for additional configuration options. +See the `details here `_ for additional configuration options. Step 6: Enable auto updates """"""""""""""""""""""""""" diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php index 1670783cea..33252b72db 100644 --- a/resources/views/accounts/email_settings.blade.php +++ b/resources/views/accounts/email_settings.blade.php @@ -50,7 +50,7 @@ ->value(1) ->help(Utils::isNinjaProd() ? '' : (config('pdf.phantomjs.bin_path') ? (config('pdf.phantomjs.cloud_key') ? trans('texts.phantomjs_local_and_cloud') : trans('texts.phantomjs_local')) : trans('texts.phantomjs_help', [ 'link_phantom' => link_to('https://phantomjscloud.com/', 'phantomjscloud.com', ['target' => '_blank']), - 'link_docs' => link_to('http://docs.invoiceninja.com/en/latest/configure.html#phantomjs', 'PhantomJS', ['target' => '_blank']) + 'link_docs' => link_to('https://invoice-ninja.readthedocs.io/en/latest/configure.html#phantomjs', 'PhantomJS', ['target' => '_blank']) ])) . ' | ' . link_to('/test_headless', trans('texts.test'), ['target' => '_blank'])) !!} {!! Former::checkbox('document_email_attachment')