Arent-Jan Banck pushed to branch feature/wpm at cms-community / hippo-addon-channel-manager
Commits: 70bb7119 by Ariel Weinberger at 2017-05-24T15:24:03+02:00 CHANNELMGR-1292 Added new icons - Added new SVG icons (maximise/unmaximize right side panel, components overlay toggle). - Made changes to the overlayToggle component, it is not possible to apply an icon by src (for example, path to an SVG file). - - - - - 3d505e3e by Ariel Weinberger at 2017-05-24T15:25:52+02:00 CHANNELMGR-1292 Fixed unit tests for overlayToggle - - - - - 12cf5b25 by Ariel Weinberger at 2017-06-01T10:51:49+02:00 CHANNELMGR-1282 overlayToggle component now uses native browser tooltips - Using the "title" attribute of HTML. - Updated copyrights - - - - - d04fb46c by Ariel Weinberger at 2017-06-01T10:55:35+02:00 Merge branch 'feature/CHANNELMGR-1282' - - - - - f479235d by Ariel Weinberger at 2017-06-01T11:38:51+02:00 CHANNELMGR-1309 Implemented shared space toolbar - Top and bottom toolbars are merged into one. - Scroll to the focused field and compensate for the sliding toolbar for better UX. - Apply focus styling to match the rest of the rightSidePanel fields. - Cleaned the style of rightSidePanel CKEditor and using material color scheme. - Disabled resize handler. - Added autogrow plugin. - - - - - 0e0e825c by Ariel Weinberger at 2017-06-01T12:59:33+02:00 CHANNELMGR-1309 Added sharedspace toolbar imports - - - - - 0c39912d by Ariel Weinberger at 2017-06-01T16:17:55+02:00 CHANNELMGR-1309 Added conditional for showing the bottom toolbar - - - - - 737307ef by Ariel Weinberger at 2017-06-01T16:27:43+02:00 CHANNELMGR-1309 Fixed z-index and transition for shared toolbar - - - - - 7c7a7567 by Ariel Weinberger at 2017-06-01T17:03:30+02:00 CHANNELMGR-1309 Add comments in sharedspace-toolbar HTML and repalce null with angular.noop in sharedspace service - - - - - 74c31a55 by Ariel Weinberger at 2017-06-02T10:31:42+02:00 CHANNELMGR-1309 Fixed a test for CKEditor - - - - - ae6a6903 by Ariel Weinberger at 2017-06-02T12:47:08+02:00 CHANNELMGR-1309 Removed unused ckeditor Sass file - - - - - f3fafe69 by Ariel Weinberger at 2017-06-02T13:25:52+02:00 CHANNELMGR-1309 Removed unused ckeditor Sass file - - - - - 5bc1d38b by Ariel Weinberger at 2017-06-02T13:26:03+02:00 CHANNELMGR-1309 Added unit tests for sharedspace-toolbar service - - - - - 7bd99751 by Ariel Weinberger at 2017-06-02T13:26:03+02:00 CHANNELMGR-1309 Added unit tests for sharedspace toolbar component controller - - - - - 4fcf20ba by Ariel Weinberger at 2017-06-02T13:38:36+02:00 CHANNELMGR-1309 Changed CKEditor source dialog font to monospace - - - - - 64bd6ba0 by Ariel Weinberger at 2017-06-02T14:01:30+02:00 Merge branch 'feature/CHANNELMGR-1309' - - - - - 350a2989 by Ariel Weinberger at 2017-06-02T14:09:53+02:00 CHANNELMGR-1322 Changed resize handle icon to angular material more_vert and expanded handle height - - - - - fcdaa38c by Ariel Weinberger at 2017-06-02T14:10:19+02:00 Merge branch 'feature/CHANNELMGR-1322' - - - - - 62e350f8 by Ariel Weinberger at 2017-06-02T16:14:13+02:00 CHANNELMGR-1315 Fixed resize handle resizing limitation - The limit of the resize handle is now determined by the actual width of the right side panel, rather than the mouse travel distance. - - - - - 558d1c68 by Ariel Weinberger at 2017-06-02T16:22:44+02:00 CHANNELMGR-1315 Fixed an issue where the rightSidePanel would get stuck - - - - - 87869e0b by Ariel Weinberger at 2017-06-02T16:50:00+02:00 CHANNELMGR-1300 Fix right side panel appearing when changing channels - - - - - 62678323 by Arthur Bogaart at 2017-06-06T10:19:46+02:00 CHANNELMGR-1308 Fix for moved constant - - - - - 3145941f by Ariel Weinberger at 2017-06-06T11:47:47+02:00 CHANNELMGR-1309 Fix CKEditor source dialog button margin, remove unused icons from toolbar - - - - - 218492e7 by Ariel Weinberger at 2017-06-06T16:43:31+02:00 CHANNELMGR-1292 Replaced icons with the new, fixed icons - - - - - a92c72ec by Ariel Weinberger at 2017-06-06T16:59:15+02:00 Merge branch 'feature/CHANNELMGR-1292' - - - - - 18ae6d76 by Ariel Weinberger at 2017-06-07T12:30:01+02:00 CHANNELMGR-1310 Hide channel toolbar when right side panel is in full width Channel toolbar will be hidden as long as right side panel is in full width mode. Closing the side panel or switching to another channel will show the toolbar again. - - - - - 5336ec82 by Ariel Weinberger at 2017-06-07T12:30:55+02:00 CHANNELMGR-1309 Fixed Sasslint warnings - - - - - f1296c0a by Ariel Weinberger at 2017-06-07T16:34:00+02:00 CHANNELMGR-1310 Add unit tests for channel toolbar display toggle and moved logic Add unit tests to ChannelService and ChannelController. Moved setToolbarDisplayed logic from ChannelController to ChannelService.clearChannel(). - - - - - e5cccb13 by Ariel Weinberger at 2017-06-07T16:36:46+02:00 CHANNELMGR-1310 Change fdescribe to describe in unit tests block - - - - - 4f1f68af by Ariel Weinberger at 2017-06-07T16:38:07+02:00 Merge branch 'feature/CHANNELMGR-1310' - - - - - 9082aea9 by Ariel Weinberger at 2017-06-07T16:54:04+02:00 CHANNELMGR-1310 Added an if statement to clearChannel toolbar reset for convenience - - - - - 79f2bdc3 by Ariel Weinberger at 2017-06-07T18:25:59+02:00 CHANNELMGR-1310 Fixed eslint error - - - - - 759deba0 by Ariel Weinberger at 2017-06-08T00:36:21+02:00 CHANNELMGR-1310 Added set toolbar visibility state in channel service clear unit test - - - - - 53379ddc by Arthur Bogaart at 2017-06-08T13:00:09+02:00 CHANNELMGR-1308 Reintegrate bugfix/CHANNELMGR-1308 - - - - - 9b4cd33e by Arent-Jan Banck at 2017-06-08T14:19:25+02:00 CHANNELMGR-1320 merge master into feature/wpm - - - - - 30 changed files: - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java - frontend-ng/src/angularjs/channel/channel.controller.js - frontend-ng/src/angularjs/channel/channel.controller.spec.js - frontend-ng/src/angularjs/channel/channel.html - frontend-ng/src/angularjs/channel/channel.service.js - frontend-ng/src/angularjs/channel/channel.service.spec.js - frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.component.js - frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.controller.spec.js - frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.html - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.component.spec.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.module.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.component.js - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.html - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.module.js - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.scss - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.service.js - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.service.spec.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/fields.module.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/resizeHandle/resizeHandle.controller.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/resizeHandle/resizeHandle.controller.spec.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/resizeHandle/resizeHandle.scss - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.scss - + frontend-ng/src/images/maximize-sidepanel.svg - frontend-ng/src/images/resize-handle.svg The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/faa46f4611f5305bdad09bb2760602c49adcec58...9b4cd33e9fd07363ae64bbd559f612ced3e38d6b
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
