Commit Graph

617 Commits

Author SHA1 Message Date
Sam
8c711a2e83 Merge branch 'master' into v0.3.0
Conflicts:
	VERSION
	docs/.buildinfo
	docs/_static/documentation_options.js
	docs/api/activities.html
	docs/api/auth.html
	docs/api/index.html
	docs/api/records.html
	docs/api/sports.html
	docs/api/stats.html
	docs/api/users.html
	docs/changelog.html
	docs/features.html
	docs/genindex.html
	docs/http-routingtable.html
	docs/index.html
	docs/installation.html
	docs/objects.inv
	docs/search.html
	docs/searchindex.js
	docs/troubleshooting/administrator.html
	docs/troubleshooting/index.html
	docs/troubleshooting/user.html
	fittrackee_api/poetry.lock
	fittrackee_client/src/utils/index.js
	yarn.lock
2020-01-30 22:45:50 +01:00
Sam
694248ecac update CHANGELOG.md 2020-01-30 21:54:44 +01:00
Sam
57a977ec7e update version 2020-01-30 21:24:47 +01:00
Sam
2c7dd1d6c8 Client - minor changes 2020-01-30 20:56:39 +01:00
Sam
a413ff35ae Client - minor style change 2020-01-30 18:51:17 +01:00
Sam
aade621030 Merge branch '46_calendar' 2020-01-28 21:03:46 +01:00
Sam
3fd72acf96 display a popup to show more activities - fix #46 2020-01-28 21:03:12 +01:00
Sam
42880c4b6f update travis config 2020-01-28 20:35:27 +01:00
Sam
c8c1074604 hide some activities on calendar depending on screen width - #46 2020-01-28 19:34:10 +01:00
Sam
5ad074bb1f minor refactor 2020-01-28 15:47:38 +01:00
Sam
e4cb0404ce minor style fix 2020-01-28 15:17:49 +01:00
Sam
962039a05c Client - update JS dependencies 2020-01-28 14:53:47 +01:00
Sam
ff65668945 API - update python dependencies 2020-01-28 14:48:22 +01:00
Sam
84b4966a5e update timezone drop-down background - fix #47 2020-01-13 14:54:04 +01:00
Sam
99ee0e4200 Merge branch 'master' into v0.3.0 2019-12-29 13:39:26 +01:00
Sam
ccd8e5546c API - update version in pyproject.toml 2019-12-29 13:08:57 +01:00
Sam
34433b4e63 Docs - update features 2019-12-29 12:50:32 +01:00
Sam
9bf094da1b Docs - update version 2019-12-29 12:11:43 +01:00
Sam
9607b9b2ff update CHANGELOG.md 2019-12-29 12:02:04 +01:00
Sam
432bd0c27c Client - refactor locales 2019-12-29 11:37:17 +01:00
Sam
5869905b0c add missing translation 2019-12-29 11:25:50 +01:00
Sam
665dbd9b0b update README.md
+ minor update on package.json
2019-12-29 11:00:29 +01:00
Sam
40edbe19ce Client - display WE days with different BG color on calendar - fix #43 2019-12-29 10:42:01 +01:00
Sam
038610e7f6 Client - fix editing a workout with gpx file 2019-12-29 10:23:49 +01:00
Sam
c2815ae47b Docs - add sticky footer 2019-12-28 23:23:30 +01:00
Sam
91b77cd819 Client - minor changes on i18n 2019-12-28 22:46:02 +01:00
Sam
4c26088494 Client - update CSS and JS files 2019-12-28 22:30:16 +01:00
Sam
4500732a0e update JS deps 2019-12-28 22:08:16 +01:00
Sam
51860a1484 [skip travis] update CHANGELOG.md 2019-12-28 21:32:50 +01:00
Sam
f1298aa7ba Merge branch 'master' into v0.2.3 2019-12-28 21:22:00 +01:00
Sam
1a75172d28 update python deps and Dockerfile 2019-12-28 21:10:51 +01:00
Sam
227d26cb9e fix api config on ci - #15 2019-11-20 12:32:33 +01:00
Sam
624f40e1d8 remove unused env variables 2019-11-13 22:15:15 +01:00
Sam
7ffcaad332 API & Client - refactor registration activation - #15 2019-11-13 21:46:28 +01:00
Sam
1398c7ff4a Client - add application configuration in Application Admin - #15 2019-11-13 20:16:58 +01:00
Sam
97534b698b API - minor refactor and documentation update 2019-11-13 19:14:29 +01:00
Sam
649b773ba9 API - move some app configuration parameters in database 2019-11-13 18:40:49 +01:00
Sam
6447d22d97 add https for dev server 2019-11-13 12:57:36 +01:00
Sam
3fa964a2b8 update Python dependencies 2019-11-10 14:20:52 +01:00
Sam
af1257f990 update JS dependencies 2019-11-10 13:51:21 +01:00
Sam
98571cb096 Merge branch 'master' into v0.3.0 2019-11-10 13:19:46 +01:00
Sam
c1f33ddacc [skip travis] minor documentation update 2019-09-24 09:04:43 +02:00
Sam
03b99a7b7c update CHANGELOG.md 2019-09-23 21:22:36 +02:00
Sam
f3356e045c Client - display app statistics in Administration 2019-09-23 21:05:55 +02:00
Sam
628f2f3e27 API - add route to get application statistics 2019-09-23 20:30:40 +02:00
Sam
0c7cefba13 API & Client - display only sports with activities on statistics 2019-09-23 20:01:16 +02:00
Sam
189a1bc35f Merge branch 'master' into admin 2019-09-23 15:32:23 +02:00
Sam
1b47fc323c [skip travis] update version on screenshots 2019-09-23 15:15:31 +02:00
Sam
742818a405 update CHANGELOG.md and version 2019-09-23 15:05:07 +02:00
Sam
bb54ce87e5 update JS dependencies 2019-09-23 14:51:47 +02:00