Jeroen Hoffman pushed to branch feature/CMS-10553 at cms-community / hippo-cms
Commits: 726a30f8 by Bert Leunis at 2017-05-15T10:57:39+02:00 CMS-10143 make the area with new field options a bit less high - - - - - 070b232f by Bert Leunis at 2017-05-15T13:04:14+02:00 CMS-10411 reorder system info; removed GC button - - - - - 2db0e6aa by Bert Leunis at 2017-05-15T15:46:54+02:00 CMS-10420 use label instead of span - - - - - bad7d669 by Bert Leunis at 2017-05-15T16:02:06+02:00 CMS-10420 three more occurences of a checkbox with a clickable label - - - - - 5142f3e3 by Bert Leunis at 2017-05-16T10:17:15+02:00 CMS-10646 do not use namespace in field name nor caption - - - - - 7ab0e7f0 by Bert Leunis at 2017-05-18T11:29:16+02:00 Merge branch 'master' into feature/CMS-10646 - - - - - 92fb082e by Bert Leunis at 2017-05-18T11:31:45+02:00 CMS-10646 strip path property for non-primitives - - - - - 098fb02f by Arthur Bogaart at 2017-05-18T22:58:33+02:00 CMS-10656 Code cleanup - - - - - a9593ddb by Jeroen Hoffman at 2017-05-19T11:50:16+02:00 CMS-10420 Merge branch 'master' into feature/CMS-10420 - - - - - 623749cb by Jeroen Hoffman at 2017-05-19T11:51:43+02:00 CMS-10420 Reintegrate branch 'feature/CMS-10420' - - - - - 12a17802 by Jeroen Hoffman at 2017-05-19T12:14:48+02:00 CMS-10143 Merge branch 'master' into feature/CMS-10143 - - - - - dc5a1188 by Jeroen Hoffman at 2017-05-19T12:17:29+02:00 CMS-10143 Reintegrate branch 'feature/CMS-10143' - - - - - b5aebac9 by Jeroen Hoffman at 2017-05-19T13:36:06+02:00 CMS-10411 add 'View' before the system info hint, to be more in line with the other hints - - - - - afe3da4f by Jeroen Hoffman at 2017-05-19T14:00:49+02:00 CMS-10411 remove serialVersionUID - - - - - 3bda18d3 by Jeroen Hoffman at 2017-05-19T14:05:55+02:00 CMS-10411 uncapitalize "Version" twice, to be in line with the other 4 occurences - - - - - fd106b39 by Jeroen Hoffman at 2017-05-19T14:24:56+02:00 CMS-10411 Merge branch 'master' into feature/CMS-10411 - - - - - 53db1397 by Jeroen Hoffman at 2017-05-19T14:26:38+02:00 CMS-10411 Reintegrate branch 'feature/CMS-10411' - - - - - b9d5c66f by Joeri de Gooijer at 2017-05-19T14:36:39+02:00 CMS-10750 Add all files for blueimp fileupload - - - - - a7ebbea4 by Arthur Bogaart at 2017-05-19T15:21:43+02:00 CMS-10656 Replace BrowsableModel with preview-links-service Instead of editing the HTML of the preview&diff view on the server (regular expressions..) to insert click handlers for internal links, use a client-side script that registers onlick handlers (using jQuery) and triggers a callback using the data-uuid attribute value. - - - - - a53268fa by Arthur Bogaart at 2017-05-19T15:23:18+02:00 CMS-10656 Update the styling of diff-changed blocks Changed blocks get a light blue background color and no more underline gif - - - - - 6db5af7d by Jeroen Hoffman at 2017-05-19T15:45:01+02:00 CMS-10646 Merge branch 'master' into feature/CMS-10646 - - - - - dad0d334 by Jeroen Hoffman at 2017-05-22T09:28:05+02:00 CMS-10646 use StringUtils.substringAfter the both occasions with the same logic - - - - - 6b1c9be7 by Jeroen Hoffman at 2017-05-22T09:29:55+02:00 CMS-10646 remove serialVersionUIDs, no longer needed - - - - - 8252b41c by Jeroen Hoffman at 2017-05-22T09:38:07+02:00 CMS-10646 Reintegrate branch 'feature/CMS-10646' - - - - - ddae21f5 by Mathijs den Burger at 2017-05-22T10:44:32+02:00 CMS-10656 Add jslint plugin to richtext/frontend module - - - - - fe8683b1 by Mathijs den Burger at 2017-05-22T10:46:39+02:00 CMS-10656 Also log exception when node cannot be found, code cleanup - - - - - 33300d22 by Mathijs den Burger at 2017-05-22T11:01:37+02:00 CMS-10656 Remove unused diff images and CSS classes None of the removed images and CSS classes are used anywhere in the CMS. - - - - - fd32471f by Mathijs den Burger at 2017-05-22T12:19:38+02:00 CMS-10656 Move diff CSS to SCSS The AbstractRichTextDiffPanel only included the diff.css, so it can be removed. Its sub-classes can now directly extend its super class AbstractRichTextViewPanel. - - - - - acef9ea6 by Mathijs den Burger at 2017-05-22T12:44:11+02:00 CMS-10656 Use the same diff colors everywhere Also moved the existing rules for compare/diff to _editor_diff. The rules for '.hippo-dif-added' and '.hippo-dif-removed' were dead code because of the typo ('dif' vs 'diff') and have been removed. - - - - - 03ec4cee by Mathijs den Burger at 2017-05-22T12:47:52+02:00 CMS-10656 Reintegrate bugfix/CMS-10656 - - - - - 53e6c331 by Jeroen Hoffman at 2017-05-23T10:03:24+02:00 CMS-10553 Merge branch 'master' into feature/CMS-10553 - - - - - f5c44096 by Jeroen Hoffman at 2017-05-23T10:13:01+02:00 CMS-10553 non-functional: remove serialVersionUIDs, update copyright years - - - - - 30 changed files: - api/Gruntfile.js - api/src/main/java/org/hippoecm/frontend/model/SystemInfoDataProvider.java - api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNameComparator.java - api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java - api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNodeComparator.java - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/diff.css - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/images/diff-first.gif - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/images/diff-last.gif - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/images/diff-next.gif - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/images/diff-previous.gif - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/images/diffmin.gif - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/images/diffplus.gif - − api/src/main/java/org/hippoecm/frontend/plugins/standards/diff/images/diffunderline.gif - api/src/main/java/org/hippoecm/frontend/plugins/standards/tree/FolderTreeNode.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/tree/JcrFolderTreeNameComparator.java - api/src/main/styling/styles/_editor.scss - + api/src/main/styling/styles/_editor_diff.scss - api/src/main/styling/styles/_editor_doctype.scss - api/src/main/styling/styles/_variables-colorscheme.scss - api/src/main/styling/styles/main.scss - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/ContentExportDialog.html - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/delete/DeleteDialog.html - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/recompute/RecomputeDialog.html - editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateBuilder.java - editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/system/SystemInfoPanel.html - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/system/SystemInfoPanel.java - perspectives/src/main/resources/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.properties - richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorNodePlugin.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/9b2710e6b92460dccf64933694073a5888a00cc3...f5c440965b71ae74e39d2ca230c1b18270a19ef1
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
