Commit Graph

412 Commits

Author SHA1 Message Date
Ramon Wenger d50479c04d Make assignments searchable 2022-03-31 00:23:58 +02:00
Ramon Wenger 61f006e1b3 Upgrade django and wagtail versions 2022-03-30 16:11:31 +02:00
Ramon Wenger a1f6bfc373 Backport more code 2022-01-25 15:31:55 +01:00
Ramon Wenger ade9a23d85 Add some more logging 2022-01-13 10:52:05 +01:00
Ramon Wenger 67ddd9b389 Fix django url bug 2021-12-21 21:04:22 +01:00
Ramon Wenger 90640ad6c6 Update backend template syntax 2021-12-21 15:18:38 +01:00
Ramon Wenger f2fec255c8 Update webpack configs 2021-12-16 14:10:42 +01:00
Ramon Wenger 92c34ca80d Update import call 2021-12-13 16:36:18 +01:00
Ramon Wenger cf66702d75 Update django, wagtail and some others 2021-12-13 15:48:01 +01:00
Ramon Wenger ab3029bd75 Add SysLog handler 2021-12-13 14:43:30 +01:00
Ramon Wenger 338e4cfcfc Add unit tests to check the issues found in the bug bounty report 2021-11-16 14:12:16 +01:00
Ramon Wenger f03beb8b34 Return only instrument types with assigned instruments 2021-11-10 12:47:52 +01:00
Ramon Wenger bb694e443d Add more access test for projects 2021-10-06 10:54:52 +02:00
Ramon Wenger 6b3f84a619 Remove school class from new room mutation 2021-08-25 16:38:16 +02:00
Ramon Wenger cf5a3f7d9d Update add room entry button 2021-08-25 14:22:20 +02:00
Ramon Wenger 9f858ea46c Add comment node to room entry 2021-08-23 15:57:08 +02:00
Ramon Wenger dc43b88916 Add cypress test for read only portfolio 2021-08-05 11:41:57 +02:00
Ramon Wenger 1792fe9bf1 Change how slugs are generated in dummy data 2021-08-05 09:32:51 +02:00
Ramon Wenger 7728f654a5 Refactor dummy users to be more anonymous 2021-08-03 14:16:15 +02:00
Ramon Wenger 9dbddac078 Add missing migration 2021-07-26 17:15:50 +02:00
Christian Cueni 4762751fc9 Update settings, fix typo 2021-07-13 13:25:13 +02:00
Christian Cueni 9b7c74e7f7 Add refresh tests 2021-07-13 13:25:13 +02:00
Christian Cueni 0dc699baf0 Add feedback, update tests 2021-07-13 13:25:13 +02:00
Christian Cueni a7ff7c2697 Logout user, move code 2021-07-13 13:25:13 +02:00
Christian Cueni 050ca414a8 Fix e2e tests (allow BetaLogin endpoint, add licenses) 2021-07-13 13:25:13 +02:00
Christian Cueni a2df6ff7bd Update middleware & tests 2021-07-13 13:25:13 +02:00
Christian Cueni 3e64d1c51f Test coupon redemption 2021-07-13 13:25:13 +02:00
Christian Cueni 3473ef86ff Add redeem coupon endpoint 2021-07-13 13:25:13 +02:00
Christian Cueni 9c0afffc7c Fix middleware tests 2021-07-13 13:25:13 +02:00
Christian Cueni 861c276960 Move middleware to users 2021-07-13 13:25:12 +02:00
Christian Cueni 08e259ebf6 Fix test, add env-variables 2021-07-13 13:25:11 +02:00
Christian Cueni 2718362cee Fix login tests 2021-07-13 13:24:22 +02:00
Christian Cueni 3c89a8b256 Remove or comment unused code 2021-07-13 13:24:22 +02:00
Christian Cueni c53083dd72 Update paths 2021-07-13 13:24:22 +02:00
Christian Cueni 04473ecad3 Remove axios 2021-07-13 13:24:22 +02:00
Christian Cueni bfdd743afd Move methods to manager, add tests 2021-07-13 13:24:22 +02:00
Christian Cueni 549bf1ef28 Re-order structure 2021-07-13 13:23:58 +02:00
Christian Cueni 91fa976317 Redirect back to frontend upon successful oauth 2021-07-13 13:18:43 +02:00
Christian Cueni 6d3cbaf764 Create or update user and create or update token 2021-07-13 13:18:43 +02:00
Christian Cueni c937f4769c Move oauth to users 2021-07-13 13:18:43 +02:00
Christian Cueni 6607d8dee5 Add oauth lib, configure for hep api 2021-07-13 13:18:42 +02:00
Ramon Wenger bd15c9710d Allow users with expired license to access the private API 2021-07-06 16:41:38 +02:00
Ramon Wenger dc1cb86bb8 Add unit tests 2021-07-05 18:06:10 +02:00
Christian Cueni f5b1c29085 Add 90 days to subscription duration for yearly subscriptions 2021-06-29 10:52:36 +02:00
Ramon Wenger e7690d3e49 Add missing file 2021-05-05 19:57:39 +02:00
Ramon Wenger 45f99385d3 Fix unit tests 2021-05-05 19:47:06 +02:00
Ramon Wenger 29f3726993 Refactor content block type 2021-05-04 22:52:03 +02:00
Ramon Wenger ead7879787 Add snapshot queries and mutations to server 2021-04-28 00:46:37 +02:00
Ramon Wenger d4a1c201f2 Clean up code, add some todos 2021-04-26 19:26:47 +02:00
Ramon Wenger 4e1ab68a52 Add team model, team node and a mutation for creating a team 2021-03-24 23:43:36 +01:00
Ramon Wenger 5e5b413afb Add tests to cover more use cases 2021-03-23 14:09:08 +01:00
Ramon Wenger ff7617ee2e Update logging settings 2021-03-22 17:24:52 +01:00
Ramon Wenger d97b46fc23 Update sentry settings 2021-03-22 17:23:16 +01:00
Ramon Wenger 1196c4ff80 Merge branch 'hotfix/duplicate-bookmarks-and-submissions' into develop 2021-03-22 16:43:15 +01:00
Ramon Wenger 58ea9a1049 Fix duplicate student submission bug 2021-03-22 16:10:06 +01:00
Ramon Wenger c60af4acc2 Merge branch 'hotfix/enable-pii' into develop 2021-03-18 14:32:35 +01:00
Ramon Wenger 8189e05b0d Add user id to sentry logs 2021-03-18 14:31:46 +01:00
Ramon Wenger bdeef5323f Add reset script 2021-03-15 23:19:45 +01:00
Ramon Wenger e8ca7ccccf Add missing files 2021-03-15 23:19:20 +01:00
Ramon Wenger fb8dfee25c Fix unit tests 2021-03-12 15:04:57 +01:00
Ramon Wenger a1490c6049 Add basic test for new visibility feature 2021-03-12 11:19:56 +01:00
Ramon Wenger 62dec16667 Update logger settings 2021-03-05 11:14:05 +01:00
Ramon Wenger 9139aa80b7 Add user information to sentry 2021-02-25 11:54:55 +01:00
Ramon Wenger 5a3badd38e Improve provision of development assets 2021-02-24 15:15:45 +01:00
Ramon Wenger 3660a282a3 Merged in feature/chapter-visibility (pull request #78)
Feature/chapter visibility

Approved-by: Christian Cueni
2021-02-23 10:13:16 +00:00
Ramon Wenger 195f35b1f0 Remove obsolete code 2021-02-23 10:05:41 +01:00
Ramon Wenger dea4719fd1 Add django command to generate a GraphQL SDL file 2021-02-22 17:14:10 +01:00
Ramon Wenger 5b3777cb87 Handle bools in bool_value call 2021-01-14 17:10:48 +01:00
Ramon Wenger 9f81082f12 Change how static files for cypress tests are served 2021-02-11 14:31:03 +01:00
Ramon Wenger 763b643186 Merge branch 'feature/whitelabel' into develop 2021-02-03 14:31:02 +01:00
Ramon Wenger 9791d2d587 Add check for roles 2021-01-25 16:05:32 +01:00
Ramon Wenger 173a954516 Enable spell check based on env variable 2021-01-21 16:41:11 +01:00
Ramon Wenger 6101964282 Add default logo 2021-01-20 17:06:37 +01:00
Ramon Wenger 2fe24f532a Add autocomplete to assignment owner field in cms admin 2021-01-14 20:40:24 +01:00
Ramon Wenger ece9178513 Add connection age to database settings 2020-11-18 21:45:47 +01:00
Ramon Wenger b3c36fb749 Add example survey data 2020-10-20 10:28:01 +02:00
Ramon Wenger d0af9cfcfc Merge branch 'feature/onboarding' into develop 2020-07-20 11:04:54 +02:00
Ramon Wenger 2c0039be42 Fix cypress tests 2020-07-10 15:15:56 +02:00
Christian Cueni 1045093cac Add data migration 2020-07-07 11:42:41 +02:00
Christian Cueni 4944745da0 Add support for multiple licenses 2020-07-07 11:42:41 +02:00
Ramon Wenger a2bbb6b26a Update test settings 2020-06-30 11:37:52 +02:00
Christian Cueni 1b4a0da2e1 Merged in feature/news (pull request #65)
Feature/news

Approved-by: Ramon Wenger
2020-06-17 11:53:45 +00:00
Christian Cueni 22c2a44794 Save accepted terms in db 2020-06-04 13:19:17 +02:00
Christian Cueni 0b19f6c697 Rename app, update css classes 2020-06-03 13:25:53 +02:00
Christian Cueni 1437f465de Add tiny font, update date language 2020-05-28 08:41:15 +02:00
Christian Cueni 7d153be053 Add newsteaser dummy data 2020-05-25 13:17:12 +02:00
Christian Cueni 5a042bb115 Add models and graphql 2020-05-20 11:55:06 +02:00
Christian Cueni 7ac181dd33 Fix middleware tests 2020-05-12 15:57:54 +02:00
Christian Cueni 249a0f7ca1 Fix middleware 2020-05-12 15:39:20 +02:00
Christian Cueni ce299e0f0e Merged in feature/licensing (pull request #50)
Feature/licensing
2020-05-12 11:37:17 +00:00
Christian Cueni 03a977b974 Fix tests 2020-05-12 11:44:35 +02:00
Christian Cueni a2554fbf37 Clean up code 2020-05-12 11:36:59 +02:00
Christian Cueni d159876472 Rename input variable 2020-05-12 11:20:43 +02:00
Christian Cueni 685fa3ff34 Use built-in graphql errors 2020-05-12 09:56:48 +02:00
Ramon Wenger cd2e5c953e Update instrument dummy data 2020-05-07 12:22:43 +02:00
Christian Cueni 9a2991961c Update schema generation 2020-05-04 09:31:44 +02:00
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 e147ca65e0 Fix date comparison 2020-04-30 13:17:33 +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 d46cc7a177 Use remove error field, fix tests 2020-04-30 08:49:54 +02:00
Christian Cueni 1ca982dd24 Fix settings 2020-04-30 07:49:48 +02:00
Christian Cueni 57e7122fef Update ISBN 2020-04-30 07:03:56 +02:00
Christian Cueni d10517b4f5 Update env variables 2020-04-30 06:49:18 +02:00
Ramon Wenger 04ae5a22a8 Add new favicons 2020-04-08 14:16:03 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger ad3e3fa629 Add additional pipeline test settings 2020-04-02 16:20:42 +02:00
Ramon Wenger 2fbc70f459 Add backend code to generate school class codes 2020-03-20 22:51:05 +01:00
Christian Cueni 0e52ab6f49 Clean up code 2020-03-17 14:20:06 +01:00
Ramon Wenger 7b66d9b71b Add dedicated django command for cypress schema 2020-03-16 10:05:29 +01: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
Ramon Wenger de62252824 Fix unit tests 2020-03-05 16:54:56 +01:00
Ramon Wenger ab9da652cf Allow multiple teachers per school class
For that purpose, now the enabled solutions are stored on a per school class
basis instead of a per teacher basis
2020-03-02 17:37:29 +01:00
Christian Cueni 096fe77d46 Remove call to dummy license command 2020-02-27 13:12:33 +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
Ramon Wenger 10349d91b5 Update dummy data 2020-02-26 12:46:10 +01:00
Christian Cueni 13295e2d2e Fix tests 2020-02-25 16:12:01 +01:00
Christian Cueni 93798358ea Use html emails 2020-02-25 14:54:02 +01:00
Christian Cueni b572523a33 Add proxy for registration call 2020-02-25 14:42:42 +01:00
Christian Cueni 950faf1c9c Merged in hotfix/html-email (pull request #47)
Add html links to emails

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2020-02-25 13:23:11 +00:00
Christian Cueni d44e38c04c Add tag for link generation 2020-02-25 10:28:57 +01:00
Christian Cueni fff752f59d Add update admin token command 2020-02-24 16:22:48 +01:00
Christian Cueni f62d2ad5ef Fix license sync 2020-02-24 16:12:40 +01:00
Christian Cueni f24f828a45 Add html links to emails 2020-02-24 13:19:27 +01:00
Christian Cueni f8fab82851 Finish coupon flow 2020-02-24 11:30:37 +01:00
Christian Cueni 0df6cb9d93 Add cronjob for license-sync 2020-02-20 14:21:52 +01:00
Christian Cueni 96c0b3ee64 Move license to core 2020-02-20 13:22:15 +01:00
Christian Cueni 8d864fbf6e Remove legacy registration 2020-02-20 08:36:05 +01:00
Christian Cueni c93d2f6843 Remove hep id as default 2020-02-18 16:57:36 +01:00
Christian Cueni e067717d50 Fix local login 2020-02-18 16:01:20 +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
Ramon Wenger bd6e0f75ca Add code to school class dummy data 2020-02-18 10:23:27 +01:00
Christian Cueni 677d8dbf44 Fix login & tests 2020-02-18 10:05:07 +01:00
Christian Cueni 36c43bf4e1 Detect 402 in frontend, allow me query 2020-02-17 16:08:47 +01:00
Christian Cueni c9c42e2296 Check user license in Api, save 2020-02-17 15:08:06 +01:00
Christian Cueni 7a532463a6 Update registration mutation with user id and hep calls 2020-02-13 12:32:55 +01:00
Christian Cueni 909f7337ac Fix email verification for stage 2020-02-13 11:28:23 +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 587d661ca8 Add hello page, add local mutation 2020-02-11 14:42:58 +01:00
Christian Cueni 68bba26c75 Add stage confirmation view 2020-02-11 14:40:34 +01:00
Christian Cueni ffb330223c Check minimal date 2020-02-11 14:40:34 +01:00
Christian Cueni 321163e542 Add coupons, refactor utility functions 2020-02-11 14:40:34 +01:00
Christian Cueni f628966ae9 Add registration, implement tests 2020-02-11 14:40:34 +01:00
Christian Cueni 6beb4296f7 Store admin token in db 2020-02-11 14:40:34 +01:00