Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
SamR1 committed Jun 25, 2023
2 parents 3c560e0 + 325d612 commit f43f22a
Show file tree
Hide file tree
Showing 125 changed files with 3,394 additions and 2,932 deletions.
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
# Change log

## Version 0.7.18 (2023/06/25)

Polish is available in FitTrackee interface ([partially translated](https://hosted.weblate.org/languages/pl/fittrackee/)).
Documentation is now translated in French (**note**: documentation translations are not yet available on Weblate).

**Important**: Python 3.7 is no longer supported, the minimum version is now Python 3.8.1.

### Translations

* [#351](https://github.com/SamR1/FitTrackee/issues/351) - [Translation Request] Polish
* [PR#370](https://github.com/SamR1/FitTrackee/pull/370) - Translations update (Dutch, thanks to @bjornclauw)
* [PR#371](https://github.com/SamR1/FitTrackee/pull/371) - Translations update (Polish, thanks to Mariusz on Weblate)
* [PR#375](https://github.com/SamR1/FitTrackee/pull/375) - Translations update (French, thanks to @Thovi98)
* [PR#376](https://github.com/SamR1/FitTrackee/pull/376) - Translations update (German, thanks to @qwerty287)


### Documentation

* [1375986](https://github.com/SamR1/FitTrackee/commit/1375986837321fa356decadcff89bfc2144c345e) - Change documentation theme for Furo
* [#377](https://github.com/SamR1/FitTrackee/issues/377) - Init documentation translation


### Misc

* [#354](https://github.com/SamR1/FitTrackee/issues/354) - Drop support for Python 3.7
* [PR#374](https://github.com/SamR1/FitTrackee/pull/374) - Docker - install fittrackee in a virtualenv


Translation status:
- Dutch: 100%
- English: 100%
- French: 100%
- Galician: 100%
- German: 100%
- Italian: 87%
- Norwegian Bokmål: 36%
- Polish: 43%
- Spanish: 100%

Thanks to all contributors.


## Version 0.7.17 (2023/06/03)

### Translations
Expand Down
9 changes: 7 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,26 @@ The **GitHub** repository contains:
- source code (note that the repository also includes client build),
- translations,
- tests,
- documentation (source and build).
- documentation (source, translations and build).

Continuous integration workflows run on **Github Actions** platform (on **push** and **pull requests**).

For now, releases do not follow [semantic versioning](https://semver.org). Any version may contain backward-incompatible changes.

### Translations

The available languages are:
[![Translation status](https://hosted.weblate.org/widgets/fittrackee/-/multi-auto.svg)](https://hosted.weblate.org/engage/fittrackee/)

Translations files are located:
Application translations files are located:
- on API side (emails): `fittrackee/emails/translations/` (implemented with [Babel](https://babel.pocoo.org/en/latest/))
- on client side: `fittrackee_client/src/locales` (implemented with [Vue I18n](https://vue-i18n.intlify.dev/))

Translations can be updated through [Weblate](https://hosted.weblate.org/engage/fittrackee/).

Documentation translations are located in following directory: `docsrc/locales`.
For now only English and French are available and translations files are not yet on Weblate.

### How to install FitTrackee

see [Installations instructions](https://samr1.github.io/FitTrackee/installation.html)
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
**A simple self-hosted workout/activity tracker.**

[![PyPI version](https://img.shields.io/pypi/v/fittrackee.svg)](https://pypi.org/project/fittrackee/)
[![Python Version](https://img.shields.io/badge/python-3.7+-brightgreen.svg)](https://python.org)
[![Flask Version](https://img.shields.io/badge/flask-2.2-brightgreen.svg)](http://flask.pocoo.org/)
[![Python Version](https://img.shields.io/badge/python-3.8+-brightgreen.svg)](https://python.org)
[![Flask Version](https://img.shields.io/badge/flask-2.3-brightgreen.svg)](http://flask.pocoo.org/)
[![code style: black](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black)
[![type check: mypy](https://img.shields.io/badge/type%20check-mypy-blue)](http://mypy-lang.org/)
[![Vue Version](https://img.shields.io/badge/vue-3.2-brightgreen.svg)](https://v3.vuejs.org/)
Expand All @@ -19,7 +19,6 @@ This web application allows you to track your outdoor activities (workouts) from
No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
Examples for Android (non-exhaustive list):
* [Runner Up](https://github.com/jonasoreland/runnerup) (GPL v3)
* [ForRunners](https://gitlab.com/brvier/ForRunners) (GPL v3)
* [OpenTracks](https://github.com/OpenTracksApp/OpenTracks) (Apache License)
* [FitoTrack](https://codeberg.org/jannis/FitoTrack) (GPL v3)

Expand All @@ -29,4 +28,4 @@ It is also possible to add a workout without a gpx file.
**Still under heavy development (some features may be unstable).**
(see [issues](https://github.com/SamR1/FitTrackee/issues) and [documentation](https://samr1.github.io/FitTrackee) for more information)

![FitTrackee Dashboard Screenshot](https://samr1.github.io/FitTrackee/_images/fittrackee_screenshot-01.png)
![FitTrackee Dashboard Screenshot](https://samr1.github.io/FitTrackee/en/_images/fittrackee_screenshot-01.png)
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.17
0.7.18
2 changes: 1 addition & 1 deletion docs/en/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 3575465c45a40772c194ff6bdf645ab2
config: bb5bb9fe9ff8bb50831b90547286f94d
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified docs/en/_images/fittrackee_screenshot-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/_images/fittrackee_screenshot-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/_images/fittrackee_screenshot-03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/_images/fittrackee_screenshot-04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/_images/fittrackee_screenshot-05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/_images/fittrackee_screenshot-06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/_images/fittrackee_screenshot-07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/_images/fittrackee_screenshot-08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions docs/en/_sources/changelog.md.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
# Change log

## Version 0.7.18 (2023/06/25)

Polish is available in FitTrackee interface ([partially translated](https://hosted.weblate.org/languages/pl/fittrackee/)).
Documentation is now translated in French (**note**: documentation translations are not yet available on Weblate).

**Important**: Python 3.7 is no longer supported, the minimum version is now Python 3.8.1.

### Translations

* [#351](https://github.com/SamR1/FitTrackee/issues/351) - [Translation Request] Polish
* [PR#370](https://github.com/SamR1/FitTrackee/pull/370) - Translations update (Dutch, thanks to @bjornclauw)
* [PR#371](https://github.com/SamR1/FitTrackee/pull/371) - Translations update (Polish, thanks to Mariusz on Weblate)
* [PR#375](https://github.com/SamR1/FitTrackee/pull/375) - Translations update (French, thanks to @Thovi98)
* [PR#376](https://github.com/SamR1/FitTrackee/pull/376) - Translations update (German, thanks to @qwerty287)


### Documentation

* [1375986](https://github.com/SamR1/FitTrackee/commit/1375986837321fa356decadcff89bfc2144c345e) - Change documentation theme for Furo
* [#377](https://github.com/SamR1/FitTrackee/issues/377) - Init documentation translation


### Misc

* [#354](https://github.com/SamR1/FitTrackee/issues/354) - Drop support for Python 3.7
* [PR#374](https://github.com/SamR1/FitTrackee/pull/374) - Docker - install fittrackee in a virtualenv


Translation status:
- Dutch: 100%
- English: 100%
- French: 100%
- Galician: 100%
- German: 100%
- Italian: 87%
- Norwegian Bokmål: 36%
- Polish: 43%
- Spanish: 100%

Thanks to all contributors.


## Version 0.7.17 (2023/06/03)

### Translations
Expand Down
6 changes: 2 additions & 4 deletions docs/en/_sources/features.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,13 @@ FitTrackee is available in the following languages (which can be saved in the us
- Galician (*new in 0.7.15*)
- Spanish (*new in 0.7.15*)
- Norwegian Bokmål (*new in 0.7.15*)
- Polish (*new in 0.7.18*)

Translations status on `Weblate <https://hosted.weblate.org/engage/fittrackee/>`__ (may differ from the released version):
Application translations status on `Weblate <https://hosted.weblate.org/engage/fittrackee/>`__ (may differ from the released version):

.. figure:: https://hosted.weblate.org/widgets/fittrackee/-/multi-auto.svg


.. note::
Polish is not yet available in **FitTrackee** interface.

Screenshots
^^^^^^^^^^^^

Expand Down
28 changes: 16 additions & 12 deletions docs/en/_sources/installation.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Prerequisites
~~~~~~~~~~~~~

- mandatory
- Python 3.8+
- Python >= 3.8.1
- PostgreSQL 11+
- optional
- Redis for task queue (if email sending is enabled and for data export requests) and API rate limits
Expand Down Expand Up @@ -62,7 +62,7 @@ deployment method.

**FitTrackee** host.

:default: 127.0.0.1
:default: ``127.0.0.1``


.. envvar:: PORT
Expand All @@ -76,7 +76,7 @@ deployment method.

**FitTrackee** configuration.

:default: fittrackee.config.ProductionConfig
:default: ``fittrackee.config.ProductionConfig``


.. envvar:: APP_SECRET_KEY
Expand Down Expand Up @@ -224,7 +224,7 @@ deployment method.
| This variable is now case-insensitive.
| If ``False``, depending on tile server, `subdomains <installation.html#envvar-STATICMAP_SUBDOMAINS>`__ may be mandatory.
:default: False
:default: ``False``


.. envvar:: WEATHER_API_KEY
Expand Down Expand Up @@ -505,13 +505,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.7.17):
- Download the last release (for now, it is the release v0.7.18):

.. code:: bash
$ wget https://github.com/SamR1/FitTrackee/archive/v0.7.17.tar.gz
$ tar -xzf v0.7.17.tar.gz
$ mv FitTrackee-0.7.17 FitTrackee
$ wget https://github.com/SamR1/FitTrackee/archive/v0.7.18.tar.gz
$ tar -xzf v0.7.18.tar.gz
$ mv FitTrackee-0.7.18 FitTrackee
$ cd FitTrackee
- Create **.env** from example and update it
Expand Down Expand Up @@ -558,6 +558,10 @@ Upgrade
| - database (with `pg_dump <https://www.postgresql.org/docs/11/app-pgdump.html>`__ for instance)
| - upload directory (see `Environment variables <installation.html#environment-variables>`__)
.. warning::

For now, releases do not follow `semantic versioning <https://semver.org>`__). Any version may contain backward-incompatible changes.


From PyPI
^^^^^^^^^
Expand Down Expand Up @@ -631,13 +635,13 @@ Prod environment

- Change to the directory where FitTrackee directory is located

- Download the last release (for now, it is the release v0.7.17) and overwrite existing files:
- Download the last release (for now, it is the release v0.7.18) and overwrite existing files:

.. code:: bash
$ wget https://github.com/SamR1/FitTrackee/archive/v0.7.17.tar.gz
$ tar -xzf v0.7.17.tar.gz
$ cp -R FitTrackee-0.7.17/* FitTrackee/
$ wget https://github.com/SamR1/FitTrackee/archive/v0.7.18.tar.gz
$ tar -xzf v0.7.18.tar.gz
$ cp -R FitTrackee-0.7.18/* FitTrackee/
$ cd FitTrackee
- Update **.env** if needed (see `Environment variables <installation.html#environment-variables>`__).
Expand Down
2 changes: 1 addition & 1 deletion docs/en/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '0.7.17',
VERSION: '0.7.18',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
6 changes: 3 additions & 3 deletions docs/en/api/auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" /><link rel="next" title="Configuration" href="configuration.html" /><link rel="prev" title="API documentation" href="index.html" />

<!-- Generated with Sphinx 7.0.1 and Furo 2023.05.20 -->
<title>Authentication and account - FitTrackee 0.7.17 documentation</title>
<title>Authentication and account - FitTrackee 0.7.18 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?digest=e6660623a769aa55fea372102b9bf3151b292993" />
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css" />
Expand Down Expand Up @@ -126,7 +126,7 @@
</label>
</div>
<div class="header-center">
<a href="../index.html"><div class="brand">FitTrackee 0.7.17
<a href="../index.html"><div class="brand">FitTrackee 0.7.18
documentation</div></a>
</div>
<div class="header-right">
Expand All @@ -153,7 +153,7 @@
<img class="sidebar-logo" src="../_static/ft-logo.png" alt="Logo"/>
</div>

<span class="sidebar-brand-text">FitTrackee 0.7.17
<span class="sidebar-brand-text">FitTrackee 0.7.18
documentation</span>

</a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
Expand Down
10 changes: 5 additions & 5 deletions docs/en/api/configuration.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" /><link rel="next" title="OAuth2" href="oauth2.html" /><link rel="prev" title="Authentication and account" href="auth.html" />

<!-- Generated with Sphinx 7.0.1 and Furo 2023.05.20 -->
<title>Configuration - FitTrackee 0.7.17 documentation</title>
<title>Configuration - FitTrackee 0.7.18 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?digest=e6660623a769aa55fea372102b9bf3151b292993" />
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css" />
Expand Down Expand Up @@ -126,7 +126,7 @@
</label>
</div>
<div class="header-center">
<a href="../index.html"><div class="brand">FitTrackee 0.7.17
<a href="../index.html"><div class="brand">FitTrackee 0.7.18
documentation</div></a>
</div>
<div class="header-right">
Expand All @@ -153,7 +153,7 @@
<img class="sidebar-logo" src="../_static/ft-logo.png" alt="Logo"/>
</div>

<span class="sidebar-brand-text">FitTrackee 0.7.17
<span class="sidebar-brand-text">FitTrackee 0.7.18
documentation</span>

</a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
Expand Down Expand Up @@ -257,7 +257,7 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
<span class="w"> </span><span class="nt">&quot;map_attribution&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;&amp;copy; &lt;a href=http://www.openstreetmap.org/copyright&gt;OpenStreetMap&lt;/a&gt; contributors&quot;</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;privacy_policy&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;privacy_policy_date&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.17&quot;</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.18&quot;</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;weather_provider&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span>
<span class="w"> </span><span class="p">},</span>
<span class="w"> </span><span class="nt">&quot;status&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;success&quot;</span>
Expand Down Expand Up @@ -302,7 +302,7 @@ <h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to
<span class="w"> </span><span class="nt">&quot;map_attribution&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;&amp;copy; &lt;a href=http://www.openstreetmap.org/copyright&gt;OpenStreetMap&lt;/a&gt; contributors&quot;</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;privacy_policy&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;privacy_policy_date&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.17&quot;</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;version&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;0.7.18&quot;</span><span class="p">,</span>
<span class="w"> </span><span class="nt">&quot;weather_provider&quot;</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span>
<span class="w"> </span><span class="p">},</span>
<span class="w"> </span><span class="nt">&quot;status&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;success&quot;</span>
Expand Down
6 changes: 3 additions & 3 deletions docs/en/api/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" /><link rel="next" title="Authentication and account" href="auth.html" /><link rel="prev" title="Third-party tools" href="../third_party_tools.html" />

<!-- Generated with Sphinx 7.0.1 and Furo 2023.05.20 -->
<title>API documentation - FitTrackee 0.7.17 documentation</title>
<title>API documentation - FitTrackee 0.7.18 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?digest=e6660623a769aa55fea372102b9bf3151b292993" />
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css" />
Expand Down Expand Up @@ -126,7 +126,7 @@
</label>
</div>
<div class="header-center">
<a href="../index.html"><div class="brand">FitTrackee 0.7.17
<a href="../index.html"><div class="brand">FitTrackee 0.7.18
documentation</div></a>
</div>
<div class="header-right">
Expand All @@ -153,7 +153,7 @@
<img class="sidebar-logo" src="../_static/ft-logo.png" alt="Logo"/>
</div>

<span class="sidebar-brand-text">FitTrackee 0.7.17
<span class="sidebar-brand-text">FitTrackee 0.7.18
documentation</span>

</a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
Expand Down
6 changes: 3 additions & 3 deletions docs/en/api/oauth2.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" /><link rel="next" title="Records" href="records.html" /><link rel="prev" title="Configuration" href="configuration.html" />

<!-- Generated with Sphinx 7.0.1 and Furo 2023.05.20 -->
<title>OAuth2 - FitTrackee 0.7.17 documentation</title>
<title>OAuth2 - FitTrackee 0.7.18 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?digest=e6660623a769aa55fea372102b9bf3151b292993" />
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css" />
Expand Down Expand Up @@ -126,7 +126,7 @@
</label>
</div>
<div class="header-center">
<a href="../index.html"><div class="brand">FitTrackee 0.7.17
<a href="../index.html"><div class="brand">FitTrackee 0.7.18
documentation</div></a>
</div>
<div class="header-right">
Expand All @@ -153,7 +153,7 @@
<img class="sidebar-logo" src="../_static/ft-logo.png" alt="Logo"/>
</div>

<span class="sidebar-brand-text">FitTrackee 0.7.17
<span class="sidebar-brand-text">FitTrackee 0.7.18
documentation</span>

</a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
Expand Down
Loading

0 comments on commit f43f22a

Please sign in to comment.