Commit Graph

250 Commits

Author SHA1 Message Date
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