skillbox/client
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
..
build Add jest tests 2019-08-13 10:57:11 +02:00
config Merge branch 'develop' into feature/licensing 2020-04-30 15:22:55 +02:00
cypress Merge branch 'develop' into feature/licensing 2020-04-30 15:22:55 +02:00
src Merge branch 'develop' into feature/licensing 2020-04-30 15:22:55 +02:00
static Revert "Add favicon" 2018-08-16 17:49:11 +02:00
tests/unit Fix content list numbering 2019-09-11 14:45:31 +02:00
.babelrc Add jest tests 2019-08-13 10:57:11 +02:00
.editorconfig initial commit 2018-08-06 23:26:23 +02:00
.eslintignore initial commit 2018-08-06 23:26:23 +02:00
.eslintrc.js uploadcare styling and handling 2018-09-19 16:37:27 +02:00
.gitignore Fix copy, fix styles on server 2019-11-11 18:19:35 +01:00
.postcssrc.js initial commit 2018-08-06 23:26:23 +02:00
cypress.json Add additional pipeline test settings 2020-04-02 16:20:42 +02:00
index.html Add new favicons 2020-04-08 14:16:03 +02:00
jest.config.js Add jest tests 2019-08-13 10:57:11 +02:00
package-lock.json Merge branch 'develop' into feature/licensing 2020-04-30 15:22:55 +02:00
package.json Merge branch 'develop' into feature/licensing 2020-04-30 15:22:55 +02:00
vue.config.js Fix local signup, style header 2020-02-11 14:44:57 +01:00
yarn.lock Incoorperate feedback 2019-12-02 17:12:19 +01:00