ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity
2,971 Commits 3 Branches 1 Tag 19 MiB
Commit Graph

117 Commits

Author SHA1 Message Date
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
Christian Cueni 1bc2436a8b Merge branch 'develop' into feature/licensing 
# Conflicts:
#	server/core/settings.py
#	server/core/urls.py
#	server/core/views.py
 2020-04-30 09:49:22 +02:00
Christian Cueni 1ca982dd24 Fix settings 2020-04-30 07:49:48 +02:00
Christian Cueni d10517b4f5 Update env variables 2020-04-30 06:49:18 +02:00
Ramon Wenger ad3e3fa629 Add additional pipeline test settings 2020-04-02 16:20:42 +02:00
Christian Cueni 5d614dd7e5 Fix minor issues 2020-03-09 16:22:56 +01:00
Christian Cueni e5b0fe539f Rename LocalLogin -> BetaLogin 2020-03-09 15:47:50 +01:00
Christian Cueni ed2f2c0557 Merged in hotfix/html-email (pull request #48) 
Hotfix/html email

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2020-02-27 09:30:49 +00:00
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
Christian Cueni af818f5ee7 Send registration emails as html 2020-02-26 13:51:17 +01:00
Christian Cueni f8fab82851 Finish coupon flow 2020-02-24 11:30:37 +01:00
Christian Cueni cd24073675 Add local login tests in backend 2020-02-18 14:53:08 +01:00
Christian Cueni 3c72c9559e Split token and local login 2020-02-18 14:36:49 +01:00
Christian Cueni 42d16caafc Allow coupon calls 2020-02-18 14:10:04 +01:00
Christian Cueni 677d8dbf44 Fix login & tests 2020-02-18 10:05:07 +01:00
Christian Cueni c9c42e2296 Check user license in Api, save 2020-02-17 15:08:06 +01:00
Christian Cueni 82c1135f0e Add coupon call in frontend, add tests, fix api 2020-02-13 10:03:00 +01:00
Ramon Wenger 17fd7575b4 Add django silk to dev mode 2020-02-12 10:16:44 +01:00
Christian Cueni 0922c5d198 Fix local signup, style header 2020-02-11 14:44:57 +01:00
Christian Cueni 68bba26c75 Add stage confirmation view 2020-02-11 14:40:34 +01:00
Christian Cueni 6beb4296f7 Store admin token in db 2020-02-11 14:40:34 +01:00
Christian Cueni 9c4e2de296 Select correct product (basic version) 2020-02-11 14:40:33 +01:00
Christian Cueni bc997bbeea Add login happy paths 2020-02-11 14:40:33 +01:00
Christian Cueni 87ceb5fc0e Setup views and tests 2020-02-11 14:40:33 +01:00
Ramon Wenger 5a58641183 Add registration of our assignments as taskbase tasks 2020-01-20 17:56:54 +01:00
Ramon Wenger 53ce39c887 Add taskbase config variables to settings 2020-01-20 13:01:00 +01:00
Ramon Wenger 2192fea5a5 Enable GZip middleware on the server for leaner responses 2020-01-16 10:47:03 +01:00
Christian Cueni 0b48607398 Add registration backend 2019-11-11 18:19:34 +01:00
Christian Cueni 95d1c4708a Merge branch 'develop' into feature/highlight-proof-of-concept 
# Conflicts:
#	client/src/components/ContentBlock.vue
 2019-11-06 08:17:40 +01:00
Ramon Wenger 02ddc4ecf4 Add AWS region setting 2019-10-24 15:04:01 +02:00
Ramon Wenger 6be09b55dd Merge branch 'hotfix/aws-endpoint' into develop 2019-10-23 14:00:35 +02:00
Ramon Wenger 40dae4f2c0 Fix AWS endpoint URL 2019-10-23 13:59:30 +02:00
Christian Cueni c396c34be2 Hide registration, redirect to correct page after reset, style reset 2019-10-08 10:14:57 +02:00
Christian Cueni 062269f030 Add loggedIn guard, add basic login component 2019-10-08 09:30:00 +02:00
Ramon Wenger 584b48a6a6 Add notes app and a PoC for highlights 2019-10-02 11:38:53 +02:00
Christian Cueni b50a489e7d Update password reset text, add sender name in email 2019-07-11 08:27:18 +02:00
Ramon Wenger c9caaf79db Add initial implementation of survey model 2019-06-20 14:51:43 +02:00
Ramon Wenger ba436f8186 Fix os.environ call 2019-03-29 16:45:43 +01:00
Christian Cueni 43278550f7 Add sendgrid config 2019-03-25 13:16:32 +01:00
Christian Cueni 319725ae57 Merge branch 'feature/pw-reset' into develop 2019-03-07 11:34:20 +01:00
Ramon Wenger 485a6ca4eb Add portfolio backend 2019-03-07 10:49:52 +01:00
Christian Cueni 670fecd35f add templates for password reset 2019-03-06 09:54:13 +01:00
Ramon Wenger 0b75e14393 Move solution check to utils 2019-02-13 16:20:29 +01:00
Ramon Wenger a3a0874c65 Add new sentry SDK 2019-02-13 13:36:41 +01:00
Ramon Wenger e9bee08c1d Add statistics module 2019-02-10 18:04:07 +01:00
Ramon Wenger 1cd31eb95a Add basic knowledge model and admin 2018-10-25 11:05:59 +02:00
Ramon Wenger 181a06424a Remove `filteredbook` app 2018-10-18 20:05:10 +02:00
Ramon Wenger 9fed2b8422 Rename folder user to users 2018-10-10 09:40:24 +02:00
Ramon Wenger 7a91d9ce77 Rename book to books and reset migrations 2018-10-04 10:05:14 +02:00
Ramon Wenger 826849f1e0 Add assignment app 2018-09-27 11:50:37 +02:00
Pawel Kowalski 4eb8406b2c Prepare settings and fix urls for aws s3 usage 2018-09-26 16:31:07 +02:00
Pawel Kowalski 3223dccb2a Add assets dir to staticfiles 2018-09-20 11:39:31 +02:00
Pawel Kowalski 2c2ad3f8f6 Add visibility to ContentBlocks 2018-09-11 16:18:25 +02:00
Ramon Wenger 370fd54b98 Refactor helper method from test 2018-09-10 12:54:31 +02:00
Ramon Wenger 7142e3f3b1 Add a first test 2018-09-10 12:04:07 +02:00
Pawel Kowalski b28346d297 Add contents to Room Entries, upgrade wagtail, reset migrations 2018-09-04 14:48:34 +02:00
Pawel Kowalski 34220d7262 Add UserGroup and test data generation for it 2018-08-23 12:23:39 +02:00
Pawel Kowalski 579d54c8c5 Adds objectives app to project 2018-08-14 14:43:16 +02:00
Pawel Kowalski 6de819b0b2 Removed unnecessary cors whitlable entry 2018-08-09 14:26:21 +02:00
Ramon Wenger f2d9d18894 Remove nuxt from project 2018-08-09 14:20:33 +02:00
Ramon Wenger f7e994522c Fix static settings 2018-08-09 10:19:48 +02:00
Ramon Wenger 4e4c8768f3 Adjust static url 2018-08-08 18:59:47 +02:00
Ramon Wenger 14b06c809d Update static folder in settings 2018-08-08 18:09:02 +02:00
Ramon Wenger 5e6ea1f52e Add nuxt.js to project 2018-08-08 15:00:56 +02:00
Pawel Kowalski e21ba0a232 implement base model, factories, nodes 2018-08-08 11:41:39 +02:00
Pawel Kowalski 2a942ea0cf comment aws settings 2018-08-06 23:46:22 +02:00
Pawel Kowalski 5dbef5a694 initial commit 2018-08-06 23:26:23 +02:00