6980 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Emanuel Schütze	294d324419	Merge pull request #4727 from GabrielInTheWorld/csv-import ... Adds import of tags to csv import	2019-05-21 15:17:47 +02:00
GabrielMeyer	cd4e73b6d3	Adds import of tags to csv import	2019-05-21 14:58:46 +02:00
Emanuel Schütze	e907599cef	Merge pull request #4726 from GabrielInTheWorld/pdf-make ... Adds config-variable for pdf-export	2019-05-21 12:23:38 +02:00
GabrielMeyer	eb7b203b33	Adds config-variable for pdf-export ... - Adds the page-size 'A5' for pdf-export	2019-05-21 11:58:59 +02:00
Emanuel Schütze	31274873f1	Merge pull request #4719 from FinnStutzenstein/chyronColor ... Added custom color for the projector chyron and reset buttons for colors	2019-05-20 22:12:32 +02:00
FinnStutzenstein	e267279f60	Added custom color for the projector chyron and reset buttons for colors	2019-05-20 21:50:03 +02:00
Emanuel Schütze	0a99c2b0f5	Merge pull request #4722 from FinnStutzenstein/motionTextNotRequiredForParagraphAmendments ... Do not require the motion text for paragraph based amendments	2019-05-20 21:46:15 +02:00
FinnStutzenstein	11fd8c5762	Do not require the motion text for paragraph based amendments	2019-05-20 20:47:28 +02:00
Emanuel Schütze	bcd7a3d74f	Merge pull request #4723 from FinnStutzenstein/preventDeletionOfLastWorkflow ... prevent deletion of last workflow and update configs on deletion	2019-05-20 20:43:38 +02:00
Finn Stutzenstein	e4dfd75ab9	Merge pull request #4721 from FinnStutzenstein/fixPermissionSorting ... Fix sorting of permissions if plugins are available	2019-05-20 17:20:38 +02:00
FinnStutzenstein	6f798357fa	prevent deletion of last workflow and update configs on deletion	2019-05-20 12:54:20 +02:00
Maximilian Krambach	a09269cf2a	Merge pull request #4640 from MaximilianKrambach/pollCalculations ... Poll calculations	2019-05-20 11:59:31 +02:00
Maximilian Krambach	014701442c	refactor poll calculations	2019-05-20 11:31:27 +02:00
FinnStutzenstein	ba73d50886	Fix sorting of permissions if plugins are available	2019-05-20 10:32:40 +02:00
Sean	7ab040823d	Merge pull request #4671 from tsiegleauq/rework-sort-filter ... Rework sort and filter	2019-05-20 10:02:12 +02:00
Sean Engelhardt	850fcbe243	Rework sort and filter ... More observable based, more scaleable filtering based on an old branch of @FinnStutzenstein. cleans some functions and provides some differend features.	2019-05-17 13:03:48 +02:00
Emanuel Schütze	0f03eb1446	Merge pull request #4679 from tsiegleauq/assignment-ui ... Rework Assignment UI	2019-05-16 22:17:20 +02:00
Sean Engelhardt	654c54e9ab	Rework Assignment UI ... Reworks the Assignment UI to fit to the current MockUps	2019-05-16 21:56:09 +02:00
Emanuel Schütze	fef386ddf8	Merge pull request #4713 from FinnStutzenstein/tooHighChangeIdHandling ... Handles 'change id too high' and generic websocket error message format	2019-05-16 20:25:13 +02:00
Emanuel Schütze	65dbf37106	Merge pull request #4704 from FinnStutzenstein/setPermissionRequest ... Request for settings a permission in a group (closes #4698)	2019-05-16 14:14:33 +02:00
Emanuel Schütze	93ef573e09	Merge pull request #4707 from FinnStutzenstein/fixTreeSorting ... fix tree sorting	2019-05-16 14:10:14 +02:00
Finn Stutzenstein	0ed00ff603	Merge pull request #4703 from normanjaeckel/ChangeDefaultWorkflows ... Changed default workflows.	2019-05-15 15:54:31 +02:00
Finn Stutzenstein	abe281e475	Merge pull request #4682 from FinnStutzenstein/motionSlideFixed ... Fixed getting states of amendments (closes #4677)	2019-05-15 15:54:11 +02:00
FinnStutzenstein	284e90961a	Fixed getting states of amendments (closes #4677)	2019-05-15 15:21:11 +02:00
Norman Jäckel	349fe49e1c	Changed default workflows.	2019-05-15 15:18:43 +02:00
Emanuel Schütze	183f671fee	Merge pull request #4693 from tsiegleauq/no-notification-on-projector ... Enhance update service	2019-05-15 14:58:59 +02:00
Finn Stutzenstein	8dda317b18	Merge pull request #4702 from normanjaeckel/BulkViewsMotions ... Bulk views motions	2019-05-15 14:52:48 +02:00
FinnStutzenstein	5ad94cb2f4	Handles 'change id too high' and generic websocket error message format	2019-05-15 14:25:54 +02:00
Norman Jäckel	cf29f97613	Added view for bulk category set and bulk motion block set. ... Due to rebasing this PR, this are the appropriate authorships: Server: @normanjaeckel and @FinnStutzenstein Client: @MaximilianKrambach	2019-05-15 14:18:36 +02:00
Finn Stutzenstein	8983f6aef3	Merge pull request #4542 from FinnStutzenstein/removeChatMessage ... Remove ChatMessage	2019-05-15 14:15:16 +02:00
FinnStutzenstein	10c329da8d	fix tree sorting ... Assigns the weight in the preorder traversal of the tree. Now one without every object (e.g. missing motions/items) still have the correct sorting. Intorduces the level attribute of items giving the amount of parents in the agenda. This allows to reduce complexits in the client.	2019-05-15 14:14:32 +02:00
FinnStutzenstein	665426e954	Remove ChatMessage	2019-05-15 13:44:45 +02:00
Finn Stutzenstein	b3c2b5f899	Merge pull request #4645 from FinnStutzenstein/renameManageRestriction ... Rename the manage restriction field	2019-05-15 13:40:16 +02:00
Emanuel Schütze	7f5ec6a840	Merge pull request #4715 from CatoTH/OS3-final-version-in-csv ... Support other text versions in CSV	2019-05-14 22:03:42 +02:00
Tobias Hößl	f8a56ed136	Support other text versions in CSV	2019-05-14 20:58:21 +02:00
Emanuel Schütze	0b22688a3f	Merge pull request #4716 from emanuelschuetze/userExport ... Improved users PDF and CSV export	2019-05-14 20:37:08 +02:00
Emanuel Schütze	2b163af5d7	Improved users PDF and CSV export ... - PDF: use full_name (with structure_level and number) instead of short_name. - CSV: add gender column	2019-05-14 20:20:21 +02:00
FinnStutzenstein	f9bac798aa	Rename the manage restriction field ... Renamed 'managers_only' to 'motions.can_maange' to adapt the (new) behavior of #4638. Closes #4643.	2019-05-14 16:02:59 +02:00
Maximilian Krambach	6b25e62cec	Merge pull request #4712 from MaximilianKrambach/fix4711 ... fix sorting tree condition #4711	2019-05-14 15:57:39 +02:00
Maximilian Krambach	71e2ef65fc	fix sorting tree condition	2019-05-14 15:11:25 +02:00
Finn Stutzenstein	8403b4622d	Merge pull request #4710 from GabrielInTheWorld/util-fixes ... Hotfix: MediaUpload went wrong...	2019-05-14 14:24:24 +02:00
GabrielMeyer	5ad70bd02d	Hotfix: MediaUpload went wrong...	2019-05-14 14:10:58 +02:00
Finn Stutzenstein	ae107dc0d1	Merge pull request #4706 from FinnStutzenstein/hotfixAgendaList ... Fixed false visible items in the agenda	2019-05-13 16:03:19 +02:00
Finn Stutzenstein	af717fe018	Merge pull request #4680 from FinnStutzenstein/unifyUrlsPrefixes ... Added beginning slash to all request urls	2019-05-13 14:49:51 +02:00
Finn Stutzenstein	6f014279d4	Merge pull request #4687 from FinnStutzenstein/catchDoubleCreationOfPersonalNotes ... Fix doulbe create requests for personal notes.	2019-05-13 14:49:42 +02:00
FinnStutzenstein	c860f45041	Fixed false visible items in the agenda ... The fix has to be reworked with #4671 and can be eliminated with #4639	2019-05-13 13:42:03 +02:00
FinnStutzenstein	5e13299ae3	Request for settings a permission in a group (closes #4698)	2019-05-13 10:17:24 +02:00
Emanuel Schütze	c2abe8a0a0	Merge pull request #4700 from emanuelschuetze/fixProjectorLogo ... Fixed projector logo	2019-05-11 10:02:32 +02:00
Emanuel Schütze	7792c47656	Fixed projector logo	2019-05-11 09:40:14 +02:00
Emanuel Schütze	4495985d4c	Merge pull request #4695 from FinnStutzenstein/logging ... Logging the cache buildup process	2019-05-10 16:39:29 +02:00