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

245 Commits

Author SHA1 Message Date
Ramon Wenger b966b4e981 Re-add comment test 2021-08-24 13:31:05 +02:00
Ramon Wenger d071afbd67 Add new test for school class read only 
Also clean up some code
 2021-07-28 16:19:42 +02:00
Christian Cueni d0570c118c Update tests 2021-07-15 14:33:28 +02:00
Christian Cueni b902ca1e92 Update valid product states, update subscription duration 2021-07-13 13:25:49 +02:00
Christian Cueni 44be6735a3 Fix model 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 bd110cc1fb Remove old hep id field 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 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 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 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 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 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
Ramon Wenger dcd8420419 Merge branch 'feature/snapshots' into develop 2021-06-06 19:06:14 +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
Christian Cueni d7a9629139 Display hep_id in list view 2021-05-10 08:31:16 +02:00
Ramon Wenger 3f313ddb12 Add user helper method 2021-04-14 23:25:30 +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 b5118f6c1e Fix login bug for users with no school class 2021-03-18 15:47:05 +01:00
Ramon Wenger 297896e380 Make owner of assignments optional 2021-01-26 16:29:00 +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 886550c224 Add interdisciplinary objective groups 2020-09-28 17:55:49 +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 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 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 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
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
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 22c2a44794 Save accepted terms in db 2020-06-04 13:19:17 +02:00
Christian Cueni 03a8b35466 Add source, add tests 2020-05-25 12:41:12 +02:00
Christian Cueni 5a042bb115 Add models and graphql 2020-05-20 11:55:06 +02:00
Christian Cueni a2554fbf37 Clean up code 2020-05-12 11:36:59 +02:00
Christian Cueni 9e940e31d8 Allow beta users to keep data after hep registration 2020-05-06 08:03:51 +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
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
Ramon Wenger 611a066c65 Add button to change the school class name 2020-03-14 11:27:16 +01:00
Ramon Wenger b3b02acfef Fix login for users with no school class 2020-03-10 11:03:06 +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 7e91b606bd Fix migrations 2020-02-27 10:41:30 +01:00