This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit b4a95b9a32fbebc0128272090484611f9a584363 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sat Nov 14 11:06:09 2015 +0100 Update struts, struts-jquery-plugin --- .../src/main/resources/template/jquery/theme.properties | 1 + pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js | 4 +++- pom.xml | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties new file mode 100644 index 0000000..db3f7aa --- /dev/null +++ b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties @@ -0,0 +1 @@ +parent = css_xhtml \ No newline at end of file diff --git a/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js b/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js index 6af4a7e..e9e401b 100644 --- a/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js +++ b/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js @@ -28,11 +28,13 @@ CKEDITOR.editorConfig = function (config) { // ['Cut', 'Copy', 'Paste', 'PasteText', /*'PasteFromWord'*/, '-', 'Undo', 'Redo', '-', 'Scayt'], // [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], ['Styles', 'Format'], - ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], + ['Bold', 'Italic', 'Strike', 'Underline'/* ,'Subscript', 'Superscript'*/], ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor'], // '/', ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/, 'Link', 'Unlink', 'Anchor' ] ]; + + config.removePlugins = 'elementspath'; }; \ No newline at end of file diff --git a/pom.xml b/pom.xml index b0f8f32..5b4b521 100644 --- a/pom.xml +++ b/pom.xml @@ -168,8 +168,8 @@ <h2Version>1.3.176</h2Version> <postgresqlVersion>9.4-1205-jdbc41</postgresqlVersion> - <struts2Version>2.3.15.3</struts2Version> - <jqueryPluginVersion>3.5.0</jqueryPluginVersion> + <struts2Version>2.3.24.1</struts2Version> + <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> <slf4jVersion>1.7.13</slf4jVersion> <jettyVersion>9.3.6.v20151106</jettyVersion> @@ -207,6 +207,7 @@ </repository> </repositories> + <pluginRepositories> <pluginRepository> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.