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

Merge pull request #1414 from normanjaeckel/UpdateMetadata

Browse Source 
Update metadata files and copyright notes.
This commit is contained in:
Oskar Hahn 2015-01-20 19:54:27 +01:00
commit c890fd138a
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -12,12 +12,17 @@ Core:
- New feature to tag motions, agenda and assignments. - New feature to tag motions, agenda and assignments.
- Fixed search index problem to index contents of many-to-many tables - Fixed search index problem to index contents of many-to-many tables
(e. g. tags of a motion). (e. g. tags of a motion).
- Fixed AttributeError in chatbox on_open method.
Motions: Motions:
- New Feature to create amendments, which are related to a parent motion. - New Feature to create amendments, which are related to a parent motion.
- Added possibility to hide motions from non staff users in some states. - Added possibility to hide motions from non staff users in some states.
Other: Other:
- Cleaned up utils.views to increase performance when fetching single objects - Cleaned up utils.views to increase performance when fetching single objects
from the database for a view (#1378). 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) Version 1.6.1 (2014-12-08)

2
LICENSE
View File

@ -1,6 +1,6 @@
The MIT License (MIT) 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

2
extras/openslides_gui/gui.py
View File

@ -636,7 +636,7 @@ class MainWindow(wx.Frame):
"assembly system.\n" "assembly system.\n"
"OpenSlides is free software; licensed under the MIT license." "OpenSlides is free software; licensed under the MIT license."
).replace(u" ", u"\u00a0")) ).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")) info.SetWebSite(("http://www.openslides.org/", "www.openslides.org"))
# XXX: at least on wxgtk this has no effect # XXX: at least on wxgtk this has no effect

2
extras/win32-portable/licenses/openslides
View File

@ -1,6 +1,6 @@
The MIT License (MIT) 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

4
extras/win32-portable/prepare_portable.py
View File

@ -197,7 +197,7 @@ VS_VERSION_INFO VERSIONINFO
VALUE "FileDescription", "OpenSlides\\0" VALUE "FileDescription", "OpenSlides\\0"
VALUE "FileVersion", "{version_str}\\0" VALUE "FileVersion", "{version_str}\\0"
VALUE "InternalName", "OpenSlides\\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 "OriginalFilename", "openslides.exe\\0"
VALUE "ProductName", "OpenSlides\\0" VALUE "ProductName", "OpenSlides\\0"
VALUE "ProductVersion", "{version_str}\\0" VALUE "ProductVersion", "{version_str}\\0"
@ -378,7 +378,7 @@ def openslides_launcher_update_version_resource():
"FileDescription": "OpenSlides", "FileDescription": "OpenSlides",
"FileVersion": version_str, "FileVersion": version_str,
"InternalName": "OpenSlides", "InternalName": "OpenSlides",
"LegalCopyright": u"Copyright \xa9 2011-2014", "LegalCopyright": u"Copyright \xa9 2011-2015",
"OriginalFilename": "openslides.exe", "OriginalFilename": "openslides.exe",
"ProductName": "OpenSlides", "ProductName": "OpenSlides",
"ProductVersion": version_str, "ProductVersion": version_str,