Commit Graph

1036 Commits

Author SHA1 Message Date
Ramon Wenger 9ab8b8d3e4 Backport changes from django3 upgrade, downgrade python versions
Package versions will be in line with the current production
environment, for now.
2022-01-25 11:56:36 +01:00
Ramon Wenger b51d992546 Add server handling of content list items 2022-01-24 17:52:36 +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 dc8ec86610 Fix bug in room contents 2021-12-13 16:34:11 +01:00
Ramon Wenger 41bbfd7177 Replace deprecated stream_data with raw_data 2021-12-13 15:53:38 +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 87c477d0c4 Update visited field to be timezone-aware 2021-12-13 14:42:49 +01:00
Christian Cueni 6539ac88d8 Make old_type optional 2021-11-29 12:04:28 +01:00
Christian Cueni 48e2a8a428 Order instruments 2021-11-17 12:54:52 +01:00
Christian Cueni b9a8b3ff38 Fix bug, add happy path test 2021-11-16 15:36:26 +01:00
Christian Cueni a3fe315df3 Refactor mutations 2021-11-16 14:12:17 +01:00
Christian Cueni c3274b4a65 Fix test 2021-11-16 14:12:17 +01:00
Christian Cueni 2a6993cad8 Fix PHEP-3 (edit project as other user) 2021-11-16 14:12:17 +01:00
Christian Cueni ee05ee79ba Fix PHEP-7 (user can add room entry at other school) 2021-11-16 14:12:17 +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
Christian Cueni 79cd70cbd8 Order instruments by name 2021-11-16 14:10:15 +01:00
Christian Cueni b0aed1ca74 Add type to parent if missing 2021-11-16 11:55:57 +01:00
Christian Cueni 591c922c98 Add missing subselection to query, update tests 2021-11-16 08:49:28 +01:00
Ramon Wenger eedf7202d6 Update instrument type query test and fix multiple similar types bug 2021-11-11 14:00:07 +01:00
Christian Cueni 98dc5ffda7 Fix bug in exception 2021-11-11 09:13:08 +01:00
Ramon Wenger f03beb8b34 Return only instrument types with assigned instruments 2021-11-10 12:47:52 +01:00
Ramon Wenger 885d9d4f88 Add migration for new instrument type population 2021-11-01 11:57:42 +01:00
Ramon Wenger 812021cb54 Fix unit tests 2021-10-31 22:12:57 +01:00
Ramon Wenger 6407664f80 Update server definitions for instrument types 2021-10-31 21:47:02 +01:00
Ramon Wenger ac6c60f8c3 Add instrument type query 2021-10-30 22:29:31 +02:00
Ramon Wenger 26b1c3e8af Fix model definition 2021-10-25 12:10:10 +02:00
Ramon Wenger ab60aaf9b8 Add new types 2021-10-25 11:48:43 +02:00
Ramon Wenger 072258fac0 Rename BasicKnowledgeQuery to InstrumentQuery 2021-10-20 14:03:33 +02:00
Ramon Wenger 14e9a4d6ec Update BasicKnowledge model with new type property 2021-10-20 14:02:31 +02:00
Ramon Wenger b4c9e01fcb Add command to export assignments 2021-10-18 15:38:57 +02:00
Ramon Wenger 90a576c661 Merge branch 'hotfix/assignment-list-filter-and-export' into develop 2021-10-18 14:00:49 +02:00
Ramon Wenger a79a8f9908 Add list filter and export options to assignment list 2021-10-18 13:58:51 +02:00
Ramon Wenger 91a1dd0bdb Merge branch 'feature/new-portfolio-layout' into develop 2021-10-07 20:21:20 +02:00
Ramon Wenger bb694e443d Add more access test for projects 2021-10-06 10:54:52 +02:00
Ramon Wenger 36268581f9 Fix unit tests 2021-10-05 23:25:39 +02:00
Ramon Wenger 315216833b Update mutation schema for project entries 2021-10-05 22:55:03 +02:00
Ramon Wenger 34bab79c4a Update failing unit test 2021-10-05 14:43:24 +02:00
Ramon Wenger 937c6cff2e Update project entry properties 2021-10-05 13:19:26 +02:00
Christian Cueni a34db38a5e Add migration for raw field 2021-09-22 11:51:15 +02:00
Christian Cueni 4be9858730 Add created_at fields to license 2021-09-22 11:51:15 +02:00
Christian Cueni 28cdc3f4f8 Add created_field to license 2021-09-22 11:51:15 +02:00
Christian Cueni e74f224de4 Add command to fix ibans 2021-09-22 11:51:15 +02:00
Christian Cueni fbc441d1ea Save new expiry_dates to models 2021-09-22 11:51:15 +02:00
Christian Cueni adba163c77 WIP: Add command for license duration reset 2021-09-22 11:51:15 +02:00
Christian Cueni dbd5f92fbd Save correct license for user 2021-09-22 11:51:15 +02:00
Ramon Wenger 42c99b3c83 Add student submissions to assignment admin 2021-09-21 09:12:52 +02:00
Ramon Wenger 3951b3f90c Fix unit test 2021-09-20 20:33:59 +02:00
Ramon Wenger 96ed807b2b Update schema for projects 2021-09-02 09:38:43 +02:00
Ramon Wenger b705e68e3b Use migration without helper class 2021-08-31 14:57:16 +02:00
Ramon Wenger 61458b7761 Fix typo 2021-08-31 14:11:42 +02:00
Ramon Wenger fdd35301d9 Update migration again 2021-08-31 14:01:48 +02:00
Ramon Wenger da7adcbb4c Update data migration 2021-08-31 13:28:37 +02:00
Ramon Wenger 84b646ed0a Add unit test for restricted rooms 2021-08-30 16:54:06 +02:00
Ramon Wenger 7d2bba14b7 Add query test 2021-08-27 16:38:27 +02:00
Ramon Wenger e368307d3d Add mutation to frontend 2021-08-27 16:03:32 +02:00
Ramon Wenger 572074dbfb Add mutation to schema, also add tests 2021-08-27 15:49:28 +02:00
Ramon Wenger 6b3f84a619 Remove school class from new room mutation 2021-08-25 16:38:16 +02:00
Ramon Wenger 75ca2f552c Fix unit test 2021-08-25 15:02:57 +02:00
Ramon Wenger 7118b32cbb Fix unit test 2021-08-25 14:25:04 +02:00
Ramon Wenger cf5a3f7d9d Update add room entry button 2021-08-25 14:22:20 +02:00
Ramon Wenger 6961c96dd4 Add styling to comments 2021-08-25 09:07:40 +02:00
Ramon Wenger b966b4e981 Re-add comment test 2021-08-24 13:31:05 +02:00
Ramon Wenger 9f858ea46c Add comment node to room entry 2021-08-23 15:57:08 +02:00
Ramon Wenger 30b123523a Add comment model 2021-08-19 21:24:32 +02:00
Ramon Wenger f9273f745c Add school class to portfolio project 2021-08-10 16:22:04 +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 44f25bd113 Add read-only banner 2021-08-03 15:12:09 +02:00
Ramon Wenger b6298710a0 Fix unit test 2021-08-03 14:48:26 +02:00
Ramon Wenger 7728f654a5 Refactor dummy users to be more anonymous 2021-08-03 14:16:15 +02:00
Ramon Wenger 57698e577e Move news query from public to private apollo client 2021-08-03 14:10:27 +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
Ramon Wenger 9dbddac078 Add missing migration 2021-07-26 17:15:50 +02:00
Christian Cueni f8f40d08b8 Redirect user to hep logout-url after logout 2021-07-21 07:18:08 +02:00
Christian Cueni d0570c118c Update tests 2021-07-15 14:33:28 +02:00
Christian Cueni fccc7526b5 Update eorder field 2021-07-15 13:29:34 +02:00
Christian Cueni 6a61baf06b Handle missing key 2021-07-15 08:44:29 +02:00
Christian Cueni 62a23fac4f Fix missing header 2021-07-13 16:38:07 +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 4762751fc9 Update settings, fix typo 2021-07-13 13:25:13 +02:00
Christian Cueni 73f2be72ce Fix url in tests 2021-07-13 13:25:13 +02:00
Christian Cueni 7ffeda0ca3 Add logging 2021-07-13 13:25:13 +02:00
Christian Cueni 9b7c74e7f7 Add refresh tests 2021-07-13 13:25:13 +02:00
Christian Cueni 198a0fa33c Add token tests 2021-07-13 13:25:13 +02:00
Christian Cueni 4a95f3b020 Fix tests 2021-07-13 13:25:13 +02:00
Christian Cueni 06d08fcbe9 Refresh token 2021-07-13 13:25:13 +02:00
Christian Cueni f1ca00f47b Clean up 2021-07-13 13:25:13 +02:00
Christian Cueni 40f4883f60 Fix unit tests 2021-07-13 13:25:13 +02:00
Christian Cueni 5188d2a061 Update states, add verify email page 2021-07-13 13:25:13 +02:00
Christian Cueni 55502d5507 Handle token on logout, fix HepClient 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 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 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