ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed translation strings and permission check. Updated Changelog.

Browse Source
This commit is contained in:
Emanuel Schütze 2018-08-30 15:05:08 +02:00
parent 1dd1a4bac8
commit 6bae5cf87a
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGELOG.rst
View File

@ -6,31 +6,33 @@ https://openslides.org/
Version 2.3 (unreleased)
========================
`Release notes <https://github.com/OpenSlides/OpenSlides/wiki/OpenSlides-2.3>`_ ·
`Milestone <https://github.com/OpenSlides/OpenSlides/milestones/2.3>`_
Agenda:
- New item type 'hidden'. New visibilty filter in agenda [#3790].
Elections:
- Support to change decimal places for elections with a plugin [#3803]
Motions:
- New feature to scroll the projector to a specific line [#3748].
- New possibility to sort submitters [#3647].
- New representation of amendments (paragraph based creation, new diff
and list views for amendments) [#3637].
- New feature to customize workflows and states [#3772, #3785].
- New config options to show logos on the right side in PDF [#3768].
- New table of contents with page numbers and categories in PDF [#3766].
- New teporal field "modified final version" where the final version can
be edited [#3781].
- New config options to show logos on the right side in PDF [#3768].
- New config to show amendments also in motions table [#3792].
- Support to change decimal places for polls with a plugin [#3803].
Elections:
- Support to change decimal places for elections with a plugin [#3803]
Core:
- Python 3.4 is not supported anymore [#3777].
- Support Python 3.7 [#3786].
- Updated pdfMake to 0.1.37 [#3766].
- Updated Django to 2.1 [#3777, #3786].
- Support for Python 3.7 [#3786].
- Python 3.4 is not supported anymore [#3777].
- Updated pdfMake to 0.1.37 [#3766].
- Changed behavior of collectstatic management command [#3804].

8
openslides/core/config_variables.py
View File

@ -299,7 +299,7 @@ def get_config_variables():
yield ConfigVariable(
name='logo_pdf_header_L',
default_value={
'display_name': 'PDF header logo (Left)',
'display_name': 'PDF header logo (left)',
'path': ''},
input_type='static',
weight=310,
@ -309,7 +309,7 @@ def get_config_variables():
yield ConfigVariable(
name='logo_pdf_header_R',
default_value={
'display_name': 'PDF header logo (Right)',
'display_name': 'PDF header logo (right)',
'path': ''},
input_type='static',
weight=311,
@ -319,7 +319,7 @@ def get_config_variables():
yield ConfigVariable(
name='logo_pdf_footer_L',
default_value={
'display_name': 'PDF footer logo (Left)',
'display_name': 'PDF footer logo (left)',
'path': ''},
input_type='static',
weight=312,
@ -329,7 +329,7 @@ def get_config_variables():
yield ConfigVariable(
name='logo_pdf_footer_R',
default_value={
'display_name': 'PDF footer logo (Right)',
'display_name': 'PDF footer logo (right)',
'path': ''},
input_type='static',
weight=313,

7
openslides/core/static/js/core/site.js
View File

@ -2119,9 +2119,10 @@ angular.module('OpenSlidesApp.core.site', [
gettext('List of speakers overlay');
gettext('Projector logo');
gettext('Projector header image');
gettext('PDF header logo (Left)');
gettext('PDF header logo (Right)');
gettext('PDF footer logo');
gettext('PDF header logo (left)');
gettext('PDF header logo (right)');
gettext('PDF footer logo (left)');
gettext('PDF footer logo (right)');
gettext('Web interface header logo');
gettext('PDF ballot paper logo');
gettext('Custom translations');

2
openslides/motions/static/templates/motions/motion-detail/view-modified-agreed.html
View File

@ -1,7 +1,7 @@
<!-- Modified agreed view -->
<div ng-if="viewChangeRecommendations.mode == 'modified_agreed'">
<div style="text-align: right;">
<button class="btn btn-default btn-danger btn-sm"
<button class="btn btn-default btn-danger btn-sm" os-perms="motions.can_manage"
ng-bootbox-confirm="{{ 'Do you want to delete the final print template?' | translate }}"
ng-bootbox-confirm-action="viewChangeRecommendations.deleteModifiedFinalVersion(motion, version)">
<i class="fa fa-trash"></i>