Commit Graph

33 Commits

Author SHA1 Message Date
Sam
aa29231fd9 Merge branch 'master' into v0.3.0 2020-05-01 09:51:19 +02:00
Sam
d8147cfef5 update python dependencies 2020-04-29 14:57:20 +02:00
Sam
175c608920 Merge branch 'master' into v0.3.0
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
2020-02-07 11:12:32 +01:00
Sam
fab69ceabe update CHANGELOG.md 2020-01-31 14:23:31 +01:00
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
99ee0e4200 Merge branch 'master' into v0.3.0 2019-12-29 13:39:26 +01:00
Sam
9607b9b2ff update CHANGELOG.md 2019-12-29 12:02:04 +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
97534b698b API - minor refactor and documentation update 2019-11-13 19:14:29 +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
189a1bc35f Merge branch 'master' into admin 2019-09-23 15:32:23 +02:00
Sam
742818a405 update CHANGELOG.md and version 2019-09-23 15:05:07 +02:00
Sam
82b020ce4e [skip travis] init v0.3.0 2019-09-01 12:14:46 +02:00
Sam
5083fa5851 update CHANGELOG.md 2019-09-01 11:51:45 +02:00
Sam
72cb1eb814 update documentation 2019-08-31 19:11:46 +02:00
Sam
67d1e424d8 [skip travis] update documentation 2019-08-31 14:55:50 +02:00
Sam
94e26c56fc API - migrating from pipenv to poetry 2019-08-28 13:28:23 +02:00
Sam
5068d1f58d [skip travis] update version 2019-08-25 22:21:09 +02:00
Sam
ea3fc6aafa update documentation 2019-08-25 21:21:34 +02:00
Sam
a7de5dd52c Client - disable registration - fix #36 2019-08-25 12:50:42 +02:00
Sam
072cd691d0 [skip travis] add short version 2019-07-21 11:12:34 +02:00
Sam
0e3df5cd94 [skip travis] add missing footnotes 2019-07-21 11:01:22 +02:00
Sam
846218716e [skip travis] update project information 2019-07-21 10:53:35 +02:00
Sam
db531a140b add custom css to change admonitions background colors 2019-07-21 10:24:45 +02:00
Sam
3c1d665164 [skip travis] docs - add link to GitHub 2019-07-19 12:26:19 +02:00
Sam
c0e4cc64bd update documentation 2019-07-14 21:37:55 +02:00
Sam
a3613617a4 refactor 2019-07-14 19:42:40 +02:00