Christian Cueni 6b76c27c55 Merge branch 'develop' into feature/licensing ... # Conflicts: # client/config/dev.env.js # client/config/prod.env.js # client/cypress/fixtures/schema.json # client/cypress/integration/beta-login.spec.js # client/package-lock.json # client/src/graphql/client.js # client/src/layouts/PublicLayout.vue # client/src/main.js # client/src/styles/main.scss # server/core/settings.py # server/registration/mutations_public.py # server/users/factories.py # server/users/models.py # server/users/schema.py		2020-04-30 15:22:55 +02:00
..
api	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
assignments	Fix unit tests	2020-03-05 16:54:56 +01:00
basicknowledge	Add interdisciplinary instrument	2020-04-08 10:50:06 +02:00
books	Add instruction block inside content block	2020-04-12 23:06:49 +02:00
core	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
notes	Use slug to identify modules for the bookmark mutation	2020-01-16 15:03:50 +01:00
objectives	Clean up code	2020-03-12 18:06:05 +01:00
portfolio	Clean up code, change some minor things	2020-03-10 11:40:24 +01:00
registration	Update links, add group_id in customer	2020-04-30 12:16:24 +02:00
rooms	Clean up code, change some minor things	2020-03-10 11:40:24 +01:00
spellcheck	Clean up code	2020-02-06 15:06:50 +01:00
static	Bugfix for Bitbucket-Pipelines tests	2018-10-04 12:52:56 +02:00
statistics	Add missing statistics	2019-02-11 18:02:58 +01:00
surveys	Update MyActivity query to include more activities	2019-12-18 13:11:32 +01:00
users	Merge branch 'develop' into feature/licensing	2020-04-30 15:22:55 +02:00
.coveragerc	Add coverage	2019-03-29 16:36:41 +01:00
.env.example	Add sendgrid config	2019-03-25 13:16:32 +01:00
Benutzer.sample.csv	Add test for import	2019-07-03 14:12:05 +02:00
check_connection.py	Update docker configuration	2018-09-03 17:20:02 +02:00
graphql.config.json	initial commit	2018-08-06 23:26:23 +02:00
manage.py	initial commit	2018-08-06 23:26:23 +02:00
run_unittests_coverage.sh	bitbucket pipelines heroku integration	2018-09-20 17:28:15 +02:00
wait-for-postgres.sh	Update docker configuration	2018-09-03 17:20:02 +02:00