diff --git a/history.txt b/history.txt
index 982ad617976..d7f16531a17 100644
--- a/history.txt
+++ b/history.txt
@@ -16,6 +16,33 @@ Legend:
- General comment
OpenCms 10.5.0 Beta - September 26, 2016
+! Localization: Compare localized subsites side-by-side.
+! Localization: Copy pages from one language to another, including content.
+! Localization: Connect the same page in different languages using locale relations.
+! Localization: Message bundle translator.
+! Localization: Support for localized properties.
+! Asset Connection: Data view widget API allows to natively integrate external assets in the content editor.
+! Asset Connection: Support for using external assets in templates through EL functions.
+! Enhanced online preview in the page editor hides all OpenCms added markup for HTML debugging.
+! The Apollo Template has been greatly enhanced with new options and functionality.
+! Security: Added password expiration option.
+! Security: Added password strength indicator in password dialog.
+! Security: Added dialog "Edit user" so users can update their personal information.
+! Security: Added optional "Confirm personal information" dialog after user login.
+! Unified toolbar appearance and context menus for editors and workplace.
+! Improved behaviour when switching between workplace and editor views.
+! Support for high resolution retina screens by using font icons.
+! Keyboard shortcuts: Added "step through element views" to page editor (Ctrl-E).
+! Keyboard shortcuts: Added "step through overlapping edit points" to page editor (Ctrl-Shift-E).
+! Keyboard shortcuts: Added "save" and "save and exit" to content editor (Ctrl-S, Ctrl-Shift-S).
+! Keyboard shortcuts: Added option to show "copy or reuse" dialog after drag & drop (Ctrl + mouse up).
+! Page editor now "remembers" the last formatter set for a content type as default.
+! Added optional "Copyright" and "Cache" columns to the Explorer.
+! Categories attached to contents are now by default stored in the relation engine, not the XML.
+! Added JSP EL functions to read categories from a resource.
+! Added JSP EL functions to read locale relations for a page.
+- Transferred edit JSP permission from "Template developer" role to "VFS manager" role.
+- Extended macro formatters for better handling of new contents.
OpenCms 10.0.1 - June 14, 2016
- Improved drag and drop performance in container page editor for pages with many containers
diff --git a/modules/org.opencms.ade.config/resources/manifest.xml b/modules/org.opencms.ade.config/resources/manifest.xml
index 78de133f2a7..6e1a9cf4208 100755
--- a/modules/org.opencms.ade.config/resources/manifest.xml
+++ b/modules/org.opencms.ade.config/resources/manifest.xml
@@ -17,7 +17,7 @@ chacc '/system/userimages/' 'ROLE' 'ELEMENT_AUTHOR' '+I+O+R'
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).]]>
- 10.4.7
+ 10.5.0
diff --git a/modules/org.opencms.editors.codemirror/resources/manifest.xml b/modules/org.opencms.editors.codemirror/resources/manifest.xml
index ef8affb0f92..81b5e2e6e54 100644
--- a/modules/org.opencms.editors.codemirror/resources/manifest.xml
+++ b/modules/org.opencms.editors.codemirror/resources/manifest.xml
@@ -14,7 +14,7 @@
This module adds the Open Source text editor CodeMirror to the OpenCms Workplace.
Install this module if you want a source code editor with syntax highlighting. The version of CodeMirror is 5.10.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.editors.tinymce/resources/manifest.xml b/modules/org.opencms.editors.tinymce/resources/manifest.xml
index 765d708cd21..d3beadb66a3 100644
--- a/modules/org.opencms.editors.tinymce/resources/manifest.xml
+++ b/modules/org.opencms.editors.tinymce/resources/manifest.xml
@@ -13,7 +13,7 @@
This module contains TinyMCE editor for HTML pages and XML content.
The version of TinyMCE is 4.3.2
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.editors/resources/manifest.xml b/modules/org.opencms.editors/resources/manifest.xml
index c68a86458ad..831179822a5 100644
--- a/modules/org.opencms.editors/resources/manifest.xml
+++ b/modules/org.opencms.editors/resources/manifest.xml
@@ -20,7 +20,7 @@ chacc '/system/workplace/editors/' 'ROLE' 'ELEMENT_AUTHOR' '+I+O+R+V'
This module contains the OpenCms Common Editing tools.
This module is needed to be able to edit files in the OpenCms Workplace.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.gwt/resources/manifest.xml b/modules/org.opencms.gwt/resources/manifest.xml
index 36b7a0b0a7b..18f7417e99d 100644
--- a/modules/org.opencms.gwt/resources/manifest.xml
+++ b/modules/org.opencms.gwt/resources/manifest.xml
@@ -13,7 +13,7 @@
Provides an OpenCms GWT framework.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.jquery/resources/manifest.xml b/modules/org.opencms.jquery/resources/manifest.xml
index c140998310a..b260e283637 100644
--- a/modules/org.opencms.jquery/resources/manifest.xml
+++ b/modules/org.opencms.jquery/resources/manifest.xml
@@ -12,7 +12,7 @@
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.locale.de/resources/manifest.xml b/modules/org.opencms.locale.de/resources/manifest.xml
index d3efcb27873..83ef895a9e0 100644
--- a/modules/org.opencms.locale.de/resources/manifest.xml
+++ b/modules/org.opencms.locale.de/resources/manifest.xml
@@ -19,7 +19,7 @@ writeProperty '/system/workplace/locales/de/' 'locale' 'de'
This module contains the German language localization files for the OpenCms workplace.
Install this module if you want to use the german version of the OpenCms Workplace.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.ugc/resources/manifest.xml b/modules/org.opencms.ugc/resources/manifest.xml
index 4923e210678..033b83540ec 100644
--- a/modules/org.opencms.ugc/resources/manifest.xml
+++ b/modules/org.opencms.ugc/resources/manifest.xml
@@ -13,7 +13,7 @@
User generated content API
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.administration/resources/manifest.xml b/modules/org.opencms.workplace.administration/resources/manifest.xml
index 51c151d2541..1c210af4b2f 100644
--- a/modules/org.opencms.workplace.administration/resources/manifest.xml
+++ b/modules/org.opencms.workplace.administration/resources/manifest.xml
@@ -14,7 +14,7 @@
This module contains the base components for the administration view.
Its allows you to install and/or develop administration tools for OpenCms.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.explorer/resources/manifest.xml b/modules/org.opencms.workplace.explorer/resources/manifest.xml
index 069262720ea..fafd931c455 100644
--- a/modules/org.opencms.workplace.explorer/resources/manifest.xml
+++ b/modules/org.opencms.workplace.explorer/resources/manifest.xml
@@ -20,7 +20,7 @@ writeProperty '/system/workplace/explorer/' 'default-file' '/system/workplace/vi
This module contains the OpenCms Workplace Explorer.
Install this module if you want a GUI to work on the OpenCms VFS.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.handler/resources/manifest.xml b/modules/org.opencms.workplace.handler/resources/manifest.xml
index a542d905e91..be093288a32 100644
--- a/modules/org.opencms.workplace.handler/resources/manifest.xml
+++ b/modules/org.opencms.workplace.handler/resources/manifest.xml
@@ -14,7 +14,7 @@
This module contains the OpenCms Workplace handler files.
It includes the 404 and 500 error handlers that are showed in case of an error of a frontend application.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.spellcheck/resources/manifest.xml b/modules/org.opencms.workplace.spellcheck/resources/manifest.xml
index c75be26a230..9e22b3d1a4a 100644
--- a/modules/org.opencms.workplace.spellcheck/resources/manifest.xml
+++ b/modules/org.opencms.workplace.spellcheck/resources/manifest.xml
@@ -13,7 +13,7 @@
This module contains the OpenCms spellcheck dictionaries.
© 2013 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.tools.accounts/resources/manifest.xml b/modules/org.opencms.workplace.tools.accounts/resources/manifest.xml
index 318a4f506fe..fdcc4c86a65 100644
--- a/modules/org.opencms.workplace.tools.accounts/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.accounts/resources/manifest.xml
@@ -32,7 +32,7 @@ writeProperty '/system/workplace/admin/accounts/imexport_user_data/' 'admintoolh
This module contains the OpenCms administration tools for managing the user accounts and groups.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.cache/resources/manifest.xml b/modules/org.opencms.workplace.tools.cache/resources/manifest.xml
index d2ff9b49291..9f4fee9e043 100644
--- a/modules/org.opencms.workplace.tools.cache/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.cache/resources/manifest.xml
@@ -23,7 +23,7 @@ writeProperty '/system/workplace/admin/cache/' 'admintoolhandler-class' 'org.ope
This module contains the OpenCms administration tools for managing the different internal caches.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.content/resources/manifest.xml b/modules/org.opencms.workplace.tools.content/resources/manifest.xml
index a629f69e8a8..498ac0bb411 100644
--- a/modules/org.opencms.workplace.tools.content/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.content/resources/manifest.xml
@@ -42,7 +42,7 @@ writeProperty '/system/workplace/admin/contenttools/check/plugin/' 'locale-avail
This module contains the OpenCms administration tools for managing the content of resources.
Install this module if you want to modify file properties or content elements.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.database/resources/manifest.xml b/modules/org.opencms.workplace.tools.database/resources/manifest.xml
index 3997532ceb9..57217903b63 100644
--- a/modules/org.opencms.workplace.tools.database/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.database/resources/manifest.xml
@@ -24,7 +24,7 @@ writeProperty '/system/workplace/admin/database/' 'admintoolhandler-class' 'org.
This module contains the OpenCms database maintainance tools.
Install this module if you want to import/export data, it also contains a static export tool.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.tools.galleryoverview/resources/manifest.xml b/modules/org.opencms.workplace.tools.galleryoverview/resources/manifest.xml
index aa6cff7334b..d96842a5e9d 100644
--- a/modules/org.opencms.workplace.tools.galleryoverview/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.galleryoverview/resources/manifest.xml
@@ -73,7 +73,7 @@ writeProperty '/system/workplace/admin/galleryoverview/tablegallery/' 'internal'
This module contains Overviews for every OpenCms gallery types.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.git/resources/manifest.xml b/modules/org.opencms.workplace.tools.git/resources/manifest.xml
index fcf237a67a8..b9ea5972b25 100644
--- a/modules/org.opencms.workplace.tools.git/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.git/resources/manifest.xml
@@ -15,7 +15,7 @@
You can configure a git repository and a set of modules that should be controlled by that repository.
The module allows you to check in the latest version of your modules by simply pressing one button.
NOTE: Currently only Linux systems are supported.]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.tools.history/resources/manifest.xml b/modules/org.opencms.workplace.tools.history/resources/manifest.xml
index 01fa186aed7..a21aa4e321f 100644
--- a/modules/org.opencms.workplace.tools.history/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.history/resources/manifest.xml
@@ -39,7 +39,7 @@ writeProperty '/system/workplace/admin/history/settings/' 'default-file' 'index.
This module contains the OpenCms administration tools for managing the file history feature.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.link/resources/manifest.xml b/modules/org.opencms.workplace.tools.link/resources/manifest.xml
index 301a97d4505..5b19976347b 100644
--- a/modules/org.opencms.workplace.tools.link/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.link/resources/manifest.xml
@@ -31,7 +31,7 @@ writeProperty '/system/workplace/admin/linkvalidation/external/' 'admintoolhandl
This module contains the OpenCms administration tools for validating links in xml documents and pointer links.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.tools.modules/resources/manifest.xml b/modules/org.opencms.workplace.tools.modules/resources/manifest.xml
index a253eec44c2..f8cb251562c 100644
--- a/modules/org.opencms.workplace.tools.modules/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.modules/resources/manifest.xml
@@ -26,7 +26,7 @@ writeProperty '/system/workplace/admin/modules/reports/' 'Title' 'Reports'
This module contains administration tools for managing the OpenCms modules.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.projects/resources/manifest.xml b/modules/org.opencms.workplace.tools.projects/resources/manifest.xml
index 7cb6a5b2f49..911dc0d8860 100644
--- a/modules/org.opencms.workplace.tools.projects/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.projects/resources/manifest.xml
@@ -24,7 +24,7 @@ writeProperty '/system/workplace/admin/projects/' 'default-file' 'projects_list.
This module contains the tools for managing the OpenCms projects.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.tools.publishqueue/resources/manifest.xml b/modules/org.opencms.workplace.tools.publishqueue/resources/manifest.xml
index a478c263d01..9d9ed6e135a 100644
--- a/modules/org.opencms.workplace.tools.publishqueue/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.publishqueue/resources/manifest.xml
@@ -13,7 +13,7 @@
This module contains the tools for view the OpenCms publish queue.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
diff --git a/modules/org.opencms.workplace.tools.scheduler/resources/manifest.xml b/modules/org.opencms.workplace.tools.scheduler/resources/manifest.xml
index 9080a5ef3dc..9da6487590d 100644
--- a/modules/org.opencms.workplace.tools.scheduler/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.scheduler/resources/manifest.xml
@@ -24,7 +24,7 @@ writeProperty '/system/workplace/admin/scheduler/' 'default-file' 'index.jsp'
This module contains the tools for managing scheduled jobs.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.searchindex/resources/manifest.xml b/modules/org.opencms.workplace.tools.searchindex/resources/manifest.xml
index cbf536fbd46..f57f2d451c3 100644
--- a/modules/org.opencms.workplace.tools.searchindex/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.searchindex/resources/manifest.xml
@@ -34,7 +34,7 @@ writeProperty '/system/workplace/admin/searchindex/sourcesearch/' 'default-file'
This module contains tools related to the search capabilities of OpenCms.
Install this module if you need search capabilities in OpenCms.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.tools.sites/resources/manifest.xml b/modules/org.opencms.workplace.tools.sites/resources/manifest.xml
index 4088f673f30..1ef72cf409c 100644
--- a/modules/org.opencms.workplace.tools.sites/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.sites/resources/manifest.xml
@@ -13,7 +13,7 @@
This module contains the OpenCms administration tools for managing multiple sites served by OpenCms.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.4.7
+ 10.5.0
diff --git a/modules/org.opencms.workplace.tools.workplace/resources/manifest.xml b/modules/org.opencms.workplace.tools.workplace/resources/manifest.xml
index 55f13ab0052..f23f8b4ab6e 100644
--- a/modules/org.opencms.workplace.tools.workplace/resources/manifest.xml
+++ b/modules/org.opencms.workplace.tools.workplace/resources/manifest.xml
@@ -41,7 +41,7 @@ writeProperty '/system/workplace/admin/workplace/logging/' 'default-file' 'index
This module contains the OpenCms Workplace maintenance tools.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.1
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace.traditional/resources/manifest.xml b/modules/org.opencms.workplace.traditional/resources/manifest.xml
index 8c2d5caf15e..0b4a41cef0c 100644
--- a/modules/org.opencms.workplace.traditional/resources/manifest.xml
+++ b/modules/org.opencms.workplace.traditional/resources/manifest.xml
@@ -14,7 +14,7 @@
This module contains the traditional OpenCms Workplace.
It includes common used dialogs and style sheets, that are needed by any workplace module.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT
diff --git a/modules/org.opencms.workplace/resources/manifest.xml b/modules/org.opencms.workplace/resources/manifest.xml
index 3f8ce2d85c8..29008e619a8 100644
--- a/modules/org.opencms.workplace/resources/manifest.xml
+++ b/modules/org.opencms.workplace/resources/manifest.xml
@@ -42,7 +42,7 @@ chacc '/system/workplace/views/' 'ROLE' 'WORKPLACE_USER' '+I+O+R+V'
This module contains the OpenCms Workplace base files.
It includes common used dialogs and style sheets, that are needed by any workplace module.
© 2016 by Alkacon Software GmbH (http://www.alkacon.com).
]]>
- 10.0.0
+ 10.5.0
Mon, 27 Jun 2005 08:00:00 GMT