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
|
5a4dd60e41
|
update version in pyproject.toml
|
2020-01-31 14:33:43 +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
|
ff65668945
|
API - update python dependencies
|
2020-01-28 14:48:22 +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
|
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
|
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
|
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
|
d2adeed805
|
API - move poetry files in api folder
|
2019-08-28 13:33:19 +02:00 |
|