Merge branch 'master' into v0.3.0

This commit is contained in:
Sam
2019-12-29 13:39:26 +01:00
57 changed files with 2214 additions and 1679 deletions

View File

@ -43,6 +43,14 @@
html {
font-family: "Lato", sans-serif;
height: 100vh;
}
body {
margin: 0;
min-height: 100vh;
padding-bottom: 65px;
position: relative;
}
.alert-danger {
@ -59,3 +67,9 @@ html {
background-color: #f5894f;
border-color: transparent;
}
.footer {
bottom: 0;
height: 65px;
position: absolute;
}

View File

@ -18,7 +18,7 @@ Activities/Workouts
- Montain Biking
- Running
- Walking
- Dashboard with month calendar displaying activities and record
- Dashboard with month calendar displaying activities and record. The week can start on Sunday or Monday (which can be changed in the user settings)
- Activity creation by uploading a gpx file. An activity can even be created without gpx (the user must enter date, time, duration and distance)
- An activity with a gpx file can be displayed with map, weather (if the DarkSky API key is provided) and charts (speed and elevation). Segments can be displayed
- Activity edition and deletion. User can add a note
@ -35,6 +35,10 @@ Activities/Workouts
- only activity owner can see his activity
- **no administration for now**
Translations
^^^^^^^^^^^^
FitTrackee is available in English and French (which can be saved in the user settings).
Dashboard
~~~~~~~~~

View File

@ -87,13 +87,13 @@ Prod environment
.. warning::
Note that FitTrackee is not production-ready yet
- Download the last release (for now, it is the beta release v0.2.2):
- Download the last release (for now, it is the beta release v0.2.3):
.. code:: bash
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.2-beta.tar.gz
$ tar -xzf v0.2.2-beta.tar.gz
$ mv FitTrackee-0.2.2-beta FitTrackee
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.3-beta.tar.gz
$ tar -xzf v0.2.3-beta.tar.gz
$ mv FitTrackee-0.2.3-beta FitTrackee
$ cd FitTrackee
- Update **Makefile.config** file if needed and copy/paste the