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

323 Commits

Author SHA1 Message Date
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
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 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 5a58641183 Add registration of our assignments as taskbase tasks 2020-01-20 17:56:54 +01:00
Ramon Wenger 53ce39c887 Add taskbase config variables to settings 2020-01-20 13:01:00 +01:00
Ramon Wenger 17e061892a Fix assignment creation in dummy data 2020-01-20 12:53:49 +01:00
Ramon Wenger 6b8b520bc5 Add test to check solution display in surveys 2020-01-16 16:07: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 6f0cb0dd88 Add command for exporting assignments 2019-12-16 15:24:46 +01:00
Ramon Wenger c2ead4c78d Add cypress test 2019-12-09 15:18:47 +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
Ramon Wenger e7916215b0 Update import command to allow S3 resources as source 2019-11-20 15:05:35 +01:00
Christian Cueni e2f5c0b3f0 Fix copy, fix styles on server 2019-11-11 18:19:35 +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 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
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 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
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 b2e133542c Fix cypress test 2019-09-09 16:00:35 +02:00
Ramon Wenger 2efe682d7e Refactor dummy data 2019-09-05 14:44:46 +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 c9df7354fb Replace old logo with new one 2019-07-31 13:39:17 +02:00
Ramon Wenger 63b235de41 Add random password to imported users 2019-07-25 14:57:39 +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 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 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
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
Ramon Wenger 87b66336e6 Strip whitespace during import 2019-07-15 14:48:28 +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 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
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 b498dc4efa Add cypress test for surveys 2019-07-01 13:08:42 +02:00
Ramon Wenger bad289ac3a Rename basic knowledge to instrument in frontend 2019-06-24 15:54:38 +02:00
Ramon Wenger c9caaf79db Add initial implementation of survey model 2019-06-20 14:51:43 +02:00
Ramon Wenger 175b517e75 Add form for editing project entries 2019-05-13 17:57:21 +02:00
Christian Cueni 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +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 13685b082e rename components, add cypress tests, update hash 2019-04-08 14:18:43 +02:00
Ramon Wenger ba436f8186 Fix os.environ call 2019-03-29 16:45:43 +01:00
Christian Cueni ab6b1d76be add missing settings to test configuration 2019-03-27 16:02:28 +01:00
Christian Cueni 43278550f7 Add sendgrid config 2019-03-25 13:16:32 +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 9cf9fdcbec Add commands to hide all solutions for testing purposes 2019-02-14 18:49:28 +01:00
Ramon Wenger 0b75e14393 Move solution check to utils 2019-02-13 16:20:29 +01:00
Ramon Wenger a3a0874c65 Add new sentry SDK 2019-02-13 13:36:41 +01:00
Ramon Wenger e9bee08c1d Add statistics module 2019-02-10 18:04:07 +01:00
Ramon Wenger a08be83283 Add styling to solution 2019-02-04 18:09:51 +01:00
Ramon Wenger 92d2901f9e Add solution type to server 2019-02-04 15:19:27 +01:00
Ramon Wenger 050f700760 Add basics for cypress tests in pipelines file 2019-01-31 16:47:07 +01:00
Ramon Wenger 90f980fe09 Remove subtitle from room entry 2018-11-01 16:18:35 +01:00
Ramon Wenger 6e5b829ea1 Fix dummy data 2018-11-01 10:56:28 +01:00
Ramon Wenger 53f50bdc13 Add mutations for objective group visibility 2018-10-31 15:35:58 +01:00