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

611 Commits

Author SHA1 Message Date
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
Ramon Wenger 3f66ce5a0f Add notes to chapters and modules 2019-12-05 14:39:50 +01:00
Ramon Wenger f6f61aaf05 Add bookmark action for modules 2019-12-03 15:06:47 +01:00
Ramon Wenger a06f32bcb0 Add bookmark action to chapter 2019-12-03 14:03:30 +01:00
Christian Cueni 84a69b24f1 Incoorperate feedback 2019-12-02 17:12:19 +01:00
Ramon Wenger 7c534cbe5c Add first raw implementation for adtl. bookmark types 2019-12-02 13:56:52 +01:00
Christian Cueni 7641e5dcaa Add logout button 2019-11-21 12:35:42 +01:00
Ramon Wenger e7916215b0 Update import command to allow S3 resources as source 2019-11-20 15:05:35 +01:00
Christian Cueni 066f5259ce Refactor submission form 2019-11-19 10:25:24 +01:00
Christian Cueni a732074a9b Add feedback in student view 2019-11-18 17:42:53 +01:00
Christian Cueni 662071d066 Handle form updates 2019-11-18 13:46:27 +01:00
Christian Cueni a2af5759bb Add emojis 2019-11-18 11:12:09 +01:00
Christian Cueni d3a81e17d8 Add Feedback container component 2019-11-14 11:11:58 +01:00
Christian Cueni f84efc7f1c Add mutations and tests 2019-11-13 16:29:53 +01:00
Christian Cueni add2c21815 Add feedback model, add migrations 2019-11-12 15:15:09 +01:00
Christian Cueni e2f5c0b3f0 Fix copy, fix styles on server 2019-11-11 18:19:35 +01:00
Christian Cueni 193c1d39b5 Style no class page, change admin display 2019-11-11 18:19:35 +01:00
Christian Cueni b20917d29a Validate license on login 2019-11-11 18:19:34 +01:00
Christian Cueni bceb01c5f4 Add and update tests, add dummy data 2019-11-11 18:19:34 +01:00
Christian Cueni 981b99ced7 Fix copy, fix mutation fields 2019-11-11 18:19:34 +01:00
Christian Cueni 148b2cae3d Init password reset after registration 2019-11-11 18:19:34 +01:00
Christian Cueni 436a9b891f Add registration component 2019-11-11 18:19:34 +01:00
Christian Cueni 80fce17efb Create class after regsitration 2019-11-11 18:19:34 +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
Christian Cueni 81fb4f23cd Change label for basic knowledge block 2019-11-05 10:40:19 +01:00
Christian Cueni 1352f68bae Add topic to objective admin view 2019-11-05 10:31:31 +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 38777cf914 Merged in feature/move-login (pull request #37) 
Feature/move login

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2019-10-23 06:58:46 +00:00
Ramon Wenger 1c2e0fc88b Add Thinglink block 2019-10-22 17:06:46 +02:00
Ramon Wenger 1d5603ed5f Add note update mutation 2019-10-12 08:54:20 +02:00
Ramon Wenger 62460d58ab Add node for notes 2019-10-12 08:52:23 +02:00
Ramon Wenger a8a6abb2d8 Add model and mutation for adding notes 2019-10-10 09:48:38 +02:00
Christian Cueni 0694471270 Fix test, cleanup 🛁 2019-10-08 13:41:09 +02:00
Christian Cueni 61161407b6 Fix & add api test 2019-10-08 10:44:45 +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 80b1d38b93 Style public pages, add links to login page 2019-10-08 09:30:00 +02:00
Christian Cueni 13e3192776 Remove graphql password reset, style django pages 2019-10-08 09:30:00 +02:00
Christian Cueni 062269f030 Add loggedIn guard, add basic login component 2019-10-08 09:30:00 +02:00
Christian Cueni fb225b926d Add login tests 2019-10-08 09:30:00 +02:00
Christian Cueni 7e92753977 Add password reset tests 2019-10-08 09:30:00 +02:00
Christian Cueni 46518a22f8 Add password reset mutations 2019-10-08 09:30:00 +02:00
Christian Cueni 7d6a03743c Add login endpoint 2019-10-08 09:30:00 +02:00
Christian Cueni e982579711 Add public graphql endpoint 2019-10-08 09:30:00 +02:00
Ramon Wenger 5fd81a2bd6 Rename Highlight to Bookmark 2019-10-07 17:10:39 +02:00
Ramon Wenger 4247164067 Add highlight mutation 2019-10-02 11:39:40 +02:00
Ramon Wenger 584b48a6a6 Add notes app and a PoC for highlights 2019-10-02 11:38:53 +02:00
Ramon Wenger 8045e01ffd Update naming to be more consistent 2019-09-12 14:28:57 +02:00
Ramon Wenger 9bb71512ed Update side name in admin 2019-09-11 14:24:53 +02:00
Ramon Wenger 4ae9c5813f Merged in feature/survey-with-correct-answer (pull request #34) 
Feature/survey with correct answer

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
 2019-09-11 11:02:37 +00:00
Ramon Wenger 3fd9aa1f31 Add helper function 2019-09-11 11:41:34 +02:00
Ramon Wenger b2e133542c Fix cypress test 2019-09-09 16:00:35 +02:00
Ramon Wenger b1a87cb08b Fix unit tests 2019-09-09 15:34:13 +02:00
Ramon Wenger e10b577ac1 Add solution visibility check to survey 2019-09-09 14:04:47 +02:00
Ramon Wenger 2af5749311 Add module reference to survey 2019-09-09 14:03:04 +02:00
Ramon Wenger 9e4784e5d8 Add helper functions to find the teacher of a user 2019-09-09 14:01:58 +02:00
Ramon Wenger 2efe682d7e Refactor dummy data 2019-09-05 14:44:46 +02:00
Ramon Wenger 75ba289100 Upate school class definion to not require a user when creating one 2019-09-04 16:12:15 +02:00
Ramon Wenger 4d2b354bc0 Add command for adding teachers 2019-09-04 16:08:41 +02:00
Ramon Wenger 695f6a016c Assign a role to students during import 2019-09-04 15:17:26 +02:00
Ramon Wenger 6020da8598 Add action menu and delete method to objectives 2019-08-26 11:15:25 +02:00
Ramon Wenger 6d5fa1806d Enable teachers to add new objectives instead of objective groups 2019-08-22 19:01:26 +02:00
Ramon Wenger 76b3f70a87 Hide single objectives instead of whole groups 2019-08-21 16:26:51 +02:00
Christian Cueni 3ae39cefce Handle missing attribute exception 2019-08-15 14:48:18 +02:00
Christian Cueni a81e211789 Fix nested modlue slug 2019-08-15 14:27:58 +02:00
Christian Cueni 1b47e5b837 Fix error when publishing page 2019-08-15 11:51:45 +02:00
Christian Cueni 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni 8e0f9fd377 Support dicts in page update 2019-08-14 11:52:44 +02:00
Christian Cueni b0ae5a7cf1 Use titleslug model for admin slug 2019-08-14 11:52:44 +02:00
Christian Cueni 083a8b03a8 Add admin slug model 2019-08-14 11:52:44 +02:00
Ramon Wenger c9df7354fb Replace old logo with new one 2019-07-31 13:39:17 +02:00
Ramon Wenger bdfd6ee510 Change the content block type only if the user specifies a type 2019-07-29 11:22:00 +02:00
Ramon Wenger 63b235de41 Add random password to imported users 2019-07-25 14:57:39 +02:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 2019-07-25 11:43:51 +02:00
Christian Cueni 0af01b4a48 Add mutation test 2019-07-25 11:43:51 +02:00
Christian Cueni 91967ceb21 Add mutations and query, fix popover 2019-07-25 11:43:51 +02:00
Ramon Wenger c81bcbd26b Add survey block to content block in back- and frontend 2019-07-24 14:23:27 +02:00
Ramon Wenger 648a3e9229 Fix survey cypress test 2019-07-23 12:05:16 +02:00
Ramon Wenger f78a837bc0 Change more text 2019-07-22 11:48:40 +02:00
Ramon Wenger bc76882318 Add missing migrations 2019-07-22 11:33:41 +02:00
Ramon Wenger 89fbf18637 Tweak import script 2019-07-22 11:04:57 +02:00
Ramon Wenger f9786d3ed6 Change text to be more formal 2019-07-22 10:49:13 +02:00
Christian Cueni 4d177ac4d6 Fix wrong url 2019-07-17 20:08:40 +02:00
Christian Cueni a1234f6688 Merged in feature/nested-block (pull request #26) 
Feature/nested block

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2019-07-17 15:14:57 +00:00
Ramon Wenger ba6b80dfdc Merged in feature/instrument-overview (pull request #25) 
Feature/instrument overview

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
 2019-07-17 11:10:24 +00:00
Christian Cueni 599344e4be Augment fields in content list item 2019-07-17 11:33:20 +02:00
Christian Cueni c476485685 Merged in feature/set-password (pull request #24) 
Feature/set password

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2019-07-17 09:31:26 +00:00
Christian Cueni 5226cb3574 Update copy 2019-07-17 11:06:44 +02:00
Ramon Wenger 2a4cf56825 Refactor some more occurences of basic knowledge to instrument 2019-07-17 09:54:34 +02:00
Christian Cueni e474618a4c Update copy, update urls 2019-07-17 07:46:29 +02:00
Ramon Wenger 98a8acac4f Refactor subnavigation and implement module subnavigation 2019-07-16 16:15:20 +02:00
Christian Cueni 334684a1db Add set password pages 2019-07-16 14:09:42 +02:00
Christian Cueni 2905486c2f Remove content list in wagtail, add content list in frontend 2019-07-16 09:36:43 +02:00
Ramon Wenger 87b66336e6 Strip whitespace during import 2019-07-15 14:48:28 +02:00
Christian Cueni 036c53dd9f Add content list block 2019-07-15 12:59:00 +02:00
Christian Cueni fd4a9d2e18 Add content list 2019-07-15 12:56:47 +02:00
Christian Cueni 229ab6b0e6 Add subtitle to instruments 2019-07-11 16:01:01 +02:00
Christian Cueni 707909761e Change default set for rich text, add blocks 2019-07-11 10:49:54 +02:00
Christian Cueni 03d8ed6712 Add subtitle block, update font sizes 2019-07-11 10:41:55 +02:00
Christian Cueni b50a489e7d Update password reset text, add sender name in email 2019-07-11 08:27:18 +02:00
Ramon Wenger 24460fcee4 Change 'username' to 'email' in login form 2019-07-10 16:36:51 +02:00
Ramon Wenger a09bf2786d Save correct answer with answer given by user 2019-07-08 15:10:33 +02:00
Ramon Wenger 25856aa647 Clean up migrations 2019-07-04 14:53:06 +02:00
Ramon Wenger 9dca627465 Merged in feature/surveyjs (pull request #17) 
Feature/surveyjs
 2019-07-04 11:31:12 +00:00
Ramon Wenger be076f1550 Merged in feature/user-import (pull request #18) 
Feature/user import
 2019-07-04 11:29:34 +00:00
Ramon Wenger e296d500aa Clean up code 2019-07-04 10:24:12 +02:00
Ramon Wenger 7ca7dbe4dd Add school classes to admin view 2019-07-04 10:18:23 +02:00
Christian Cueni 621424567a Enable password reset, add sendgrid to pipfile 2019-07-03 14:48:52 +02:00
Ramon Wenger 0c86c8ec1b Add test for import 2019-07-03 14:12:05 +02:00
Ramon Wenger e062a533b1 Add command for importing users 2019-07-03 13:03:33 +02:00
Ramon Wenger 7d46ec9ef0 Make school class name unique 2019-07-03 11:59:31 +02:00
Ramon Wenger 0e3ed9ea7a Remove year from school class model 2019-07-03 11:58:25 +02:00
Ramon Wenger b498dc4efa Add cypress test for surveys 2019-07-01 13:08:42 +02:00
Ramon Wenger 9b85560795 Add answers to surveys 2019-06-27 17:56:29 +02:00
Ramon Wenger 4696ed239e Remove required description on instrument block 2019-06-24 16:12:31 +02:00
Ramon Wenger bad289ac3a Rename basic knowledge to instrument in frontend 2019-06-24 15:54:38 +02:00
Ramon Wenger c57e75cf21 Add missing migration 2019-06-24 13:22:27 +02:00
Ramon Wenger c9caaf79db Add initial implementation of survey model 2019-06-20 14:51:43 +02:00
Ramon Wenger 590fd180c3 Move project and room actions to own component 
Also adds those actions to the detail pages of both entity types. Also refactors some code.
 2019-05-22 17:47:31 +02:00
Ramon Wenger 016f6ce502 Enable editing of content blocks with assignments 2019-05-21 15:15:38 +02:00
Ramon Wenger 735d2d9afa Add project entry deletion by user 2019-05-21 14:39:25 +02:00
Ramon Wenger 175b517e75 Add form for editing project entries 2019-05-13 17:57:21 +02:00
Ramon Wenger 2a6d2fe693 Add document block to room entry 2019-05-07 16:17:33 +02:00
Christian Cueni ed38e73f5b Merged in feature/profile-image (pull request #16) 
Feature/profile image

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2019-04-25 09:23:37 +00:00
Christian Cueni 4688a29122 Clean up code 2019-04-25 10:57:13 +02:00
Christian Cueni aca8bd0d2d Add possibility to upload avatars 2019-04-24 14:23:54 +02:00
Ramon Wenger d7a3dd74c2 Add document upload to project entry 2019-04-24 10:41:27 +02:00
Christian Cueni f869b0141f show add entry button only to owner, don’t allow project entries from other users 2019-04-16 12:48:54 +02:00
Christian Cueni 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +02:00
Christian Cueni 40a0c3ecbe Merge branch 'feature/pw-reset' into develop 2019-04-15 10:31:14 +02:00
Christian Cueni 59d88d5143 use activity data in frontent 2019-04-11 17:00:59 +02:00
Ramon Wenger 6853cc8734 Update last module in a mutation instead of the query 2019-04-11 14:15:36 +02:00
Christian Cueni fa98141f3c add myActivity query 2019-04-11 10:12:15 +02:00
Christian Cueni f8c1f372cb merge develop into feature/pw-reset 2019-04-11 08:14:08 +02:00
Christian Cueni aca36b8a66 resolve conflicts 2019-04-10 09:37:42 +02:00
Christian Cueni 42c579b047 use me query, add components 2019-04-09 16:24:05 +02:00
Christian Cueni 8b53d2fa7e add my schoolclasses query, fix test 2019-04-09 11:27:30 +02:00
Christian Cueni f3289ba881 add subnavigation, minor cleanup 2019-04-08 17:11:08 +02:00
Christian Cueni 13685b082e rename components, add cypress tests, update hash 2019-04-08 14:18:43 +02:00
Christian Cueni e9895d9f74 Merged in feature/testing (pull request #12) 
restrict access to users and rooms, add tests

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2019-04-08 09:05:37 +00:00
Christian Cueni e3575bcf97 Handle backenderrors in frontend 2019-04-04 15:57:02 +02:00
Christian Cueni d64c641661 Add pw change endpoint in API 2019-04-03 15:53:00 +02:00
Ramon Wenger ba436f8186 Fix os.environ call 2019-03-29 16:45:43 +01:00
Ramon Wenger 47572bb212 Add new tests for projects 2019-03-29 16:37:48 +01:00
Ramon Wenger 5b83b04a0a Add coverage 2019-03-29 16:36:41 +01:00
Christian Cueni aeded87227 Add permissions to objectivegroup mutations 2019-03-28 14:55:32 +01:00
Christian Cueni 43f942ea2d protect updates on room entries, add tests 2019-03-28 11:31:02 +01:00
Christian Cueni ab6b1d76be add missing settings to test configuration 2019-03-27 16:02:28 +01:00
Christian Cueni d03524e803 add entry count to project widget 2019-03-27 15:56:27 +01:00
Christian Cueni 2b39cc92dd implement share project button 2019-03-27 14:09:34 +01:00
Christian Cueni d9f07c1adb refactor widget footer, add possibility to delete project 2019-03-27 09:33:12 +01:00
Christian Cueni 43278550f7 Add sendgrid config 2019-03-25 13:16:32 +01:00
Christian Cueni ba1e63a84b restrict access to users and rooms, add tests 2019-03-14 12:12:31 +01:00
Ramon Wenger 262a2b8cef Add project entry model and endpoints to backend 2019-03-13 17:50:29 +01:00
Ramon Wenger 34ad9927a7 Fix unit tests 2019-03-12 14:06:47 +01:00
Ramon Wenger d36bbafb04 Fix cypress test for new project 2019-03-11 22:04:50 +01:00
Ramon Wenger 117e8bf0d8 Add vimeo video to topic 2019-03-11 19:45:28 +01:00
Ramon Wenger a233c02049 Replace old favicon with transparent one 2019-03-11 15:38:39 +01:00
Christian Cueni 319725ae57 Merge branch 'feature/pw-reset' into develop 2019-03-07 11:34:20 +01:00
Christian Cueni d3edbae71a remove English text in email 2019-03-07 11:19:31 +01:00
Ramon Wenger 485a6ca4eb Add portfolio backend 2019-03-07 10:49:52 +01:00
Christian Cueni 71ec25028e add i18n to login 2019-03-06 09:59:32 +01:00
Christian Cueni 670fecd35f add templates for password reset 2019-03-06 09:54:13 +01:00
Ramon Wenger 9acfc8f041 Add favicon 2019-03-05 17:56:25 +01:00
Ramon Wenger 10b35a5a3e Add last visited module to user 2019-03-01 11:19:43 +01:00
Ramon Wenger 4f72f804c6 Add genial.ly block 2019-02-21 09:55:41 +01:00
Ramon Wenger 836dbd2bbb Add Infogram block 2019-02-18 16:59:47 +01:00
Ramon Wenger 9cf9fdcbec Add commands to hide all solutions for testing purposes 2019-02-14 18:49:28 +01:00
Ramon Wenger e7d1acbb5c Display solutions for admins 2019-02-13 16:34:39 +01:00