skillbox/server/core
Christian Cueni d95e8ca492 Merge branch 'develop' into feature/licensing
# Conflicts:
#	Pipfile.lock
#	client/cypress/fixtures/schema.json
#	client/src/graphql/client.js
#	client/src/graphql/resolvers.js
#	client/src/graphql/typedefs.js
#	client/src/main.js
#	client/src/router/index.js
#	server/users/models.py
2020-02-27 10:29:24 +01:00
..
management Merge branch 'develop' into feature/licensing 2020-02-27 10:29:24 +01:00
migrations Add hello page, add local mutation 2020-02-11 14:42:58 +01:00
schema Fix tests 2020-02-25 16:12:01 +01:00
static Fix copy, fix styles on server 2019-11-11 18:19:35 +01:00
templates Merge branch 'develop' into feature/licensing 2020-02-27 10:29:24 +01:00
templatetags Add tag for link generation 2020-02-25 10:28:57 +01:00
tests Fix tests 2020-02-25 16:12:01 +01:00
__init__.py initial commit 2018-08-06 23:26:23 +02:00
context_processors.py initial commit 2018-08-06 23:26:23 +02:00
env_utils.py initial commit 2018-08-06 23:26:23 +02:00
factories.py Remove hep id as default 2020-02-18 16:57:36 +01:00
hep_client.py Add proxy for registration call 2020-02-25 14:42:42 +01:00
managers.py Fix email verification for stage 2020-02-13 11:28:23 +01:00
middleware.py Detect 402 in frontend, allow me query 2020-02-17 16:08:47 +01:00
models.py Store admin token in db 2020-02-11 14:40:34 +01:00
settings.py Merge branch 'develop' into feature/licensing 2020-02-27 10:29:24 +01:00
settings_test.py Add login happy paths 2020-02-11 14:40:33 +01:00
urls.py Merge branch 'develop' into feature/licensing 2020-02-27 10:29:24 +01:00
utils.py Move license to core 2020-02-20 13:22:15 +01:00
views.py Remove legacy registration 2020-02-20 08:36:05 +01:00
wagtail_utils.py Move common functions into Wagtail superclass 2018-08-16 17:26:16 +02:00
wsgi.py initial commit 2018-08-06 23:26:23 +02:00