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

1081 Commits

Author SHA1 Message Date
Christian Cueni 08e259ebf6 Fix test, add env-variables 2021-07-13 13:25:11 +02:00
Christian Cueni 85f730644f Add oauth migrations 2021-07-13 13:24:23 +02:00
Christian Cueni c71d8fd6e5 Fix oauth tests 2021-07-13 13:24:23 +02:00
Christian Cueni 2c771e5a97 Remove unused command, remove unused methods in hep client 2021-07-13 13:24:23 +02:00
Christian Cueni ea65118d99 Fix HepClient tests 2021-07-13 13:24:23 +02:00
Christian Cueni a6bfe0526c Remove unused e2e tests, add oauth tests 2021-07-13 13:24:23 +02:00
Christian Cueni 1cfb7c7028 Remove redundant login tests 2021-07-13 13:24:23 +02:00
Christian Cueni d4e8aca825 Remove login 2021-07-13 13:24:23 +02:00
Christian Cueni 8db122c436 Remove unused code 2021-07-13 13:24:23 +02:00
Christian Cueni 47a5266752 Add registration test 2021-07-13 13:24:22 +02:00
Christian Cueni 2718362cee Fix login tests 2021-07-13 13:24:22 +02:00
Christian Cueni 4b1ddd2627 Fix timezones 2021-07-13 13:24:22 +02:00
Christian Cueni 5c8c836a2b Select active myskillbox product 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 5648351ef5 Add field for old hep id 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 b0478f30cd Add todo comments 2021-07-07 16:18:14 +02:00
Ramon Wenger 0ae9ccaa68 Update exception 2021-07-06 20:37:52 +02:00
Ramon Wenger cfaa5c9a4f Re-add missing import 2021-07-06 17:49:03 +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 71bd9f6d14 Update readonly property on user 2021-07-06 15:41:02 +02:00
Ramon Wenger 249abff36b Add license check to user model 2021-07-06 15:09:51 +02:00
Ramon Wenger dc1cb86bb8 Add unit tests 2021-07-05 18:06:10 +02:00
Ramon Wenger e4bb4cc9ee Add tests for read only assignments 2021-07-01 16:58:56 +02:00
Ramon Wenger 9ea9b9be1b Re-add leave button and inactive members to group list 2021-06-30 15:52:57 +02:00
Ramon Wenger 5202ecdc8e Fix chapter and content block querysets for snapshots 2021-06-29 16:43:07 +02:00
Christian Cueni f5b1c29085 Add 90 days to subscription duration for yearly subscriptions 2021-06-29 10:52:36 +02:00
Ramon Wenger 1d5bb61761 Add new env variables to example file 2021-06-24 15:25:38 +02:00
Ramon Wenger e86d67ae35 Change string representation of snapshots 2021-06-22 08:33:30 +02:00
Ramon Wenger e2c989f4a2 Fix chapter visibility properties 2021-06-14 16:01:29 +02:00
Ramon Wenger 01117b5880 Add logging to snapshot 2021-06-14 15:45:54 +02:00
Ramon Wenger ab13b9b8f7 Update variable names 2021-06-14 14:55:15 +02:00
Ramon Wenger 45b3414226 Reset chapter visibilities 2021-06-14 11:30:14 +02:00
Ramon Wenger 9c82dc2bf4 Fix content blocks created by applying a snapshot 2021-06-07 17:45:24 +02:00
Ramon Wenger b26c9c07f5 Clean up code 2021-06-07 16:29:47 +02:00
Ramon Wenger dcd8420419 Merge branch 'feature/snapshots' into develop 2021-06-06 19:06:14 +02:00
Ramon Wenger 25d08f2c09 Fix some code in the cypress tests 2021-06-06 18:53:16 +02:00
Ramon Wenger 6646b328b7 Add original creator to custom content blocks 2021-06-03 17:52:29 +02:00
Ramon Wenger 4a5ad26fe6 Fix unit tests 2021-05-25 23:54:16 +02:00
Ramon Wenger 9582773378 Add 'Leave Team' action 2021-05-25 23:30:19 +02:00
Ramon Wenger a43dffc7f7 Add team admin 2021-05-25 19:17:00 +02:00
Ramon Wenger 3c85ab6520 Fix custom content blocks in snapshot preview 2021-05-25 15:46:43 +02:00
Ramon Wenger c257447748 Add objective change count 2021-05-25 13:46:23 +02:00
Ramon Wenger 7c86338191 Add failing frontend test 2021-05-18 22:40:04 +02:00
Ramon Wenger e1e3b62807 Hide hidden custom entities in snapshot 2021-05-18 22:38:47 +02:00
Ramon Wenger ef15a655b8 Add objectives to snapshot preview 2021-05-18 17:32:38 +02:00
Ramon Wenger a168b3141e Fix unit tests 2021-05-12 15:25:42 +02:00
Ramon Wenger de26a9f8ac Add objectives to snapshots 2021-05-11 23:54:08 +02:00
Ramon Wenger 24c88e84ff Add ability to share a snapshot 2021-05-10 14:05:14 +02:00
Christian Cueni d7a9629139 Display hep_id in list view 2021-05-10 08:31:16 +02:00
Ramon Wenger 4bdcdd8774 Add share snapshot mutation, including unit tests 2021-05-08 23:19:58 +02:00
Ramon Wenger 6a3b464bde Add script to create graphql schema 
Also, update Pipfile.lock
 2021-05-06 23:29:18 +02:00
