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

1233 Commits

Author SHA1 Message Date
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
Ramon Wenger 3b6284e753 Add solution to assignment model 2019-02-13 16:21:00 +01:00
Ramon Wenger 0b75e14393 Move solution check to utils 2019-02-13 16:20:29 +01:00
Ramon Wenger 84324f9f7c Remove inserted errors again 2019-02-13 14:04:10 +01:00
Ramon Wenger 2e38a03bfa Divide by zero for an uncaught error 2019-02-13 13:56:43 +01:00
Ramon Wenger 627a012efe Remove divide by zero error 2019-02-13 13:46:39 +01:00
Ramon Wenger 8eb9735640 Break rooms to test sentry logging 2019-02-13 13:37:47 +01:00
Ramon Wenger a3a0874c65 Add new sentry SDK 2019-02-13 13:36:41 +01:00
Ramon Wenger 5a77a3dd12 Add missing statistics 2019-02-11 18:02:58 +01:00
Ramon Wenger 89961dc301 Add statistics basics 2019-02-10 22:54:34 +01:00
Ramon Wenger e9bee08c1d Add statistics module 2019-02-10 18:04:07 +01:00
Ramon Wenger ea7a306522 Add solution toggling to frontend 2019-02-07 16:58:20 +01:00
Ramon Wenger 4b93b410a5 Add mutation to enable solutions by module 2019-02-05 18:45:03 +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 460d413196 Add owner to form for assignment creation 2018-12-05 18:13:31 +01:00
Ramon Wenger f235d50424 Add assignment as a snippet 2018-12-05 15:07:25 +01:00
Ramon Wenger ca96676e5c Add assignments to cms admin 2018-12-04 16:23:50 +01:00
Ramon Wenger 59efba9179 Filter content block by user created attribute 2018-12-04 13:32:11 +01:00
Ramon Wenger bcb3e5e719 Merge branch 'feature/objectives-created-by-user' 2018-11-21 15:19:44 +01:00
Ramon Wenger 7fd7728712 Add mutation to server 2018-11-21 14:57:36 +01:00
Ramon Wenger a1fd28b48e Add objective group mutation 2018-11-20 17:28:29 +01:00
Ramon Wenger 876a22c4ad Adjust test to run on pipelines 2018-11-20 09:13:37 +01:00
Ramon Wenger 7a09621a01 Add some logging 2018-11-13 19:04:34 +01:00
Ramon Wenger 90f980fe09 Remove subtitle from room entry 2018-11-01 16:18:35 +01:00
Ramon Wenger 62bd0b2435 Restrict deletion of rooms to teachers 2018-11-01 15:25:40 +01:00
Ramon Wenger f28c1c8eab Limit objective progress to logged in user 2018-11-01 14:22:58 +01:00
Ramon Wenger d372905d7b Restrict objective groups for students 2018-11-01 10:57:45 +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
Ramon Wenger a437620f13 Update dummy data 2018-10-31 15:34:30 +01:00
Ramon Wenger 9b6207f192 Change title in objective group model 2018-10-30 23:31:54 +01:00
Ramon Wenger 12f343e8e7 Remove basic knowledge from dummy data for now 2018-10-30 17:53:13 +01:00
Ramon Wenger 457fc0d505 Fix Postgres version in docker files 2018-10-30 17:52:00 +01:00
Ramon Wenger 5b50e497c9 Add room entry edit mask 2018-10-30 11:57:41 +01:00
Ramon Wenger c536a04122 Add parts for room entry deletion 2018-10-29 18:54:34 +01:00
Ramon Wenger 3416465f8a Add string representation to student submission 2018-10-25 17:08:38 +02:00
Ramon Wenger 0ab58b7582 Fix disappearing submission bug for student 2018-10-25 15:46:31 +02:00
Ramon Wenger adfd328e85 Only display final submissions to teacher 2018-10-25 15:45:17 +02:00
Ramon Wenger e23dc4a9f0 Refactor code 2018-10-25 15:06:35 +02:00
Ramon Wenger 3ab8e9e8bb Add migration 2018-10-25 13:56:19 +02:00
Ramon Wenger 106d90ed17 Add basic knowledge page to content block 2018-10-25 13:54:49 +02:00
Ramon Wenger 7044ccb1b9 Add basic knowledge queries on server 2018-10-25 12:30:17 +02:00
Ramon Wenger 1cd31eb95a Add basic knowledge model and admin 2018-10-25 11:05:59 +02:00
Ramon Wenger 4ad67a09b3 Add author to room entry 2018-10-24 15:34:52 +02:00
Ramon Wenger ee8e33e026 Remove role from GQL query 2018-10-24 15:16:31 +02:00
Ramon Wenger a90501d7e8 Clean up some more code 2018-10-24 15:15:48 +02:00
Christian Cueni 1591095553 Prevent students from adding new rooms, Verify room form 2018-10-24 08:40:30 +02:00
Christian Cueni d80abf5b09 Prevent backend from changing a block’s type 2018-10-23 10:43:32 +02:00
Christian Cueni 93ad822457 Add logout functionality 
Remove unused imports

