diff --git a/CHANGELOG.md b/CHANGELOG.md index b57b07d91a..80f72c0a53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -298,7 +298,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Bug in the mass edit routines. -- Firefly III over a proxy will now work (see [issue #290](https://github.com/JC5/firefly-iii/issues/290)), thanks @dfiel for reporting. +- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks @dfiel for reporting. - Sneaky bug in the import routine, fixed by @Bonno ## [3.10.1] - 2016-08-25 diff --git a/composer.json b/composer.json index 27a784e1bf..af2091da01 100755 --- a/composer.json +++ b/composer.json @@ -15,13 +15,13 @@ "management" ], "license": "MIT", - "homepage": "https://github.com/JC5/firefly-iii", + "homepage": "https://github.com/firefly-iii/firefly-iii", "type": "project", "authors": [ { "name": "James Cole", "email": "thegrumpydictator@gmail.com", - "homepage": "https://github.com/JC5", + "homepage": "https://github.com/firefly-iii", "role": "Developer" } ], diff --git a/config/upgrade.php b/config/upgrade.php index a36422fe29..e88f92c76e 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -12,12 +12,5 @@ declare(strict_types = 1); return [ - 'text' => [ - '3.7' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' . - 'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0', - '3.8' => 'This version of Firefly III requires PHP 7.0.', - '3.10' => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.10', - '4.0' => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-4.0', - '4.1' => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-4.0', - ], + 'text' => [], ]; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index cf3c1515a1..83bd9a8185 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -84,7 +84,7 @@ return [ 'destination_accounts' => 'Destination account(s)', 'user_id_is' => 'Your user id is :user', 'field_supports_markdown' => 'This field supports Markdown.', - 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.', + 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.', 'nothing_to_display' => 'There are no transactions to show you', 'show_all_no_filter' => 'Show all transactions without grouping them by date.', 'expenses_by_category' => 'Expenses by category', diff --git a/resources/views/emails/error-html.twig b/resources/views/emails/error-html.twig index fa7a6e1829..afc890506a 100644 --- a/resources/views/emails/error-html.twig +++ b/resources/views/emails/error-html.twig @@ -34,7 +34,7 @@ This can help fix the bug you just encountered.

- If you prefer, you can also open a new issue on Github. + If you prefer, you can also open a new issue on Github.

diff --git a/resources/views/emails/error-text.twig b/resources/views/emails/error-text.twig index 9f299a377e..913d54d741 100644 --- a/resources/views/emails/error-text.twig +++ b/resources/views/emails/error-text.twig @@ -21,7 +21,7 @@ the bug you just encountered. If you prefer, you can also open a new issue here: -https://github.com/JC5/firefly-iii/issues/new +https://github.com/firefly-iii/firefly-iii/issues/new The full stacktrace is below: diff --git a/resources/views/emails/registered-html.twig b/resources/views/emails/registered-html.twig index fcc1688488..4aec81c009 100644 --- a/resources/views/emails/registered-html.twig +++ b/resources/views/emails/registered-html.twig @@ -12,13 +12,7 @@ There is a help-icon in the top right corner of each page. If you need help, click it!

  • - If you haven't already, please read the - first use guide and the - full description. -
    • -
  • - If this installation of Firefly is configured to send activation mails as well, you should get an activation - link very soon! + If you haven't already, please read the full description.
    • {% include 'emails.footer-html' %} diff --git a/resources/views/emails/registered-text.twig b/resources/views/emails/registered-text.twig index 8c2aa00143..4877bf52fd 100644 --- a/resources/views/emails/registered-text.twig +++ b/resources/views/emails/registered-text.twig @@ -14,8 +14,7 @@ Password reset: {{ address }}/password/reset Documentation: -https://github.com/JC5/firefly-iii/wiki/First-use -http://jc5.github.io/firefly-iii//description/ +https://github.com/firefly-iii/firefly-iii +https://firefly-iii.github.io/ -The registration has been created from IP {{ ip }} {% include 'emails.footer-text' %} diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index 58c2d5c7e6..0295b5059c 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -139,7 +139,7 @@ - Firefly III + Firefly III {% include('partials.control-bar') %}