Mathijs den Burger pushed to branch feature/visual-editing-psp2-CHANNELMGR-1032 at cms-community / hippo-addon-channel-manager
Commits: f216a707 by Arthur Bogaart at 2017-04-19T01:50:38+02:00 CHANNELMGR-1236 Wrap field elements in a collapse-element - - - - - cf8907a2 by Ard Schrijvers at 2017-04-19T09:00:26+02:00 CHANNELMGR-254 organize imports - - - - - aefe6cc0 by Joeri de Gooijer at 2017-04-19T16:51:58+02:00 CHANNELMGR-1222 Fix tooltips becoming wider than screen - - - - - 11aeed3d by Joeri de Gooijer at 2017-04-19T16:53:35+02:00 CHANNELMGR-1222 Move some styling to directive folder - - - - - 7f141554 by Joeri de Gooijer at 2017-04-19T16:54:23+02:00 CHANNELMGR-1222 Remove duplicate styling - - - - - ac0787de by Joeri de Gooijer at 2017-04-19T19:25:32+02:00 CHANNELMGR-1047 Refactor ckeditor component It now reacts like the other form elements to focus, blur and changes. - - - - - 5c534f29 by Joeri de Gooijer at 2017-04-21T11:33:47+02:00 CHANNELMGR-1222 Set max-width of 80% of viewport for tooltips - - - - - 5f8c136b by Ariel Weinberger at 2017-04-21T11:51:33+02:00 Merge branch 'feature/visual-editing-psp2-CHANNELMGR-1222' into feature/visual-editing-psp2 - - - - - 7d0527fe by Ate Douma at 2017-04-23T03:18:22+02:00 CHANNELMGR-1243 upgrade to latest log4j2 This is part of CMS-10707 - - - - - f4f170d9 by Ate Douma at 2017-04-23T03:19:16+02:00 CHANNELMGR-1243 upgrade to latest log4j2 Updating the log4j2.xml files after committed rename (to keep history) - - - - - 66d62ef2 by Mathijs den Burger at 2017-04-24T09:34:19+02:00 CHANNELMGR-1174 Merge master changes into feature/visual-editing-psp2 - - - - - e85db8a3 by Mathijs den Burger at 2017-04-24T11:26:21+02:00 CHANNELMGR-1244 Upgrade test to log4j2 - use the new Log4jInterceptor - add the PowerMockIgnore annotation to reduce stack trace noise - - - - - 1f08a157 by Mathijs den Burger at 2017-04-24T11:33:55+02:00 CHANNELMGR-1032 Merge feature/visual-editing-psp2 changes - - - - - 30 changed files: - content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/ContentTypeContextTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImplTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeContextTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/sort/NodeOrderFieldSorterTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/sort/TwoColumnFieldSorterTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/AbstractFieldTypeTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldTypeTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldUtilsTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/StringFieldTypeTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/util/LocalizationUtilsTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/util/NamespaceUtilsTest.java - − content-service/src/test/resources/log4j.xml - + content-service/src/test/resources/log4j2.xml - frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.directive.js - frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.html - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.scss → frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.scss - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/choiceField/choiceField.html - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.component.js - 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.html - + frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.component.js - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html - frontend-ng/src/styles/_channel.scss - frontend-ng/src/styles/_tooltips.scss 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/637eabfaeda693faf9212a85aaa01fedb7db9285...1f08a157e57f486201ed40abf561912f8cdfe226
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
