Commit Graph

31 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
42880c4b6f update travis config 2020-01-28 20:35:27 +01:00
Sam
f1298aa7ba Merge branch 'master' into v0.2.3 2019-12-28 21:22:00 +01:00
Sam
624f40e1d8 remove unused env variables 2019-11-13 22:15:15 +01:00
Sam
bb54ce87e5 update JS dependencies 2019-09-23 14:51:47 +02:00
Sam
3942e0481a update JS dependencies 2019-09-23 08:50:51 +02:00
Sam
c5c84c4090 update .travis.yml 2019-09-16 16:54:39 +02:00
Sam
4b1bfe1dfe update travis config 2019-08-25 13:06:02 +02:00
Sam
44fea47a5d Revert "update ci config"
This reverts commit 8fa693695b.
=> back to trusty
2019-01-19 10:15:55 +01:00
Sam
8fa693695b update ci config
use of xenial instead of trusty
2019-01-13 13:01:32 +01:00
Sam
993203ec9d update ci config 2019-01-13 12:43:41 +01:00
Sam
d4e4073128 fix ci config 2018-09-09 15:05:21 +02:00
Sam
97005599c9 update ci config 2018-09-09 11:59:10 +02:00
Sam
f65d636f85 API & Client: refactor (rename mpwo to fittrackee) 2018-06-07 14:45:51 +02:00
Sam
1f36de74ba API: refactor (rename mpwo_api to fittrackee_api) 2018-06-07 14:15:39 +02:00
Sam
2e0d0da4b6 tests update 2018-04-10 22:11:33 +02:00
SamR1
f4f8dc9ea2 travis config update 2018-01-20 20:56:10 +01:00
SamR1
3fb7f05fd5 moving alembic script directory 2018-01-20 20:05:41 +01:00
SamR1
3fcd2cec71 Flask-Migrate fix 2018-01-20 19:24:30 +01:00
SamR1
90201d4dd1 Flask-Migrate init
Flask-Migrate init
2018-01-20 19:12:34 +01:00
SamR1
63aefce0ca travis config fix 2018-01-14 14:56:29 +01:00
SamR1
dbc68de5f2 adding nginx 2018-01-14 14:41:03 +01:00
SamR1
83daad9523 travis config update 2018-01-14 13:07:07 +01:00
SamR1
c07e5c9608 local docker config (dev) fixed 2018-01-14 12:49:52 +01:00
SamR1
41abdc13c4 conf update for e2e tests 2018-01-13 21:06:25 +01:00
SamR1
b015d426ae travis conf update for e2e tests 2018-01-13 15:06:43 +01:00
SamR1
e82dcad394 test.sh update
test.sh update

test.sh update

test.sh update

test.sh update

test.sh update

test.sh update
2018-01-13 14:36:07 +01:00
SamR1
fb109ced06 docker-compose-ci.yml: adding api tests 2018-01-13 13:00:20 +01:00
SamR1
e3b406c627 docker-compose-ci.yml update
docker-compose-ci.yml update
2018-01-13 11:05:23 +01:00
SamR1
132ce37d5d travis config init 2018-01-10 22:43:35 +01:00
SamR1
bf8904fb2d travis config init 2018-01-10 22:36:40 +01:00