Add file header

Check response

remove file headers
 2018-10-23 08:20:25 +02:00
Ramon Wenger f16e4db625 Fix bug in room creation 2018-10-22 20:08:34 +02:00
Ramon Wenger ec908e6b7a Fix typo 2018-10-22 19:23:50 +02:00
Christian Cueni 033372848e Merged in feature/detailpage (pull request #5) 
Feature/detailpage

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2018-10-22 17:22:38 +00:00
Ramon Wenger c5750a199b Extend user admin 2018-10-22 19:01:20 +02:00
Christian Cueni d7aa98e3e3 Add basic pages & queries for single submissions 2018-10-22 13:33:47 +02:00
Ramon Wenger 004ad8ca57 Limit rooms for regular user to their classes 2018-10-19 11:16:41 +02:00
Ramon Wenger 2e4255260b Add hero image to module teasers 2018-10-19 10:57:07 +02:00
Ramon Wenger febed9adc4 Fetch topic information from API 2018-10-19 10:36:31 +02:00
Ramon Wenger 181a06424a Remove `filteredbook` app 2018-10-18 20:05:10 +02:00
Christian Cueni 7a2f8c91e4 Filter user created blocks based on classes 2018-10-18 16:59:28 +02:00
Ramon Wenger 90dac6b7e5 Merge branch 'feature/custom-assignments-to-user-created' 2018-10-18 16:30:43 +02:00
Ramon Wenger 9edbcf3d56 Add custom assignment test base 2018-10-18 16:28:06 +02:00
Ramon Wenger b6f85183ae Fix unit test 2018-10-18 14:46:22 +02:00
Ramon Wenger c6a4efe267 Fix spelling 2018-10-18 14:30:37 +02:00
Ramon Wenger 5daeefbcec Remove custom assignments, add `user created` flag 2018-10-18 10:02:02 +02:00
Ramon Wenger 13717c1371 Fix assignment creation 2018-10-18 10:00:03 +02:00
Ramon Wenger 543ce6a464 Fix unit tests 2018-10-17 15:53:46 +02:00
Ramon Wenger 7e88642918 Remove order property from module 2018-10-17 15:48:14 +02:00
Ramon Wenger 20ff1f8137 Fix migrations 2018-10-17 14:59:09 +02:00
Christian Cueni 13a9812ba0 Merged in feature/colors (pull request #3) 
Feature/colors

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2018-10-17 12:34:16 +00:00
Christian Cueni c6ca532633 fix tüpflischiiser 2018-10-17 13:19:01 +02:00
Christian Cueni 0adaedafb6 fix unit tests 2018-10-16 15:54:40 +02:00
Christian Cueni d67f41f32b remove logger 2018-10-16 15:32:16 +02:00
Ramon Wenger a4479727ce Add another unit test 2018-10-16 13:52:40 +02:00
Ramon Wenger 5218a3a867 Limit submissions to teacher of student's class 2018-10-16 13:36:32 +02:00
Christian Cueni 3547a30228 allow user to set block type 2018-10-16 07:29:41 +02:00
Ramon Wenger 8dc5d7dfaf Add initial tests for assignment 2018-10-15 20:08:32 +02:00
Ramon Wenger 0f5d9f80af Remove school model, refactor code 2018-10-15 15:03:25 +02:00
Christian Cueni a1a75e9b3f rename types of Contentblocks, change box appearance 2018-10-15 14:10:24 +02:00
Ramon Wenger 72cab13b36 Add default users 2018-10-15 13:54:34 +02:00
Ramon Wenger e1deb19ca8 Re-do all migrations 2018-10-11 15:47:12 +02:00
Ramon Wenger 9e1c0cd39b Merge remote-tracking branch 'origin/feature/objective-control' 2018-10-11 15:44:27 +02:00
Ramon Wenger 55683da3ed Fix Unit Tests 2018-10-11 14:56:11 +02:00
Christian Cueni 5dd77eab5d use cache for update, incorperate feedback 2018-10-11 14:12:47 +02:00
Ramon Wenger 3d0c9e4b93 Render room entry dynamically on article view 2018-10-11 14:09:09 +02:00
Ramon Wenger ce86e45743 Add content block deletion mutation 2018-10-11 11:39:50 +02:00
Ramon Wenger eafff751f8 Filter content blocks by permission and ownership 2018-10-10 14:18:15 +02:00
Christian Cueni 5970ac3427 update objective progress items 2018-10-10 10:45:56 +02:00
Ramon Wenger 645c998d5c Add 'user created' property on user created content blocks 2018-10-10 10:34:30 +02:00
Ramon Wenger 9fed2b8422 Rename folder user to users 2018-10-10 09:40:24 +02:00
Ramon Wenger 8110ee359f Distinguish between default and user created content blocks in cms admin 2018-10-09 17:42:19 +02:00
Ramon Wenger f75b04b82f Add active state on submissions link 2018-10-08 16:55:39 +02:00
Ramon Wenger 6e75b55475 Improve navigation styling 2018-10-08 15:32:25 +02:00
Ramon Wenger 6f15ac4173 Fix bug in role retrieval 2018-10-08 14:35:57 +02:00
Ramon Wenger b1e44ef263 Rename rooms query 2018-10-08 14:34:56 +02:00
Ramon Wenger 2adfffd441 Add role to user query 2018-10-08 11:34:04 +02:00
Ramon Wenger d970f75fa4 Refactor school class naming 2018-10-08 10:52:55 +02:00
Daniel Egger 9efd000aa1 Refactored from method to computed 2018-10-06 16:26:38 +02:00
Daniel Egger bd4a9fded3 Show ContentBlock actions only with the right permission 2018-10-05 14:11:00 +02:00
Daniel Egger f3bcea7528 Refactored VisibilityPopover for new SchoolClass 2018-10-05 11:51:41 +02:00
Daniel Egger d273d711c1 Renamed UserGroup to SchoolClass step 2 2018-10-05 11:25:05 +02:00
Daniel Egger b2cac389cf Renamed UserGroup to SchoolClass and reset migrations 2018-10-05 10:59:57 +02:00
Daniel Egger 21c85941be Show the name of the logged in user in DefaultLayout 2018-10-05 10:49:12 +02:00
Daniel Egger 31c22846f6 Added DEFAULT_SCHOOL_ID 
The DEFAULT_SCHOOL_ID is used as long as we have only one school.
That simplifies some code for now.
 2018-10-04 22:15:36 +02:00
Daniel Egger 1574b8fbcc Added GraphQL "me" query to get user permissions 2018-10-04 22:10:31 +02:00
Daniel Egger 6a57b35251 Added SchoolRole models from Helloclass 2018-10-04 16:00:21 +02:00
Ramon Wenger ba18946736 Fix tests 2018-10-04 15:57:56 +02:00
Ramon Wenger b9bb41e8cc Add module to assignment 2018-10-04 15:29:45 +02:00
Ramon Wenger e524fe6107 Update factory to include image URL block generation 2018-10-04 13:51:18 +02:00
Daniel Egger 8811829e3a Bugfix for Bitbucket-Pipelines tests 2018-10-04 12:52:56 +02:00
Daniel Egger 35201e6986 Fix Python import error 2018-10-04 10:32:44 +02:00
Daniel Egger a5e58fb3fc Added Authentication for GraphQL api endpoint. Added tests 2018-10-04 10:27:49 +02:00
Ramon Wenger 7a91d9ce77 Rename book to books and reset migrations 2018-10-04 10:05:14 +02:00
Ramon Wenger e425122455 Add description to chapter 2018-10-03 18:48:31 +02:00
Daniel Egger 8420d8aab1 upload documents in user assignment 2018-10-02 18:04:08 +02:00
Daniel Egger b870c4b35c StudentSubmission should have URL as document 2018-10-02 18:04:08 +02:00
Daniel Egger e1756300be assignement admin 2018-10-02 18:04:08 +02:00
Ramon Wenger 6ba06e9fe9 Update dummy data and factories 2018-10-02 18:02:52 +02:00
Ramon Wenger 3752ba5c1d Add new dummy data and improve factories 2018-10-02 16:13:36 +02:00
Ramon Wenger e52a98c50b Divide updates for assignment submissions 2018-10-02 14:28:38 +02:00
Ramon Wenger 73759e1af8 Fix dummy data for basic knowledge 2018-10-02 14:27:55 +02:00
Ramon Wenger b22b918d82 Add final submission for assignment 2018-10-02 13:16:50 +02:00
Ramon Wenger 0612daa05f Fix error for user without existing submission 2018-10-02 13:16:29 +02:00
Ramon Wenger d35c151cfb Add assignment query on server 2018-10-02 10:07:36 +02:00
Ramon Wenger 107b5735e9 Add assignment mutation on server side 2018-10-01 13:44:29 +02:00
Ramon Wenger 23176088f4 Fix factory for assignment 2018-10-01 13:42:10 +02:00
Ramon Wenger f5e163c3cd Clean up module query 2018-10-01 13:08:20 +02:00
Ramon Wenger 6f9666407c Fix dummy data 2018-10-01 13:05:53 +02:00
Ramon Wenger 8f7f8e4d4f Add assignment handling on API 2018-09-27 16:07:48 +02:00
Ramon Wenger 826849f1e0 Add assignment app 2018-09-27 11:50:37 +02:00
Ramon Wenger 65d50f686c Fix image block in front-end 2018-09-27 11:50:37 +02:00
Pawel Kowalski 4eb8406b2c Prepare settings and fix urls for aws s3 usage 2018-09-26 16:31:07 +02:00
Ramon Wenger cb0f96f81e Add "add room entry" mutation with serializer 2018-09-25 17:01:16 +02:00
Ramon Wenger 5b8eb36cbb Add user group to room form 2018-09-24 17:04:57 +02:00
Ramon Wenger 9a89fa874b Add 'allowed blocks' property for room entry 2018-09-24 17:02:57 +02:00
Ramon Wenger 7a6f6ff6e8 Add functionality to room delete button 2018-09-21 15:24:52 +02:00
Ramon Wenger 643374140e Update room dummy data 2018-09-21 13:46:08 +02:00
Ramon Wenger dea1d1b253 Add room update mutation on server 2018-09-21 13:45:51 +02:00
Ramon Wenger 613f099b30 Rename arguments for mutations 2018-09-21 13:03:34 +02:00
Daniel Egger 2e8dc96046 bitbucket pipelines heroku integration 2018-09-20 17:28:15 +02:00
Ramon Wenger b37038f74d Split up add and change mutations for rooms 2018-09-20 16:21:36 +02:00
Ramon Wenger 66ad787779 Generalize room mutation using serializer 2018-09-20 16:03:42 +02:00
Ramon Wenger 83ebaa94b9 Change login mask style 2018-09-20 16:02:25 +02:00
Pawel Kowalski 3223dccb2a Add assets dir to staticfiles 2018-09-20 11:39:31 +02:00
Ramon Wenger c8937243f5 Change content block mutation 2018-09-20 10:29:05 +02:00
Daniel Egger 48e724f4e4 anpassungen nach rebase 2018-09-19 17:40:53 +02:00
Daniel Egger b8b09b1af3 example with uploadcare 2018-09-19 16:37:27 +02:00
Ramon Wenger ef48f5afb6 Add content block edit modal 
Also clean up the state store.
Also change the properties of the content block contents on the server
 2018-09-19 15:40:21 +02:00
Ramon Wenger 2464c97079 Update dummy data types 2018-09-18 19:38:26 +02:00
Ramon Wenger db61ca560a Add room mutation to frontend 2018-09-17 18:56:24 +02:00
Ramon Wenger 1927244f26 Fix room querying 2018-09-17 17:53:14 +02:00
Ramon Wenger fe59a65e87 Add room mutation 2018-09-17 11:35:49 +02:00
Ramon Wenger 0e30f0bd45 Add new room page 2018-09-14 15:57:57 +02:00
Ramon Wenger 7038721bfd Toggle visibility by class / user group 2018-09-13 15:27:22 +02:00
Daniel Egger 4a964b3e81 example mutate hidden/visibility userGroup <-> contentBlock 2018-09-13 12:05:37 +02:00
Pawel Kowalski 2ad89ce6ef Example Visibility server side filtering 2018-09-13 11:44:31 +02:00
Pawel Kowalski 2ead4f221b Added hidden_for ManyToMany 2018-09-13 10:20:20 +02:00
Ramon Wenger 639fa7665c Add document block 2018-09-12 15:05:36 +02:00
Ramon Wenger 23f282b358 Add link block 2018-09-12 14:37:28 +02:00
Ramon Wenger 4010b21cce Add video block to frontend and backend 2018-09-12 10:27:40 +02:00
Pawel Kowalski 4cb5c6ad63 Add User query, get users in FilterBar, add Visibility node 2018-09-11 17:18:50 +02:00
Pawel Kowalski 2c2ad3f8f6 Add visibility to ContentBlocks 2018-09-11 16:18:25 +02:00
Ramon Wenger f3a383d8dd Add first mutation 2018-09-11 10:10:42 +02:00
Ramon Wenger 98d29e83e7 Adjust image format in dummy data 2018-09-10 14:30:10 +02:00
Ramon Wenger bf4861f595 Add more tests 
Also, add test settings
 2018-09-10 14:28:08 +02:00
Ramon Wenger 370fd54b98 Refactor helper method from test 2018-09-10 12:54:31 +02:00
Ramon Wenger 9a2bc91a20 Remove top level __init__.py, as it breaks the test runner 2018-09-10 12:52:55 +02:00
Ramon Wenger 7142e3f3b1 Add a first test 2018-09-10 12:04:07 +02:00
Ramon Wenger ec03c03c48 Insert new content block at first position 2018-09-10 10:21:25 +02:00
Ramon Wenger d6b3fc09cb Refactor content block mutation 2018-09-10 10:18:09 +02:00
Ramon Wenger 5725c3d4e4 Update content block mutation 2018-09-10 09:52:38 +02:00
Ramon Wenger 4ed1cd3086 Refactor code, add first sanitation steps 2018-09-07 18:29:53 +02:00
Ramon Wenger 7d0a97208e Add first preliminary version of 'AddContentBlock' mutation 2018-09-07 17:36:28 +02:00
Pawel Kowalski ed4616bd24 Experiment with using wagtail api calls to serialize and deserialize StreamFields 2018-09-05 16:40:39 +02:00
Daniel Egger f3a6c0bfe0 MutateContentBlock with contents 2018-09-05 16:38:39 +02:00
Pawel Kowalski 98a029a998 Add chapters query 2018-09-05 15:22:40 +02:00
Pawel Kowalski c7711989b7 Add first take on adding a new content block via interface 2018-09-05 15:09:16 +02:00
Pawel Kowalski 356329f266 Add first mutation and some util functions 2018-09-05 13:14:17 +02:00
Ramon Wenger a5d0be0396 Add Link Block 2018-09-05 10:17:21 +02:00
Pawel Kowalski 000e3abdf7 Added some sample mutations queries 2018-09-05 09:53:33 +02:00
Pawel Kowalski 7d1cac079b Rename back *Types to *Nodes 2018-09-05 09:33:34 +02:00
Pawel Kowalski 0c10757487 change BookQuery after refactoring 2018-09-04 22:53:11 +02:00
Pawel Kowalski e007482e46 Move book schema into a package and files: queries and mutations 2018-09-04 18:14:08 +02:00
Pawel Kowalski e9897911b3 Implement ImageStreamField 2018-09-04 16:13:03 +02:00
Pawel Kowalski 1367a01ca7 Cleanup dummy data creation 2018-09-04 15:48:50 +02:00
Pawel Kowalski ff9a07e187 Subtitle not Description 2018-09-04 15:42:52 +02:00
Pawel Kowalski b28346d297 Add contents to Room Entries, upgrade wagtail, reset migrations 2018-09-04 14:48:34 +02:00
Unknown c07be5d4a4 Update docker configuration 2018-09-03 17:20:02 +02:00
Unknown a2fd2b50c3 Fix incorrect attribute in dummy data 2018-09-03 14:35:33 +02:00
Ramon Wenger 552b27ba2b Add related name to objective groups 2018-08-27 18:18:09 +02:00
Ramon Wenger dcf612f2df Add related name to room entries 2018-08-27 18:05:19 +02:00
Ramon Wenger c28e1b2b05 Add docker configuration 2018-08-27 14:10:33 +02:00
Pawel Kowalski 3f797db3f4 Minor formatting 2018-08-24 10:09:12 +02:00
Pawel Kowalski 087e8ce252 Add entry count, start working on dynamic room color 2018-08-23 22:14:22 +02:00
Ramon Wenger 8ebfda66b6 Update dummy data set 2018-08-23 20:13:06 +02:00
Pawel Kowalski edb43ce2a3 Rename all *Node => *Type except for ContentBlock because the name clashes 2018-08-23 17:50:45 +02:00
Pawel Kowalski bf913b0417 Use set navigation instead of additional fields with resolvers 2018-08-23 17:38:32 +02:00
Pawel Kowalski 585eccbe12 Update pipenv: required python version=3.6 2018-08-23 16:39:20 +02:00
Ramon Wenger f583c6c8cc Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-23 16:05:40 +02:00
Pawel Kowalski ff70e441c7 Add RoomEntry model, factory, dummy_data, node 2018-08-23 16:03:32 +02:00
Ramon Wenger 724f741b51 Make a room queryable by slug 2018-08-23 16:03:13 +02:00
Pawel Kowalski 01b77707da Combine room backend with frontend 2018-08-23 14:48:16 +02:00
Pawel Kowalski 7eb8db9671 Keep this import here, or this piece of software will implode 2018-08-23 14:03:51 +02:00
Pawel Kowalski c32372c535 Reset all migrations 2018-08-23 13:55:36 +02:00
Pawel Kowalski e26a55bb03 Probably duplicate type specification 2018-08-23 13:47:47 +02:00
Pawel Kowalski 8c14c2c41e Add migration and package lock after npm install 2018-08-23 13:33:28 +02:00
Pawel Kowalski 5656b15135 Add rooms model, factories, dummy_data generation, graphql node 2018-08-23 13:33:28 +02:00
Ramon Wenger 64dec5e3ee Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-23 12:28:48 +02:00
Ramon Wenger 1748caa6db Change naming from 'modal text' to 'basic knowledge' 2018-08-23 12:28:04 +02:00
Pawel Kowalski 34220d7262 Add UserGroup and test data generation for it 2018-08-23 12:23:39 +02:00
Ramon Wenger 98df92d559 Fix dummy data creation 2018-08-21 16:49:50 +02:00
Pawel Kowalski 2f52f67b64 Move common functions into Wagtail superclass 2018-08-16 17:26:16 +02:00
Pawel Kowalski 2157d4e630 remove unnecessary header comment 2018-08-16 17:04:43 +02:00
Pawel Kowalski 3f159b0473 Add a single module query (without edges/node) 2018-08-16 16:50:31 +02:00
Pawel Kowalski ef4fb4b20e Generate all types of content 2018-08-16 15:48:46 +02:00
Pawel Kowalski 80719e9a65 Enrich test data generation with ImageFields 2018-08-16 15:23:41 +02:00
Pawel Kowalski a24acad07a Add image_block serialization suitable for a SPA, i.e. return path, not the internal id of an image 2018-08-16 15:00:37 +02:00
Pawel Kowalski 4b03a702fe Provide first working version of content block stream content generation 2018-08-16 13:35:39 +02:00
Pawel Kowalski 6c7a1c9a7b Fall back to plain vanilla char blocks because test data generation is not sophisticated enough for RichtTextBlocks 2018-08-16 13:17:43 +02:00
Pawel Kowalski cd1c056cb7 generating test data 2018-08-16 13:10:09 +02:00
Pawel Kowalski 051796a34f Add ContentBlockFactories and test data 2018-08-16 00:07:08 +02:00
Ramon Wenger 0c31f838f2 Change variable names in content blocks 2018-08-15 18:45:20 +02:00
Pawel Kowalski 3ba9af1ce7 Add StreamField serializer 2018-08-15 14:45:18 +02:00
Pawel Kowalski 4a3ffd9eac Implement chapters / content blocks graphql interface 2018-08-15 14:30:00 +02:00
Pawel Kowalski 640af9b047 Add ContentBlock factory, add apollo-link first steps 2018-08-15 13:59:21 +02:00
Pawel Kowalski ca6c5742b4 Add contents to the content panels of the content block 2018-08-15 11:23:17 +02:00
Pawel Kowalski ca294b7836 Cleaned skillbox urls 2018-08-15 11:04:07 +02:00
Pawel Kowalski 74e67e925e Add childpage types for module 2018-08-15 10:54:31 +02:00
Ramon Wenger c4ba21aedd Add subpage types to chapter 2018-08-15 10:49:46 +02:00
Ramon Wenger 4650fecfc7 Add content block model 2018-08-15 10:46:07 +02:00
Ramon Wenger bdeda1428c Update dummy data with html tags 2018-08-14 18:44:41 +02:00
Pawel Kowalski 784083cfe4 intro instead of description 2018-08-14 16:54:16 +02:00
Pawel Kowalski e3ee972530 Adds graphql interface to objectives 2018-08-14 16:26:39 +02:00
Pawel Kowalski 1341589f89 Add testdata generation for objectives, optimize imports 2018-08-14 16:14:13 +02:00
Pawel Kowalski 29499350c1 Add the objectives module 2018-08-14 14:43:16 +02:00
Pawel Kowalski 579d54c8c5 Adds objectives app to project 2018-08-14 14:43:16 +02:00
Pawel Kowalski e32f724dd9 Adds a skeleton for the news module 2018-08-09 18:47:00 +02:00
Pawel Kowalski 0a4fb5555a Und zurück 2018-08-09 16:46:32 +02:00
Pawel Kowalski 0dbd4821e6 Heroku auto deploy demo 2018-08-09 16:44:52 +02:00
Pawel Kowalski 57aa2398f9 No mutations so far 2018-08-09 16:14:14 +02:00
Pawel Kowalski 6de819b0b2 Removed unnecessary cors whitlable entry 2018-08-09 14:26:21 +02:00
Ramon Wenger f2d9d18894 Remove nuxt from project 2018-08-09 14:20:33 +02:00
Ramon Wenger f7e994522c Fix static settings 2018-08-09 10:19:48 +02:00
Pawel Kowalski f11f57eb4e Adds a generic wagtail_parent_filter for django admin 2018-08-09 09:56:42 +02:00
Ramon Wenger 4e4c8768f3 Adjust static url 2018-08-08 18:59:47 +02:00
Ramon Wenger 14b06c809d Update static folder in settings 2018-08-08 18:09:02 +02:00
Pawel Kowalski 6cb6498cd8 Provide a topic filter for modules 2018-08-08 16:31:30 +02:00
Pawel Kowalski c6afb6ce91 Use real test data where available and mix with generated testdata where missing 2018-08-08 16:00:05 +02:00
Pawel Kowalski 739d89f37e Define real test data 2018-08-08 15:41:33 +02:00
Pawel Kowalski 623afa8d0d Add order parameter to module 2018-08-08 15:41:33 +02:00
Pawel Kowalski bac0690721 Redirect from server to the client if no server url responds to the request 2018-08-08 15:25:00 +02:00
Pawel Kowalski 9d47f0349a Add order to Topic, Show how to iterate over apollo results 2018-08-08 15:14:54 +02:00
Ramon Wenger 9122640750 Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-08 15:01:22 +02:00
Ramon Wenger 5e6ea1f52e Add nuxt.js to project 2018-08-08 15:00:56 +02:00
Pawel Kowalski 91c81b13c0 implement a navigable book->topic->module query 2018-08-08 14:43:49 +02:00
Pawel Kowalski e21ba0a232 implement base model, factories, nodes 2018-08-08 11:41:39 +02:00
Pawel Kowalski 575e8e2bd7 upgrade wagtail version 2018-08-08 09:48:36 +02:00
Pawel Kowalski b379c6dd3d build 2018-08-07 23:41:30 +02:00
Pawel Kowalski c47537b1ba trigger build 2018-08-07 23:39:35 +02:00
Pawel Kowalski 2a942ea0cf comment aws settings 2018-08-06 23:46:22 +02:00
Pawel Kowalski 5dbef5a694 initial commit 2018-08-06 23:26:23 +02:00