branch develop updated (df04183 -> 08e9a2c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from df04183 [jgitflow-maven-plugin]updating poms for 1.7-SNAPSHOT development new a54fd64 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new a43de67 fixes ending space line new 48f9e70 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions new 8e5e31c [jgitflow-maven-plugin]merging 'release/1.6' into 'master' new 41ad7b5 [jgitflow-maven-plugin]merging 'master' into 'develop' new 08e9a2c [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 08e9a2c33489db80022170b8368e42461547d383 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:27 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 41ad7b5bddc63b550ed99e12edb0b9b47d78b1e8 Merge: a54fd64 8e5e31c Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:27 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit a54fd64dc42016842b4904565ba925806f1c5480 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:26 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8e5e31c7c5045a4fe27050611ac0396eab1ae811 Merge: 6af647d 48f9e70 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:24 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' commit 48f9e7003488d60ccb49450a4efa367946a3c0a1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:42:14 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions commit a43de67f392f3c2ea411b5aae68100a3d07b1e95 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:41:23 2015 +0200 fixes ending space line Summary of changes: bow-ui/src/main/webapp/js/bowadd.js | 4 ++-- bow-ui/src/main/webapp/js/bowpwd.js | 4 ++-- bow-ui/src/main/webapp/js/sha256.js | 20 ++++++++++++++++++++ bow-ui/src/main/xmi/bow-model.properties | 20 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit a43de67f392f3c2ea411b5aae68100a3d07b1e95 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:41:23 2015 +0200 fixes ending space line --- bow-ui/src/main/webapp/js/bowadd.js | 4 ++-- bow-ui/src/main/webapp/js/bowpwd.js | 4 ++-- bow-ui/src/main/webapp/js/sha256.js | 20 ++++++++++++++++++++ bow-ui/src/main/xmi/bow-model.properties | 20 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/bow-ui/src/main/webapp/js/bowadd.js b/bow-ui/src/main/webapp/js/bowadd.js index 12d72c8..8f6ffc7 100644 --- a/bow-ui/src/main/webapp/js/bowadd.js +++ b/bow-ui/src/main/webapp/js/bowadd.js @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% diff --git a/bow-ui/src/main/webapp/js/bowpwd.js b/bow-ui/src/main/webapp/js/bowpwd.js index ef3ef58..1bee00b 100644 --- a/bow-ui/src/main/webapp/js/bowpwd.js +++ b/bow-ui/src/main/webapp/js/bowpwd.js @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% diff --git a/bow-ui/src/main/webapp/js/sha256.js b/bow-ui/src/main/webapp/js/sha256.js index 0870f95..cb5d217 100644 --- a/bow-ui/src/main/webapp/js/sha256.js +++ b/bow-ui/src/main/webapp/js/sha256.js @@ -1,4 +1,24 @@ /* + * #%L + * BOW UI + * %% + * Copyright (C) 2010 - 2015 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* * A JavaScript implementation of the Secure Hash Algorithm, SHA-256, as defined * in FIPS 180-2 * Version 2.2 Copyright Angel Marin, Paul Johnston 2000 - 2009. diff --git a/bow-ui/src/main/xmi/bow-model.properties b/bow-ui/src/main/xmi/bow-model.properties index e69de29..65afad7 100644 --- a/bow-ui/src/main/xmi/bow-model.properties +++ b/bow-ui/src/main/xmi/bow-model.properties @@ -0,0 +1,20 @@ +### +# #%L +# BOW UI +# %% +# Copyright (C) 2010 - 2015 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 48f9e7003488d60ccb49450a4efa367946a3c0a1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:42:14 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 7ed8a7d..2eb3af9 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 724e8c2..fc919f4 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 7a94095..8259640 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 8e5e31c7c5045a4fe27050611ac0396eab1ae811 Merge: 6af647d 48f9e70 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:24 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 77 ++++- .../main/java/org/chorem/bow/BookmarkUtils.java | 21 +- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 1 + bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 5 +- .../main/java/org/chorem/bow/BowSearchResult.java | 27 +- .../src/main/java/org/chorem/bow/BowSession.java | 75 +++++ bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 118 +++++++ .../java/org/chorem/bow/action/AliasAction.java | 32 +- .../java/org/chorem/bow/action/AtomAction.java | 17 +- .../java/org/chorem/bow/action/BowBaseAction.java | 6 + .../bow/action/bookmark/AddOrUpdateAction.java | 61 +++- .../action/bookmark/AuthenticationEditAction.java | 123 +++++++ .../action/bookmark/DeleteSearchResultsAction.java | 29 +- .../org/chorem/bow/action/bookmark/EditAction.java | 11 + .../org/chorem/bow/action/bookmark/HomeAction.java | 17 +- .../chorem/bow/action/bookmark/RemoveAction.java | 20 +- .../chorem/bow/action/group/GroupEditAction.java | 38 ++- .../chorem/bow/action/group/GroupViewAction.java | 5 +- .../bow/action/login/ForgotPasswordAction.java | 4 +- .../org/chorem/bow/action/login/LoginAction.java | 2 + .../chorem/bow/action/login/RegisterAction.java | 4 +- .../bow/action/preference/AdminTagAction.java | 34 +- .../action/preference/PreferenceBaseAction.java | 24 +- .../preference/UpdateAuthenticationAction.java | 66 ++++ .../action/sharedUser/SharedUserEditAction.java | 146 +++++++++ .../SharedUserViewAction.java} | 29 +- bow-ui/src/main/resources/bow.properties | 6 +- bow-ui/src/main/resources/bowpwd.sh | 58 ++++ .../main/resources/i18n/bow-ui_en_GB.properties | 35 +- .../main/resources/i18n/bow-ui_fr_FR.properties | 45 ++- bow-ui/src/main/resources/struts.xml | 45 +++ bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 24 ++ bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 7 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 54 +-- .../main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 79 +++++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp | 3 - .../src/main/webapp/WEB-INF/jsp/forgotPassword.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 38 ++- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 51 +-- bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 53 ++- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 1 - .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 58 ++++ .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 81 +++++ bow-ui/src/main/webapp/css/bookmark.css | 24 +- bow-ui/src/main/webapp/css/global.css | 12 + bow-ui/src/main/webapp/img/cadena.png | Bin 0 -> 647 bytes bow-ui/src/main/webapp/img/scriptlet.png | Bin 0 -> 998 bytes bow-ui/src/main/webapp/img/terminal.png | Bin 0 -> 946 bytes bow-ui/src/main/webapp/js/README | 36 ++ bow-ui/src/main/webapp/js/bowadd.js | 36 ++ bow-ui/src/main/webapp/js/bowpwd.js | 67 ++++ bow-ui/src/main/webapp/js/sha256.js | 363 +++++++++++++++++++++ bow-ui/src/main/xmi/README | 30 +- bow-ui/src/main/xmi/bow-model.properties | 20 ++ bow-ui/src/main/xmi/bow-model.zargo | Bin 10532 -> 11741 bytes pom.xml | 13 +- 64 files changed, 2053 insertions(+), 202 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit a54fd64dc42016842b4904565ba925806f1c5480 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:26 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 7432b07..2eb3af9 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 9450166..fc919f4 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 53c5588..8259640 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.6</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 41ad7b5bddc63b550ed99e12edb0b9b47d78b1e8 Merge: a54fd64 8e5e31c Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:27 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' bow-ui/src/main/webapp/js/bowadd.js | 4 ++-- bow-ui/src/main/webapp/js/bowpwd.js | 4 ++-- bow-ui/src/main/webapp/js/sha256.js | 20 ++++++++++++++++++++ bow-ui/src/main/xmi/bow-model.properties | 20 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 08e9a2c33489db80022170b8368e42461547d383 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:27 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 2eb3af9..7432b07 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index fc919f4..9450166 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 8259640..53c5588 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm