5427 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Emanuel Schütze	90370ea628	Release 2.3b1	2018-08-30 15:24:42 +02:00
Emanuel Schütze	cbd7566885	Merge pull request #3839 from emanuelschuetze/translations ... Final translations for 2.3	2018-08-30 15:24:06 +02:00
Emanuel Schütze	48537dbfbf	Updated all translations.	2018-08-30 15:08:51 +02:00
Emanuel Schütze	6bae5cf87a	Fixed translation strings and permission check. Updated Changelog.	2018-08-30 15:05:08 +02:00
Emanuel Schütze	1dd1a4bac8	Merge pull request #3832 from FinnStutzenstein/hideSortInAgenda ... Hide Sort button in agenda (closes #3812)	2018-08-27 12:14:26 +02:00
FinnStutzenstein	d1b52a9302	Hide Sort button in agenda (closes #3812)	2018-08-27 11:24:52 +02:00
Emanuel Schütze	bec7224c9b	Merge pull request #3827 from emanuelschuetze/motion-pdf-default ... Change default for motion export dialog.	2018-08-24 16:23:22 +02:00
Emanuel Schütze	702bc67334	Change default for motion export dialog.	2018-08-24 16:14:01 +02:00
Emanuel Schütze	053b284691	Merge pull request #3826 from emanuelschuetze/motionPDF ... Enable/disable category in motion PDF.	2018-08-24 14:52:17 +02:00
Emanuel Schütze	6c2fbf7389	Enable/disable category in motion PDF.	2018-08-24 14:00:53 +02:00
Emanuel Schütze	96637e18c4	Merge pull request #3804 from normanjaeckel/ChangeCollectStatic ... Fixed collectstattic command so that it does not write into openslide…	2018-08-23 17:38:26 +02:00
Emanuel Schütze	2a4056816c	Merge pull request #3816 from emanuelschuetze/translations ... Updated German translations.	2018-08-23 17:30:15 +02:00
Emanuel Schütze	7d24066be7	Updated German translations.	2018-08-23 17:20:40 +02:00
Emanuel Schütze	c49eb8bf64	Merge pull request #3808 from FinnStutzenstein/diverses ... Layout changes for motion detail view and PDF	2018-08-23 16:49:30 +02:00
FinnStutzenstein	cece35b3a5	Layout changes for motion detail view and PDF	2018-08-23 16:38:12 +02:00
Norman Jäckel	e012589ab0	Merge pull request #3814 from emanuelschuetze/fix3813 ... Fixed TypeError in Motion and Assignment Slides (Fixed#3813)	2018-08-23 15:48:15 +02:00
Emanuel Schütze	8ed043bbe8	Merge pull request #3806 from normanjaeckel/FixAgenda ... Fixed agenda get_restricted_data() if no agenda items exist.	2018-08-23 15:47:34 +02:00
Norman Jäckel	3578d0e850	Fixed collectstattic command so that it does not write into openslides app dir.	2018-08-23 15:47:19 +02:00
Emanuel Schütze	c852f72c20	Merge pull request #3811 from normanjaeckel/ElectionBar ... Fixed assignment election bar for votes mode. Fixed #3598.	2018-08-23 15:42:50 +02:00
Emanuel Schütze	0036567f7d	Fixed TypeError in Motion and Assignment Slides (Fixed#3813) ... in MotionPollDecimalPlaces and AssignmentPollDecimalPlaces	2018-08-23 15:39:15 +02:00
Finn Stutzenstein	172f1ed890	Merge pull request #3810 from emanuelschuetze/workflow-sorting ... Fix sorting of states in workflow detail view.	2018-08-23 14:35:04 +02:00
Norman Jäckel	cbd970ba9d	Fixed assignment election bar for votes mode. Fixed #3598.	2018-08-23 11:30:46 +02:00
Norman Jäckel	123b7c702b	Merge pull request #3803 from FinnStutzenstein/voting_decimal_places ... Support for decimal places in motion and assignment polls	2018-08-23 11:28:26 +02:00
Emanuel Schütze	2cd8262025	Fix sorting of states in workflow detail view.	2018-08-23 11:12:53 +02:00
Norman Jäckel	dc4fd6a93e	Fixed agenda get_restricted_data() if no agenda items exist.	2018-08-23 09:48:47 +02:00
Emanuel Schütze	768c97e89c	Merge pull request #3785 from FinnStutzenstein/no-changeable-first-state ... Do not allow changing a workflow's first state (closes #3778)	2018-08-23 09:24:29 +02:00
FinnStutzenstein	9c1290ee0b	Do not allow changing a workflow's first state (closes #3778)	2018-08-23 09:09:18 +02:00
FinnStutzenstein	9bac396b67	Support for decimal places in motion and assignment polls	2018-08-23 08:53:59 +02:00
Emanuel Schütze	11958c9d1b	Merge pull request #3801 from normanjaeckel/FixAgenda ... Changed default agenda type for new topics.	2018-08-22 17:47:09 +02:00
Norman Jäckel	27e0564a23	Changed default agenda type for new topics.	2018-08-22 17:27:21 +02:00
Norman Jäckel	83295ebec1	Merge pull request #3797 from normanjaeckel/FixWindows ... Fixed settings creation for windows.	2018-08-22 16:04:28 +02:00
Norman Jäckel	07ffb3b6c5	Fixed settings creation for windows.	2018-08-22 12:39:59 +02:00
Emanuel Schütze	dbd808c02b	Merge pull request #3794 from emanuelschuetze/translations ... Updated German translations.	2018-08-17 10:21:25 +02:00
Emanuel Schütze	6bbaf39bce	Updated German translations.	2018-08-17 09:13:09 +02:00
Emanuel Schütze	c940275693	Merge pull request #3792 from FinnStutzenstein/diverses ... Layout changes, config for enabling amendments in the motions table	2018-08-17 08:46:56 +02:00
FinnStutzenstein	65ec9cbf73	Layout changes, config for enabling amendments in motions table ... - fixed update form bug, explicit link to parent motion - br space in pdf and motion-text (restrict to linenumbermode none)	2018-08-17 08:38:41 +02:00
Emanuel Schütze	4605d4429c	Merge pull request #3790 from FinnStutzenstein/hidden-items ... New item type internal.	2018-08-17 08:24:07 +02:00
FinnStutzenstein	1a17862d6b	New item type internal. ... The old hidden type was used as internal, so everything is changed to not be shown if the item is internal. hidden is "new", and actually behaves as hidden now.	2018-08-16 15:28:30 +02:00
Emanuel Schütze	32e20aa670	Merge pull request #3789 from FinnStutzenstein/redis-session ... Use newer version of django-redis-sessions, new settings format	2018-08-15 11:45:52 +02:00
FinnStutzenstein	78dab97673	Use newer version of django-redis-sessions, new settings format	2018-08-15 11:37:20 +02:00
Emanuel Schütze	944c00b8a0	Merge pull request #3788 from emanuelschuetze/translations ... Updated German translations.	2018-08-14 15:40:44 +02:00
Emanuel Schütze	ab587b48cd	Updated German translations.	2018-08-14 15:33:33 +02:00
Emanuel Schütze	4b6936572f	Merge pull request #3781 from FinnStutzenstein/modified-final-version ... New temporal field for editing the final version of a motion.	2018-08-14 14:24:08 +02:00
FinnStutzenstein	e073084f74	New temporal field for editing the final version of a motion.	2018-08-14 14:15:11 +02:00
Emanuel Schütze	7e472ab472	Merge pull request #3787 from FinnStutzenstein/missing_templatehook ... Added missing templatehook for the voting plugin	2018-08-14 13:33:10 +02:00
FinnStutzenstein	9f24ec559b	Added missing templatehook for the voting plugin	2018-08-14 13:26:54 +02:00
Emanuel Schütze	e9ad439cdd	Merge pull request #3774 from FinnStutzenstein/abstain-no-for-assignment-votes ... Added general abstain/no fields for assignments. Used in votes mode.	2018-08-14 09:34:37 +02:00
Oskar Hahn	15e4832d40	Merge pull request #3786 from ostcar/requirements_again ... support python 3.7	2018-08-11 12:56:56 +02:00
Oskar Hahn	92a39a3fc6	support python 3.7 ... fix new pep8 stype	2018-08-08 21:46:56 +02:00
Oskar Hahn	bf3e000c5b	Merge pull request #3777 from ostcar/update-python-requirements ... Update python requirements	2018-08-07 15:29:35 +02:00