diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f715742ead1..3e3a8de51c0 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,7 +4,7 @@ ## Feature requests -I am always interested in expanding Firefly III's many features. If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/). +I am always interested in expanding Firefly III's many features. If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.org/requested-features/). ## Pull requests diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md index 7b7759dcb8d..8538d150bdd 100644 --- a/.github/SUPPORT.md +++ b/.github/SUPPORT.md @@ -4,8 +4,8 @@ ## Bugs -First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://firefly-iii.nder.be/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority! +First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority! ## Installation problems -Please take the time to read the [installation guide FAQ](https://firefly-iii.github.io/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can. \ No newline at end of file +Please take the time to read the [installation guide FAQ](https://firefly-iii.org/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can. \ No newline at end of file diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index aa56b258ea2..85220dd1bf0 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -41,7 +41,7 @@ const pkgdef :Spk.PackageDefinition = ( market = (png = (dpi1x = embed "app-graphics/firefly-iii-150.png")) ), - website = "https://firefly-iii.github.io/", + website = "https://firefly-iii.org/", codeUrl = "https://github.com/firefly-iii/firefly-iii", license = (openSource = gpl3), # The license this package is distributed under. See diff --git a/README.md b/README.md index e6f1882923e..42ed976bcb0 100644 --- a/README.md +++ b/README.md @@ -13,17 +13,17 @@ There are many financial reports available. ## Want to try Firefly III? -There is a **[demo site](https://firefly-iii.nder.be)** with an example financial administration already present. You can use Docker, Heroku or Sandstorm.io (see below) to quickly setup your own instance. +There is a **[demo site](https://demo.firefly-iii.org)** with an example financial administration already present. You can use Docker, Heroku or Sandstorm.io (see below) to quickly setup your own instance. ## Install Firefly III ### Using docker -You can use docker-compose to [set up your personal secure](https://firefly-iii.github.io/using-docker.html) Firefly III environment. Advanced users can use the Dockerfile directly. +You can use docker-compose to [set up your personal secure](https://firefly-iii.org/using-docker.html) Firefly III environment. Advanced users can use the Dockerfile directly. ### Using vagrant (or other VMs) -You can install Firefly III on any Linux or Windows machine. You'll need a web server (preferrably on Linux) and access to the command line. Please read the [installation guide](https://firefly-iii.github.io/using-installing.html). +You can install Firefly III on any Linux or Windows machine. You'll need a web server (preferrably on Linux) and access to the command line. Please read the [installation guide](https://firefly-iii.org/using-installing.html). ### Using Heroku @@ -53,7 +53,7 @@ Firefly works on the principle that if you know where you're money is going, you - If you feel you're missing something you can just ask me and I'll add it! Firefly III has become pretty awesome over the years! (but please excuse me for bragging, it's just that I'm proud of it). -[You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/). +[You can read more about Firefly III, and its features, on the website](https://firefly-iii.org/). ### Contributing diff --git a/app.json b/app.json index 4843baa8d66..82677845eb7 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "name": "Firefly III", "description": "A free and open source personal finances manager", "repository": "https://github.com/firefly-iii/firefly-iii", - "website": "https://firefly-iii.github.io/", + "website": "https://firefly-iii.org/", "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png", "keywords": [ "finance", diff --git a/resources/views/emails/registered-html.twig b/resources/views/emails/registered-html.twig index 4aec81c009e..5274b801b75 100644 --- a/resources/views/emails/registered-html.twig +++ b/resources/views/emails/registered-html.twig @@ -12,7 +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 full description. + 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 4877bf52fd1..c750538f658 100644 --- a/resources/views/emails/registered-text.twig +++ b/resources/views/emails/registered-text.twig @@ -15,6 +15,6 @@ Password reset: Documentation: https://github.com/firefly-iii/firefly-iii -https://firefly-iii.github.io/ +https://firefly-iii.org/ {% include 'emails.footer-text' %}