Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.3.0

Browse Source 
Conflicts:
	docs/objects.inv
	docs/searchindex.js
	fittrackee_api/poetry.lock
	fittrackee_api/pyproject.toml
	fittrackee_client/src/actions/index.js
	fittrackee_client/src/components/App.jsx
	fittrackee_client/src/utils/index.js
This commit is contained in:
Sam
2020-02-07 11:12:32 +01:00
parent 69bcda043d c576911c9d
commit 175c608920
55 changed files with 827 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docsrc/source/_images/fittrackee_screenshot-01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 599 KiB

BIN
docsrc/source/_images/fittrackee_screenshot-02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 KiB

BIN
docsrc/source/_images/fittrackee_screenshot-03.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 KiB

BIN
docsrc/source/_images/fittrackee_screenshot-04.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

8
docsrc/source/features.rst
View File

@ -43,23 +43,23 @@ FitTrackee is available in English and French (which can be saved in the user se
Dashboard
~~~~~~~~~
.. figure:: ../../misc/images/fittrackee_screenshot-01.png
.. figure:: _images/fittrackee_screenshot-01.png
:alt: FitTrackee Dashboard
Activity/workout detail
~~~~~~~~~~~~~~~~~~~~~~~
.. figure:: ../../misc/images/fittrackee_screenshot-02.png
.. figure:: _images/fittrackee_screenshot-02.png
:alt: FitTrackee Activity
Activities/workouts list
~~~~~~~~~~~~~~~~~~~~~~~~
.. figure:: ../../misc/images/fittrackee_screenshot-03.png
.. figure:: _images/fittrackee_screenshot-03.png
:alt: FitTrackee Activities
Statistics
~~~~~~~~~~
.. figure:: ../../misc/images/fittrackee_screenshot-04.png
.. figure:: _images/fittrackee_screenshot-04.png
:alt: FitTrackee Statistics

2
docsrc/source/index.rst
View File

@ -23,7 +23,7 @@ FitTrackee
| **Still under development (not ready for production).**
| (see `issues <https://github.com/SamR1/FitTrackee/issues>`__ for more information)
.. figure:: ../../misc/images/fittrackee_screenshot-01.png
.. figure:: _images/fittrackee_screenshot-01.png
:alt: FitTrackee Dashboard

6
docsrc/source/installation.rst
View File

@ -87,12 +87,12 @@ Prod environment
.. warning::
Note that FitTrackee is not production-ready yet
- Download the last release (for now, it is the beta release v0.2.3):
- Download the last release (for now, it is the beta release v0.2.5):
.. code:: bash
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.3-beta.tar.gz
$ tar -xzf v0.2.3-beta.tar.gz
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.5-beta.tar.gz
$ tar -xzf v0.2.5-beta.tar.gz
$ mv FitTrackee-0.2.3-beta FitTrackee
$ cd FitTrackee