Commit Graph

417 Commits

Author SHA1 Message Date
Daniel Egger 5d52aef859 Merge branch 'feature/image-upload' 2018-09-19 18:03:30 +02:00
Daniel Egger 41bf6efce1 bugfix freezed array -> make deep copy of contentBlock 2018-09-19 18:03:11 +02:00
Daniel Egger 48e724f4e4 anpassungen nach rebase 2018-09-19 17:40:53 +02:00
Daniel Egger a441f3b515 Add 1 git-crypt collaborator
New collaborators:

	F0CB4CA8 Lorenz Padberg (-) <lorenz.padberg@iterativ.ch>
2018-09-19 17:11:39 +02:00
Daniel Egger 22adcfadd1 Add 1 git-crypt collaborator
New collaborators:

	C2175B8A Ramon Wenger <ramon.wenger@iterativ.ch>
2018-09-19 17:11:33 +02:00
Daniel Egger f139cf1100 Add 1 git-crypt collaborator
New collaborators:

	DC449299 Daniel Egger <daniel.egger@iterativ.ch>
2018-09-19 17:11:28 +02:00
Daniel Egger 19c4651099 Add 1 git-crypt collaborator
New collaborators:

	3F287BE8 Christian Cueni <christian.cueni@iterativ.ch>
2018-09-19 17:11:20 +02:00
Daniel Egger 4b10fc83fa added git-crypt 2018-09-19 17:11:01 +02:00
Daniel Egger a16a4753b0 uploadcare styling and handling 2018-09-19 16:37:27 +02:00
Daniel Egger 5ff2f97606 basic working exmaple with uploadpanel 2018-09-19 16:37:27 +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 8067ca439d Extend the content block menu 2018-09-19 14:13:57 +02:00
Ramon Wenger a760949b84 Make modal handling a bit more generic 2018-09-19 14:13:31 +02:00
Ramon Wenger c9d43dd111 Use auto-cache update for content block mutations 2018-09-18 19:39:32 +02:00
Ramon Wenger 0c2cab4c96 Re-use cache for modules 2018-09-18 19:38:48 +02:00
Ramon Wenger 2464c97079 Update dummy data types 2018-09-18 19:38:26 +02:00
Ramon Wenger b2b2baab0f Remove debug info 2018-09-18 08:11:04 +02:00
Ramon Wenger ba2b77199a Merge branch 'feature/add-room-cherry-picked' 2018-09-17 18:56:54 +02:00
Ramon Wenger db61ca560a Add room mutation to frontend 2018-09-17 18:56:24 +02:00
Ramon Wenger 345b269435 Move background colors to mixin 2018-09-17 18:54:26 +02:00
Ramon Wenger 1927244f26 Fix room querying 2018-09-17 17:53:14 +02:00
Ramon Wenger 5cb71cd877 Update room color handling 2018-09-17 17:52:43 +02:00
Ramon Wenger fe59a65e87 Add room mutation 2018-09-17 11:35:49 +02:00
Ramon Wenger e94c7c5e8a Update graphene django 2018-09-17 11:34:36 +02:00
Ramon Wenger 8ab7877401 Fix background color bug 2018-09-17 09:20:08 +02:00
Ramon Wenger a522f9117c Remove filter from state, move to router 2018-09-17 09:19:38 +02:00
Ramon Wenger 0e30f0bd45 Add new room page 2018-09-14 15:57:57 +02:00
Ramon Wenger 5b1572b228 Add filter for content blocks 2018-09-14 10:59:29 +02:00
Ramon Wenger 4a9eb441af Generalize radiobuttons and checkboxes 2018-09-14 10:12:21 +02:00
Ramon Wenger daddb24fcc Update styles 2018-09-13 16:24:46 +02:00
Ramon Wenger 2ffeca189a Clean up code 2018-09-13 15:34:18 +02:00
Ramon Wenger 7038721bfd Toggle visibility by class / user group 2018-09-13 15:27:22 +02:00
Pawel Kowalski 2db6464f8d Implement filtering of ContentBlocks 2018-09-13 12:52:10 +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 9045935d96 Generalize modal display 2018-09-13 10:18:06 +02:00
Ramon Wenger 6347fa07e1 Add form validation for new content block 2018-09-12 17:40:13 +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 395434620b Refactor code 2018-09-12 11:05:38 +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 35a8184cd1 Insert new content block at correct position 2018-09-11 16:16:12 +02:00
Ramon Wenger 872eb6efa5 Fix typo 2018-09-11 15:53:09 +02:00
Ramon Wenger 26fa7e70bc Enable adding text blocks 2018-09-11 15:23:37 +02:00
Ramon Wenger d6316fc328 Update module query after mutation 2018-09-11 15:09:55 +02:00
Ramon Wenger 4260147f2d Add visibility button 2018-09-11 10:51:09 +02:00