Ramon Wenger 885d321c96 Add constants and update schema 2021-05-06 23:19:47 +02:00
Ramon Wenger e990596af5 Update snapshot node and mutation 2021-05-06 23:17:48 +02:00
Ramon Wenger 3d78761e20 Add snapshot module header 
Also refactor some queries and other code
 2021-05-06 23:13:57 +02:00
Ramon Wenger 046b741458 Update schema 2021-05-06 11:20:27 +02:00
Ramon Wenger da85d3dbc2 Fix frontend tests 2021-05-06 10:59:32 +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 70e7dc39a9 Display snapshot module detail 2021-05-05 00:18:53 +02:00
Ramon Wenger 29f3726993 Refactor content block type 2021-05-04 22:52:03 +02:00
Ramon Wenger 85a3131680 Add snapshot module detail query 2021-05-04 15:25:28 +02:00
Ramon Wenger cde5e8d964 Add snapshot creator and created date 2021-04-29 16:46:32 +02:00
Ramon Wenger 08ddd58132 Move schema file 2021-04-29 15:35:10 +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 8d6f30b2d2 Add mutation to apply a snapshot 
Also add unit test
 2021-04-24 19:59:04 +02:00
Ramon Wenger 1c91ac93a7 Remove unused connection 2021-04-14 23:27:31 +02:00
Ramon Wenger a77d8ceee4 Refactor schema 2021-04-14 23:27:13 +02:00
Ramon Wenger 3f313ddb12 Add user helper method 2021-04-14 23:25:30 +02:00
Ramon Wenger 0bef8fe570 Fix unit test 2021-04-14 23:25:08 +02:00
Ramon Wenger 15aff9054c Add unit test, model and mutation for snapshots 2021-04-14 23:17:50 +02:00
Ramon Wenger 85706d73d1 Refactor module server code 2021-04-12 17:18:12 +02:00
Ramon Wenger da2253a73d Merged in feature/teams (pull request #81) 
Feature/teams

Approved-by: Christian Cueni
 2021-04-12 14:53:13 +00:00
Ramon Wenger c7ee95f4b2 Add some debug info to taskbase call 2021-04-07 16:32:08 +02:00
Ramon Wenger be7e280ebc Add first unit test 2021-04-07 10:58:52 +02:00
Ramon Wenger 58e5eb1617 Add team resolver 2021-03-25 23:13:00 +01:00
Ramon Wenger 9bde5dbb20 Add update team mutation on server and some tests for it 2021-03-25 18:00:04 +01:00
Ramon Wenger f6eaecb571 Fix import 2021-03-25 16:35:58 +01:00
Ramon Wenger ba0059d90f Restrict team mutations to teachers 2021-03-25 16:32:09 +01:00
Ramon Wenger a4ff9d2942 Add join team mutation 2021-03-25 00:13:43 +01: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 af77d7cf58 Add project entries in project admin 2021-03-23 16:25:28 +01:00
Ramon Wenger 5e5b413afb Add tests to cover more use cases 2021-03-23 14:09:08 +01:00
Ramon Wenger 4185dc3ea8 Remove unused code 2021-03-22 17:27:22 +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 99462283e2 Fix unique content uuid bug and duplicate entry bug 2021-03-22 16:39:40 +01:00
Ramon Wenger 58ea9a1049 Fix duplicate student submission bug 2021-03-22 16:10:06 +01:00
Ramon Wenger cc68e299f6 Merge branch 'hotfix/login-bug-as-new-student' into develop 2021-03-18 15:47:32 +01:00
Ramon Wenger b5118f6c1e Fix login bug for users with no school class 2021-03-18 15:47:05 +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 8f6b2e3847 Add rich text editor to assignment solution 2021-03-15 22:47:27 +01:00
Ramon Wenger fb8dfee25c Fix unit tests 2021-03-12 15:04:57 +01:00
Ramon Wenger 9490ffd443 Add module visibility sync mutation 2021-03-12 11:19:56 +01:00
Ramon Wenger 209838dadb Add method for syncing school classes 2021-03-12 11:19:56 +01:00
Ramon Wenger a1490c6049 Add basic test for new visibility feature 2021-03-12 11:19:56 +01:00
Ramon Wenger 523f3d5f88 Add missing migration 2021-03-05 12:17:24 +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 c69a78162b Remove more unused code 2021-02-22 17:10:11 +01:00
Ramon Wenger 73e3339d81 Remove unused code 2021-02-22 17:09:47 +01:00
Ramon Wenger e10481ce49 Add visibility actions to objective group 2021-02-22 17:04:45 +01:00
Ramon Wenger 8d9761b3ef Add new chapter visibility properties to model and schema 2021-02-18 17:54:02 +01:00
Ramon Wenger 1f3b6fe40d Add tenant id to taskbase call 2021-02-15 20:03:20 +01:00
Ramon Wenger 048fd1b4a7 Add more debugging info to taskbase call 2021-02-15 15:22:40 +01:00
Ramon Wenger 5b3777cb87 Handle bools in bool_value call 2021-01-14 17:10:48 +01:00
Ramon Wenger dbee7889b7 Protect some objects from deletion 2021-02-11 17:26:50 +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 b2f92ecbc7 Always show assignment solutions to teachers 2021-02-02 15:45:22 +01:00
Ramon Wenger 1b19d8e6eb Fix unit test 2021-01-28 13:57:25 +01:00
Ramon Wenger a47a41d351 Always show solutions for teachers 2021-01-27 17:16:42 +01:00
Ramon Wenger 297896e380 Make owner of assignments optional 2021-01-26 16:29:00 +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 550361f64b Add default env variables to example 2021-01-21 15:09:12 +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 b94ce40313 Update assignment admin fields 2021-01-14 20:37:32 +01:00
Ramon Wenger 7d30497e48 Add user argument to default class name method 2021-01-11 16:33:15 +01:00
Ramon Wenger ece9178513 Add connection age to database settings 2020-11-18 21:45:47 +01:00
Ramon Wenger ecec97a411 Fix vanishing text bug on submission feedback 2020-11-17 14:03:10 +01:00
Ramon Wenger b3c36fb749 Add example survey data 2020-10-20 10:28:01 +02:00
Ramon Wenger 973912ba94 Fix admin interface for objective order 2020-09-30 17:25:52 +02:00
Ramon Wenger af71a5a282 Add objective ordering 2020-09-30 17:20:22 +02:00
Ramon Wenger 76b14e3cc8 Add intro to instruments 2020-09-29 13:56:17 +02:00
Christian Cueni 5057e54e4d Merged in hotfix/typos (pull request #75) 
Hotfix/typos
 2020-09-28 16:56:40 +00:00
Ramon Wenger 886550c224 Add interdisciplinary objective groups 2020-09-28 17:55:49 +02:00
Christian Cueni 33bd20d44b Fix typos 2020-09-28 14:18:21 +02:00
Christian Cueni bdedc22a32 Fix portfolio query 2020-09-08 14:42:39 +02:00
Ramon Wenger 05c43b80fc Add unit test, fix multiple custom content block bug 2020-08-10 19:09:52 +02:00
Ramon Wenger d4063286fe Add search fields to school class admin 2020-07-22 11:39:29 +02:00
Ramon Wenger c3d86090d4 Fix migrations 2020-07-20 11:28:54 +02:00
Ramon Wenger d0af9cfcfc Merge branch 'feature/onboarding' into develop 2020-07-20 11:04:54 +02:00
Ramon Wenger 8765e849e3 Add unit test 2020-07-15 12:02:56 +02:00
Ramon Wenger 6f77603e11 Let teachers see all the contents their classes can see 2020-07-15 11:42:17 +02:00
Ramon Wenger 9027aaa4ee Add unit tests for onboarding 2020-07-10 16:08:18 +02:00
Ramon Wenger ff3372c525 Fix unit tests 2020-07-10 15:25:29 +02:00
Ramon Wenger 2c0039be42 Fix cypress tests 2020-07-10 15:15:56 +02:00
Ramon Wenger e9d8fdad24 Fix cypress tests 2020-07-10 11:49:00 +02:00
Ramon Wenger f588abee43 Add onboarding visited flag to user 2020-07-07 22:31:25 +02:00
Christian Cueni 03f9fb48bd Fix migrations 2020-07-07 13:32:37 +02:00
Christian Cueni dcb886a17c Show if user has accepted terms and condition in admin 2020-07-07 11:42:41 +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 44e7e4c322 Clean up code 2020-07-02 12:32:44 +02:00
Ramon Wenger a2bbb6b26a Update test settings 2020-06-30 11:37:52 +02:00
Ramon Wenger dc0d6523cd Add unit tests for recent modules 2020-06-30 11:33:14 +02:00
Ramon Wenger b3894ec8d6 Add missing migration 2020-06-25 15:20:05 +02:00
Ramon Wenger e899bbe21b Add recently visited modules to user 2020-06-25 15:12:59 +02:00
Christian Cueni 6a7fbd54cf Fix registration error 2020-06-18 18:30:26 +02:00
Ramon Wenger 5d4d660938 Rename conflicting migration 2020-06-18 16:52:19 +02:00
Ramon Wenger f544140c35 Fix missing migration again 2020-06-18 16:19:54 +02:00
Ramon Wenger 8e48d12605 Fix missing migration reference 2020-06-18 16:17:51 +02:00
Ramon Wenger da5bd1e439 Merged in feature/save-last-topic (pull request #67) 
Save last topic and go there on topic navigation

Approved-by: Christian Cueni
 2020-06-18 14:08:18 +00:00
Ramon Wenger 5339ede9aa Remove duplicate migrations 2020-06-17 14:29:15 +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
Ramon Wenger c6bdae3fd3 Save last topic and go there on topic navigation 2020-06-16 16:29:41 +02:00
Christian Cueni 3f8c604a0c Remove migrations, rename html properties 2020-06-04 13:20:30 +02:00
Christian Cueni 20a6290eb9 Update copy 2020-06-04 13:19:17 +02:00
Christian Cueni 22c2a44794 Save accepted terms in db 2020-06-04 13:19:17 +02:00
Christian Cueni d9fd4dac35 Enforce terms in proxy 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 ca6adf75e1 Move month to string to file 2020-05-28 09:58:19 +02:00
Christian Cueni abfed20a96 Handle locale fail 2020-05-28 09:27:26 +02:00
Christian Cueni 1437f465de Add tiny font, update date language 2020-05-28 08:41:15 +02:00
Christian Cueni 12c5bf8d90 Format date, style source 2020-05-27 11:51:43 +02:00
Ramon Wenger 93d7a3f959 Add environment information to frontend dev server 2020-05-27 10:12:18 +02:00
Ramon Wenger 7ef761cf58 Generate missing migrations 2020-05-26 16:05:21 +02:00
Ramon Wenger 09153782d5 Fix dummy data 2020-05-26 11:19:06 +02:00
Christian Cueni 8ce5401311 Add basic grid 2020-05-25 15:36:55 +02:00
Christian Cueni 7d153be053 Add newsteaser dummy data 2020-05-25 13:17:12 +02:00
Christian Cueni 03a8b35466 Add source, add tests 2020-05-25 12:41:12 +02:00
Christian Cueni 6933e10a7f Add news page, add field 2020-05-20 15:42:50 +02:00
Christian Cueni c904a0101a Add migrations, add admin, fix query 2020-05-20 13:14:19 +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
Christian Cueni edd431671f Remove unused variables, simplify tests 2020-05-12 08:11:51 +02:00
Ramon Wenger cd2e5c953e Update instrument dummy data 2020-05-07 12:22:43 +02:00
Christian Cueni 9e940e31d8 Allow beta users to keep data after hep registration 2020-05-06 08:03:51 +02:00
Christian Cueni 9a2991961c Update schema generation 2020-05-04 09:31:44 +02:00
Christian Cueni b7e929e9dd Add patch to test 2020-05-04 08:48:37 +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 0aa1625837 Update links, add group_id in customer 2020-04-30 12:16:24 +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 ebc8d070f6 Remove error field from query 2020-04-30 09:12:36 +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
Christian Cueni b14ed2fb5a Change url, add group_id 2020-04-27 08:14:39 +02:00
Ramon Wenger dcd9f0a92c Add instruction block inside content block 2020-04-12 23:06:49 +02:00
Ramon Wenger 8774b8d324 Add instructions property to topic model 2020-04-10 21:24:15 +02:00
Ramon Wenger 9bf7f2e9fa Merged feature/new-favicons into develop 2020-04-09 09:57:46 +02:00
Ramon Wenger 04ae5a22a8 Add new favicons 2020-04-08 14:16:03 +02:00
Ramon Wenger dc66293684 Add interdisciplinary instrument 2020-04-08 10:50:06 +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 7a84c2f043 Fix default class name generation 2020-04-01 09:37:54 +02:00
Ramon Wenger 2fbc70f459 Add backend code to generate school class codes 2020-03-20 22:51:05 +01:00
Ramon Wenger aa9e72b087 Set selected class to newly joined or created one 2020-03-19 13:49:29 +01:00
Ramon Wenger dbf2ba0832 Add mutation for creating new school classes with tests 2020-03-19 11:33:56 +01:00
Christian Cueni 737b682855 Add comments, clean up code 2020-03-17 16:13:00 +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
Ramon Wenger 611a066c65 Add button to change the school class name 2020-03-14 11:27:16 +01:00
Ramon Wenger 7c9d425a5e Clean up code 2020-03-12 18:06:05 +01:00
Ramon Wenger 1da6a00d40 Merged in feature/active-and-inactive-users-in-class (pull request #49) 
Feature/active and inactive users in class

Approved-by: Christian Cueni
 2020-03-10 15:01:53 +00:00
Ramon Wenger 6205846b80 Clean up code, change some minor things 2020-03-10 11:40:24 +01:00
Ramon Wenger 3e2b1f66a9 Add comment to code 2020-03-10 11:39:12 +01:00
Ramon Wenger b3b02acfef Fix login for users with no school class 2020-03-10 11:03:06 +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 442bab19bc Add unit test for old classes query 2020-03-09 15:34:09 +01:00
Christian Cueni b2d8c374c0 Raise exception in Backend 2020-03-09 13:51:46 +01:00
Ramon Wenger 229c6b4d8b Add old classes view 2020-03-08 11:57:42 +01:00
Ramon Wenger de62252824 Fix unit tests 2020-03-05 16:54:56 +01:00
Ramon Wenger f4270b8243 Remove actions in class list for students 2020-03-05 16:41:07 +01:00
Ramon Wenger 4a3d08203d Enable adding previous members to school classes 2020-03-05 16:18:30 +01:00
Ramon Wenger b82b82369c Add mutation to remove member from class 2020-03-05 15:14:26 +01:00
Ramon Wenger acdcc7ea13 Add class member node 2020-03-04 16:57:15 +01:00
Ramon Wenger 0ea72fe598 Rename UserSchoolClassConnection to SchoolClassMember 2020-03-04 16:57:15 +01:00
Ramon Wenger 35c981a2f2 Add through model to user school class connection, migrate all old 
classes
 2020-03-04 16:57:15 +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 7e91b606bd Fix migrations 2020-02-27 10:41:30 +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 bdee1875ff Fix backend test 2020-02-27 09:20:21 +01:00
Christian Cueni af818f5ee7 Send registration emails as html 2020-02-26 13:51:17 +01:00
Ramon Wenger f4a98e50ba Fix unit tests 2020-02-26 13:22:22 +01:00
Ramon Wenger 10349d91b5 Update dummy data 2020-02-26 12:46:10 +01:00
Christian Cueni a5e1b323a2 Synd HEP data 2020-02-26 11:12:13 +01:00
Christian Cueni 4e2c47d00a Update user expiry field, fix tests 2020-02-26 10:31:35 +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
Ramon Wenger 1623cd3265 Fix unit tests 2020-02-24 18:54:46 +01:00
Ramon Wenger 2e1d7b46bc Add error message and add styling 2020-02-24 18:32:55 +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
Ramon Wenger ca97a15398 Merge branch 'hotfix/postgres-pipelines' into feature/multiple-classes-for-everyone 2020-02-24 16:11:25 +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
Christian Cueni f3bd38e819 Redirect users without license to coupon page 2020-02-18 13:48:45 +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 99487c9705 Add unit tests 2020-02-12 20:29:22 +01:00
Ramon Wenger 2682b876b8 Prevent joining the same class again 2020-02-12 20:29:05 +01:00
Christian Cueni f5ddff12e3 Add email verification tests 2020-02-12 15:49:56 +01:00
Ramon Wenger a4a5e37268 Add code to school class, add form and mutation to join class 2020-02-12 10:17:31 +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 057e65a82f Fix urls, reset new migrations 2020-02-11 14:40:34 +01:00
Christian Cueni 68bba26c75 Add stage confirmation view 2020-02-11 14:40:34 +01:00
Christian Cueni 75e1597d6f Update email if user changed on hep 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 23028c779b Refactor login 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
Christian Cueni cd7f79072e Remove user token, use confirmation key 2020-02-11 14:40:34 +01:00
Christian Cueni 773547c883 Fix client, refactor user handling, fix tests 2020-02-11 14:40:33 +01:00
Christian Cueni 45f887287f Save group_id, verify email confirmed 2020-02-11 14:40:33 +01:00
Christian Cueni a2f634a677 Use token 2020-02-11 14:40:33 +01:00
Christian Cueni dbc4f6f2ee Handle network error 2020-02-11 14:40:33 +01:00
Christian Cueni c13ed2a5b2 Verify valid product, move default school creation 2020-02-11 14:40:33 +01:00
Christian Cueni 0e95e872c8 Verify valid product 2020-02-11 14:40:33 +01:00
Christian Cueni 8c9d40cbc7 Verify error message 2020-02-11 14:40:33 +01:00
Christian Cueni 9856693ea6 Test no validated email case 2020-02-11 14:40:33 +01:00
Christian Cueni e98d2774fd Test user with no login 2020-02-11 14:40:33 +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
Christian Cueni 2e8be04328 Add basic rest calls 2020-02-11 14:38:43 +01:00
Ramon Wenger 680b78e904 Only show instruments that are live and not only a draft 2020-02-10 15:37:03 +01:00
Ramon Wenger 12f3b2d9a7 Simplify the logic of visible content blocks for students 2020-02-10 09:27:43 +01:00
Ramon Wenger 542c7c6d84 Merged in feature/taskbase-spellcheck (pull request #45) 
Feature/taskbase spellcheck

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
 2020-02-06 14:16:40 +00:00
Ramon Wenger d11d494fae Clean up code 2020-02-06 15:06:50 +01:00
Ramon Wenger 66842ac1d8 Add instruments to the my activity page 2020-02-05 11:35:04 +01:00
Ramon Wenger c4cacac1c7 Update schema, fix cypress test 2020-02-04 22:05:12 +01:00
Ramon Wenger ec1d68dd51 Add sentence offset to spell check results 
Without that property, the offset always just starts at the current
sentence, not the whole user input
 2020-02-03 15:04:52 +01:00
Ramon Wenger 5a58641183 Add registration of our assignments as taskbase tasks 2020-01-20 17:56:54 +01:00
Ramon Wenger c9222adf60 Update cypress tests to mock the server 2020-01-20 17:14:20 +01:00
Ramon Wenger 53ce39c887 Add taskbase config variables to settings 2020-01-20 13:01:00 +01:00
Ramon Wenger bdda817533 Add spell check module to backend 2020-01-20 13:00:31 +01:00
Ramon Wenger 17e061892a Fix assignment creation in dummy data 2020-01-20 12:53:49 +01:00
Ramon Wenger cb1a6fda19 Add taskbase id field to assignments 2020-01-20 12:53:49 +01:00
Ramon Wenger 90bc6139d3 Fix prefetch statements 2020-01-16 16:46:43 +01:00
Ramon Wenger 53b0594207 Fix unit tests 2020-01-16 16:36:27 +01:00
Ramon Wenger 6b8b520bc5 Add test to check solution display in surveys 2020-01-16 16:07:00 +01:00
Ramon Wenger 00b2b02113 Use slug to identify module when toggling solutions 2020-01-16 15:49:50 +01:00
Ramon Wenger 8c908fddd2 Use slug to identify modules for the bookmark mutation 2020-01-16 15:03:50 +01:00
Ramon Wenger 66ed01c1d7 Fix bug in objectives 2020-01-16 11:38:00 +01:00
Ramon Wenger 2192fea5a5 Enable GZip middleware on the server for leaner responses 2020-01-16 10:47:03 +01:00
Ramon Wenger 5f6817ebbe Use slug to identify instruments on server 2020-01-16 09:48:38 +01:00
Ramon Wenger ef6711965f Optimize some queries to be easier on the database 2020-01-15 11:30:40 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger c8a09badad Add bookmarks to instruments on server side 2020-01-08 14:59:18 +01:00
Ramon Wenger 8765de9603 Add instrument query by id 2020-01-08 14:58:07 +01:00
Ramon Wenger e45847fe1e Fix unit tests 2019-12-19 09:46:55 +01:00
Ramon Wenger 9fb8e13c1c Enable scrolling to the content blocks in a module 2019-12-18 16:28:24 +01:00
Ramon Wenger 1549cde151 Update MyActivity query to include more activities 2019-12-18 13:11:32 +01:00
Ramon Wenger 6f0cb0dd88 Add command for exporting assignments 2019-12-16 15:24:46 +01:00
Ramon Wenger 3081cb4cd2 Clean up migration conflicts 2019-12-10 15:30:23 +01:00
Ramon Wenger 388c1f63d7 Merged in feature/bookmarks-for-modules-and-chapters (pull request #42) 
Feature/bookmarks for modules and chapters
 2019-12-10 14:09:13 +00:00
Ramon Wenger c2ead4c78d Add cypress test 2019-12-09 15:18:47 +01:00
Christian Cueni 92d03dbe50 Merged in feature/feedback (pull request #41) 
Feature/feedback
 2019-12-09 10:04:27 +00:00
Ramon Wenger 93fb4c2612 Refactor code 2019-12-09 10:38:59 +01:00
Ramon Wenger 89e3925590 Change submissionfeedback to submission_feedback or submissionFeedback, 
respectively
 2019-12-09 10:30:49 +01:00
Ramon Wenger 44ad1e6a8a Add unit tests 2019-12-09 10:20:41 +01:00