Bow-commits

Download

bow-commits@list.chorem.org

August 2016

1 participants
1 discussions

branch refonteUI updated (7aa7e1e -> 1857e1d)
by chorem.org scm 25 Aug '16

25 Aug '16

This is an automated email from the git hooks/post-receive script. New change to branch refonteUI in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 7aa7e1e Refs #1205: Create refonteUI branche & init UI refactoring adds 81e8f58 [Documentation] - Corrections : url marque page pour chromium et mise en page recherche adds 493e890 Merge branch 'develop' of https://git.chorem.org/bow into develop adds 2d1937b [Bow] Doc : get started (setup) adds c4a1b41 [Bow] Doc : get started (setup) adds ddc2c6d struts 2.3.16 as by default struts.mapper.action.prefix.enabled = false force true with <constant name="struts.mapper.action.prefix.enabled" value="true"/> this is necessary for multiple submit button with different action (ex: addPrefix) adds 80296f5 use chorempom 2.3 change bow version to 1.4.1-SNAPSHOT adds 0a76712 change sub module version to 1.4.1-SNAPSHOT adds b19adc7 [jgitflow-maven-plugin]updating poms for 1.5-SNAPSHOT development adds 6e86824 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 218d6fb Fix space in license header adds e2138cc [jgitflow-maven-plugin]updating poms for branch'release/1.4.1' with non-snapshot versions adds c546bbe [jgitflow-maven-plugin]merging 'release/1.4.1' into 'master' adds 5462a81 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 10fdada [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 63a6644 fixes #1261: Can use prefix that start with another existing prefix adds a074606 fixes #1203: Pouvoir masquer les resultats filtres ayant un certain tag adds cfd39ae upgrade library adds 2ed8277 fixes #1262: add support to track bookmark add throw atom feed adds e7b3213 fixes #1262: add support to track bookmark add throw atom feed - fixes bug in atom format adds 92b801d add support to filter on specific BowBookmark wikittyId (listId) useful to show bookmark after editing or for atom link adds 28e6673 improve redirect after add (reditect to editing if no information) use new funtionnality (filter on id) to present bookmark after editing adds 5935a25 url to web site for one entry use new filter on id to display only one bookmark adds 7fc8eaf better form presentation for bookmark edition adds d5a2dc7 fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups adds b0b91ff fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups can't use group if not members (when try to add tag) adds f33801d if no group tag, don't try to search group adds 1731b2a add Group description adds eac7769 update translation adds ffd8da4 update translation adds 05c45bd add support for speudo bookmarks title (first work of descriotion) adds 4b78382 add login of currently logged user in logout block adds 6303a70 add configuration to allow or not public group adds 9be947e add comment about proxy.logout() adds 0a47cc8 add key for new config option (allow public group) adds bf124e7 - add wikitty AppAdminGroup when admin login - WikittyClient has now correct Wikitty SecurityToken and with AppAdminGroup can check if user can read/write bookmark adds de67fa9 hack to support public alias with new security constraints adds f7c36c1 use wikitty 3.12 adds fca205f [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development adds b995b68 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4cbfb21 fixes dependancy and license problem adds 8df08ba [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions adds 6bcdda0 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' adds e849d6e [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4c4988f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 76ef205 fixes bug in group creation adds 91f505b prefix config option with bow. adds f8951de fixes bug in url parameter evaluation expression adds aee8dd6 use wikitty 3.13-SNAPSHOT to fixe bug in containsOne and containsAll adds 8a5936e change wikitty version to 3.12.1 adds b2ce337 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0c613db [jgitflow-maven-plugin]updating poms for 1.5.1 branch with snapshot versions adds a20cbb6 [jgitflow-maven-plugin]updating poms for branch'release/1.5.1' with non-snapshot versions adds 6af647d [jgitflow-maven-plugin]merging 'release/1.5.1' into 'master' adds dabf83e [jgitflow-maven-plugin]merging 'master' into 'develop' adds 6ab099f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fa9c5c4 add tag and filter in title to make difference between all atom flux adds 061ef35 change dev bow url to work with mvn tomcat7:run adds 5d624c3 rewrite to prevent XSS rewrite to have correct URL adds a064cf7 add author email if login is an email adds b8a901b fix charset escape JavaScript only not HTML to prevent bug with python feedparser :( (rss2email) (escape transforme accent to entity (é) and when parser recreate accent caractere this caractere is byte and not string :( adds 684dfaa add support to share with user without bow login adds 07d2743 add markdown processor to process bookmark description (in safeMode) adds 3ef8aca fixes #1274: add support for more complexe query for fulltext bookmark search adds ab9fc2a add some FIXME and debug adds b36a9f5 add link to shared user to go home page adds c43a0f5 fixes #1270: the user must configure the atom stream to not receive its own links adds 540789a fixes #233: Add support for login/password (change header jsp generation) (add minification css/js) adds e73fa41 add shell script to compute password as same way that bookmarklet adds 980ad7d - new BowAdd bookmarklet - add shell script to generate password as bookmarklet adds ffd0656 fixes #963: Rendre la recherche par tag insensible à la casse adds 6b55547 this commit fixes bug when we use alias to go to site, it don't increment count adds dc7a27c add support for BowAuthentication on all Bookmark - add description in BowAuthentication - inverse link now: BowUser <- BowAuthentication -> BowBookmark via field target:Wikitty - register new extension in Proxy adds 8f9251c add icon before script(let) link default password length to 15 adds 96069df add all missing translation for UI adds e8c3260 use last wikitty version to use wikitty service authorisation with null if no access adds 5f3fc79 add support for more than one BowAuthentication for one Bookmark (need when bookmark is shared) adds 9beee43 add small documentation in UI adds c5b884e remove problematic field with struts and multiple setter adds 5b06dcb use entity to < char adds f50a2ce remove log.info use to debug adds ffebec5 bug fixes: '' -> ', {0} -> %s (old i18n syntax to new) adds 5a93fe2 use " to encapsulate tag string in fullTextLine (prevent interpretation of #) adds e6c7ee8 - add getBowUser on BowBaseAction - remove problematics field in form (owner) not very useful (and bug with struts adds 10ca968 rename group or shareUser tag, if user is no more in group or share user is deleted adds e4b7b7f use last wikitty version adds 2d2e367 not use Collections4 adds 60eca73 fixes bug (NPE) when we try to delete adds 22ac61c add empty string as default value in BowAuthentication field (fixes bug when generate scriptlet and script) adds df04183 [jgitflow-maven-plugin]updating poms for 1.7-SNAPSHOT development adds a54fd64 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a43de67 fixes ending space line adds 48f9e70 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions adds 8e5e31c [jgitflow-maven-plugin]merging 'release/1.6' into 'master' adds 41ad7b5 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 08e9a2c [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9c924a9 Merge branch 'develop' of https://git.chorem.org/bow into develop adds 28ef233 Migration sous gitlab adds 09ec2b9 Update parent pom new 5c9bac0 Merge develop into refonteUi new 1857e1d RefonteUI - modif de la mise en page et affichage des bookmarks The 2 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 1857e1d9c1f4b0316d1c176f97af3af72c85bcda Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Thu Aug 25 11:28:52 2016 +0200 RefonteUI - modif de la mise en page et affichage des bookmarks commit 5c9bac07e3323707afcef9a4eaeab5b6f0cf0758 Merge: 7aa7e1e 09ec2b9 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Aug 23 15:37:41 2016 +0200 Merge develop into refonteUi Summary of changes: bow-ui/README.txt => README.md | 0 bow-extension-chromium/{README.txt => README.md} | 0 bow-extension-chromium/changelog.txt | 0 bow-extension-chromium/pom.xml | 2 +- README.txt => bow-ui/README.md | 0 bow-ui/changelog.txt | 0 bow-ui/pom.xml | 102 +- bow-ui/src/license/THIRD-PARTY.properties | 6 +- .../main/java/org/chorem/bow/BookmarkUtils.java | 82 +- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 27 +- .../main/java/org/chorem/bow/BowConfigOption.java | 59 +- bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 6 +- .../main/java/org/chorem/bow/BowSearchResult.java | 27 +- .../src/main/java/org/chorem/bow/BowSession.java | 128 +- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 179 +- .../java/org/chorem/bow/action/AliasAction.java | 64 +- .../java/org/chorem/bow/action/AtomAction.java | 125 ++ .../java/org/chorem/bow/action/BowBaseAction.java | 27 + .../bow/action/admin/ReIndexationAction.java | 2 +- .../bow/action/bookmark/AddOrUpdateAction.java | 241 +-- .../action/bookmark/AuthenticationEditAction.java | 123 ++ .../action/bookmark/DeleteSearchResultsAction.java | 35 +- .../org/chorem/bow/action/bookmark/EditAction.java | 13 +- .../org/chorem/bow/action/bookmark/HomeAction.java | 20 +- .../chorem/bow/action/bookmark/RemoveAction.java | 24 +- .../bow/action/bookmark/ScreenshotAction.java | 6 +- .../chorem/bow/action/group/GroupEditAction.java | 245 +++ .../chorem/bow/action/group/GroupViewAction.java | 85 + .../bow/action/login/ForgotPasswordAction.java | 18 +- .../org/chorem/bow/action/login/LoginAction.java | 10 +- .../chorem/bow/action/login/RegisterAction.java | 22 +- .../action/opensearch/OpenSearchBaseAction.java | 7 +- .../action/opensearch/OpenSearchResultAction.java | 2 +- .../opensearch/OpenSearchSuggestionAction.java | 2 +- .../bow/action/opensearch/SuggestionAction.java | 2 +- .../bow/action/preference/AdminTagAction.java | 36 +- .../bow/action/preference/DeleteImportAction.java | 4 +- .../bow/action/preference/GenerateTokenAction.java | 4 +- .../action/preference/ImportBookmarksAction.java | 10 +- .../action/preference/PreferenceBaseAction.java | 26 +- ...Action.java => UpdateAuthenticationAction.java} | 32 +- .../bow/action/preference/UpdateSiteAction.java | 6 +- .../bow/action/preference/UpdateUserAction.java | 12 +- .../action/sharedUser/SharedUserEditAction.java | 146 ++ .../action/sharedUser/SharedUserViewAction.java | 85 + bow-ui/src/main/resources/bow.properties | 6 +- bow-ui/src/main/resources/bowpwd.sh | 58 + .../main/resources/i18n/bow-ui_en_GB.properties | 79 +- .../main/resources/i18n/bow-ui_fr_FR.properties | 195 +- bow-ui/src/main/resources/struts.xml | 81 +- bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 30 + bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 12 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 133 ++ .../main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 79 + .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 13 +- 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 | 115 + bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 77 + bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 111 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 67 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 46 +- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 44 +- .../src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp | 3 +- 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 | 217 +- bow-ui/src/main/webapp/css/global.css | 204 +- bow-ui/src/main/webapp/css/ionicons.min.css | 11 + .../src/main/webapp/css/{global.css => layout.css} | 100 +- .../src/main/webapp/css/main.css | 26 +- .../LocaleAction.java => webapp/css/utilities.css} | 45 +- bow-ui/src/main/webapp/fonts/ionicons.eot | Bin 0 -> 120724 bytes bow-ui/src/main/webapp/fonts/ionicons.svg | 2230 ++++++++++++++++++++ bow-ui/src/main/webapp/fonts/ionicons.ttf | Bin 0 -> 188508 bytes bow-ui/src/main/webapp/fonts/ionicons.woff | Bin 0 -> 67904 bytes bow-ui/src/main/webapp/img/cadena.png | Bin 0 -> 647 bytes bow-ui/src/main/webapp/img/logobow-125x125.png | Bin 0 -> 2177 bytes .../webapp/img/{logobow.png => logobow-50x25.png} | Bin 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-model.properties} | 3 +- bow-ui/src/main/xmi/bow-model.zargo | Bin 9807 -> 11741 bytes changelog.txt | 0 pom.xml | 72 +- .../img => src/site/resources/images}/camera.png | Bin .../img => src/site/resources/images}/croix.jpg | Bin .../img => src/site/resources/images}/edit.jpg | Bin src/site/rst/user/getStarted.rst | 178 ++ src/site/rst/user/openSearch.rst | 2 +- src/site/rst/user/search.rst | 2 + src/site/site.xml | 1 + 102 files changed, 6112 insertions(+), 915 deletions(-) rename bow-ui/README.txt => README.md (100%) rename bow-extension-chromium/{README.txt => README.md} (100%) delete mode 100644 bow-extension-chromium/changelog.txt rename README.txt => bow-ui/README.md (100%) delete mode 100644 bow-ui/changelog.txt create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/bookmark/AuthenticationEditAction.java create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/group/GroupViewAction.java copy bow-ui/src/main/java/org/chorem/bow/action/preference/{GenerateTokenAction.java => UpdateAuthenticationAction.java} (66%) create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserViewAction.java create mode 100755 bow-ui/src/main/resources/bowpwd.sh create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp create mode 100644 bow-ui/src/main/webapp/css/ionicons.min.css copy bow-ui/src/main/webapp/css/{global.css => layout.css} (70%) copy bow-extension-chromium/src/main/webapp/properties.js => bow-ui/src/main/webapp/css/main.css (71%) copy bow-ui/src/main/{java/org/chorem/bow/action/LocaleAction.java => webapp/css/utilities.css} (63%) create mode 100644 bow-ui/src/main/webapp/fonts/ionicons.eot create mode 100644 bow-ui/src/main/webapp/fonts/ionicons.svg create mode 100644 bow-ui/src/main/webapp/fonts/ionicons.ttf create mode 100644 bow-ui/src/main/webapp/fonts/ionicons.woff create mode 100644 bow-ui/src/main/webapp/img/cadena.png create mode 100644 bow-ui/src/main/webapp/img/logobow-125x125.png rename bow-ui/src/main/webapp/img/{logobow.png => logobow-50x25.png} (100%) create mode 100644 bow-ui/src/main/webapp/img/scriptlet.png create mode 100644 bow-ui/src/main/webapp/img/terminal.png create mode 100644 bow-ui/src/main/webapp/js/README create mode 100644 bow-ui/src/main/webapp/js/bowadd.js create mode 100644 bow-ui/src/main/webapp/js/bowpwd.js create mode 100644 bow-ui/src/main/webapp/js/sha256.js copy bow-ui/src/main/{resources/freemarker.properties => xmi/bow-model.properties} (91%) delete mode 100644 changelog.txt copy {bow-ui/src/main/webapp/img => src/site/resources/images}/camera.png (100%) copy {bow-ui/src/main/webapp/img => src/site/resources/images}/croix.jpg (100%) copy {bow-ui/src/main/webapp/img => src/site/resources/images}/edit.jpg (100%) create mode 100644 src/site/rst/user/getStarted.rst -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2