Joeri de Gooijer pushed to branch bugfix/CMS-10695 at cms-community / hippo-cms
Commits: 645d4b94 by Marijan Milicevic at 2017-03-21T15:21:11+01:00 CMS-9918 When using the search filter in the gallery (or image picker), I want to see thumbnails - move classes from gallery plugin into cms API - pass search scope to the SectionViewer plugin so we can detect when image search is done - - - - - 37091fb7 by Bert Leunis at 2017-04-11T15:51:38+02:00 CMS-10690 use repository utils to do reference checks - - - - - f27611e6 by Mathijs den Burger at 2017-04-19T11:08:05+02:00 CMS-10671 Use double-checked locking to init resource guard Using double-checked locking reduces the overhead to acquire the lock. Once the guard is initialized, concurrent requests now no longer have to wait for each other. - - - - - 12f90d74 by Jasper Floor at 2017-04-20T16:08:53+02:00 CMS-10690 Merge master changes in feature/CMS-10690 - - - - - 1343751f by Jasper Floor at 2017-04-20T16:09:13+02:00 CMS-10690 Merge master changes in feature/CMS-10690 - - - - - 6823cbe0 by Jasper Floor at 2017-04-20T16:27:21+02:00 CMS-10690 Reintegrate feature/CMS-10690 - - - - - 64418232 by Arthur Bogaart at 2017-04-21T16:22:16+02:00 CMS-9918 Merge master changes in feature/CMS-9918 - - - - - 4bbe1702 by Arthur Bogaart at 2017-04-21T23:47:10+02:00 CMS-9918 Cleanup code - formatting, add finals, remove serialVersionUID - - - - - 293700cf by Ate Douma at 2017-04-23T02:40:45+02:00 CMS-10707 upgrade to latest log4j2 - - - - - 4d7746fa by Ate Douma at 2017-04-23T02:45:49+02:00 CMS-10707 upgrade to latest log4j2 Updating the log4j2.xml files after committed rename (to keep history) - - - - - 367db240 by Arthur Bogaart at 2017-04-24T12:44:28+02:00 CMS-9918 Add ImageSearchViewPlugin - Made queryCluster name configurable for TextSearchBuilder - moved thumbnail related code from SearchViewPlugin to ImageSearchViewPlugin - added configuration for ImageSearchViewPlugin - fixed undetached models in SearchingSectionPlugin - - - - - fb376df5 by Arthur Bogaart at 2017-04-24T16:56:04+02:00 CMS-9918 Bump hippo:version for cms-search-views - - - - - be0fd421 by Arthur Bogaart at 2017-04-24T16:59:18+02:00 CMS-9918 Reintegrate feature/CMS-9918 - - - - - dfbf9df6 by Joeri de Gooijer at 2017-04-25T12:45:23+02:00 CMS-10695 Merge branch 'master' into bugfix/CMS-10695 - - - - - 30 changed files: - api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.properties - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/CalendarComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/CalendarComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/LongPropertyComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/LongPropertyComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/MimeTypeComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/MimeTypeComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/PropertyComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/PropertyComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/SizeComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/SizeComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/DatePropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/DatePropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ImageIconRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ImageIconRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/MimeTypeIconRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/MimeTypeIconRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/PropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/PropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/SizeRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/SizeRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/StringPropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/StringPropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ThumbnailRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ThumbnailRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-audio-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-audio-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-binary-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-binary-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-doc-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-doc-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-docx-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-docx-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-image-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-image-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-odp-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-odp-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-ods-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-ods-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-odt-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-odt-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-pdf-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-pdf-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-ppt-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-ppt-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-pptx-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-pptx-16.png The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/e5d05049092578e9dcf227d57fbab4176a60415f...dfbf9df6f2daf0ad3520943382d42c33c683c7c0
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn