Merge branch 'master' into dev

docs/_sources/changelog.md.txt

@@ -1,5 +1,26 @@
 # Change log
 
+## Version 0.6.12 (2022/09/14)
+
+### Issues Closed
+
+#### Bugs Fixed
+
+* [#230](https://github.com/SamR1/FitTrackee/issues/230) - Database problem after upgrade to 0.6.11
+
+### Pull Requests
+
+#### Misc
+
+* [#225](https://github.com/SamR1/FitTrackee/pull/225) - Fix grammar issue
+
+Thanks to @Skylan0916
+
+In this release 1 issue was closed.  
+**Note:** This release contains a fix on the last database migration that will be executed only on versions lower than v0.6.11 (no data differences with v0.6.11, the fix allows to execute the migration on Postgres<12)  
+(see upgrade instructions in [documentation](https://samr1.github.io/FitTrackee/installation.html#upgrade)).
+
+
 ## Version 0.6.11 (2022/07/27)
 
 ### Issues Closed

docs/_sources/installation.rst.txt

@@ -428,13 +428,13 @@ Production environment
 .. warning::
     | Note that FitTrackee is under heavy development, some features may be unstable.
 
--  Download the last release (for now, it is the release v0.6.11):
+-  Download the last release (for now, it is the release v0.6.12):
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.11.tar.gz
-   $ tar -xzf v0.6.11.tar.gz
-   $ mv FitTrackee-0.6.11 FitTrackee
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.12.tar.gz
+   $ tar -xzf v0.6.12.tar.gz
+   $ mv FitTrackee-0.6.12 FitTrackee
    $ cd FitTrackee
 
 -  Create **.env** from example and update it
@@ -554,13 +554,13 @@ Prod environment
 
 - Change to the directory where FitTrackee directory is located
 
-- Download the last release (for now, it is the release v0.6.11) and overwrite existing files:
+- Download the last release (for now, it is the release v0.6.12) and overwrite existing files:
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.11.tar.gz
-   $ tar -xzf v0.6.11.tar.gz
-   $ cp -R FitTrackee-0.6.11/* FitTrackee/
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.12.tar.gz
+   $ tar -xzf v0.6.12.tar.gz
+   $ cp -R FitTrackee-0.6.12/* FitTrackee/
    $ cd FitTrackee
 
 - Update **.env** if needed (see `Environment variables <installation.html#environment-variables>`__).
@@ -727,7 +727,7 @@ For evaluation purposes, docker files are available, installing **FitTrackee** f
 
 .. code-block:: bash
 
-    $ docker-init
+    $ make docker-init
 
 - Open http://localhost:5000 and register.