From 0351d8982f99445513e6b184776e5320e5821eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 20 Jan 2015 14:42:41 +0100 Subject: [PATCH] Update metadata files and copyright notes. --- CHANGELOG | 5 +++++ LICENSE | 2 +- extras/openslides_gui/gui.py | 2 +- extras/win32-portable/licenses/openslides | 2 +- extras/win32-portable/prepare_portable.py | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bc16e4343..3af37b3d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,12 +12,17 @@ Core: - New feature to tag motions, agenda and assignments. - Fixed search index problem to index contents of many-to-many tables (e. g. tags of a motion). +- Fixed AttributeError in chatbox on_open method. Motions: - New Feature to create amendments, which are related to a parent motion. - Added possibility to hide motions from non staff users in some states. Other: - Cleaned up utils.views to increase performance when fetching single objects from the database for a view (#1378). +- Fixed bug on projector which was not updated when an object was deleted. +- Updated pdf.js to 1.0.907. +- Improve the usage of bsmselect jquery plugin. +- Updated translations. Version 1.6.1 (2014-12-08) diff --git a/LICENSE b/LICENSE index 7a4da8bd6..4b3d5d863 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2011-2014 OpenSlides Team +Copyright (c) 2011-2015 OpenSlides Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/extras/openslides_gui/gui.py b/extras/openslides_gui/gui.py index d91861025..d3933f0e3 100644 --- a/extras/openslides_gui/gui.py +++ b/extras/openslides_gui/gui.py @@ -636,7 +636,7 @@ class MainWindow(wx.Frame): "assembly system.\n" "OpenSlides is free software; licensed under the MIT license." ).replace(u" ", u"\u00a0")) - info.SetCopyright(_(u"\u00a9 2011-2014 by OpenSlides team")) + info.SetCopyright(_(u"\u00a9 2011-2015 by OpenSlides team")) info.SetWebSite(("http://www.openslides.org/", "www.openslides.org")) # XXX: at least on wxgtk this has no effect diff --git a/extras/win32-portable/licenses/openslides b/extras/win32-portable/licenses/openslides index b4e337dc3..26a03f0ea 100644 --- a/extras/win32-portable/licenses/openslides +++ b/extras/win32-portable/licenses/openslides @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2011-2014 OpenSlides Team +Copyright (c) 2011-2015 OpenSlides Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py index baf8f852b..5622a384e 100755 --- a/extras/win32-portable/prepare_portable.py +++ b/extras/win32-portable/prepare_portable.py @@ -197,7 +197,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "OpenSlides\\0" VALUE "FileVersion", "{version_str}\\0" VALUE "InternalName", "OpenSlides\\0" - VALUE "LegalCopyright", "Copyright \\251 2011-2014\\0" + VALUE "LegalCopyright", "Copyright \\251 2011-2015\\0" VALUE "OriginalFilename", "openslides.exe\\0" VALUE "ProductName", "OpenSlides\\0" VALUE "ProductVersion", "{version_str}\\0" @@ -378,7 +378,7 @@ def openslides_launcher_update_version_resource(): "FileDescription": "OpenSlides", "FileVersion": version_str, "InternalName": "OpenSlides", - "LegalCopyright": u"Copyright \xa9 2011-2014", + "LegalCopyright": u"Copyright \xa9 2011-2015", "OriginalFilename": "openslides.exe", "ProductName": "OpenSlides", "ProductVersion": version_str,