Jasper Floor pushed to branch feature/ESSENTIALS-1063 at cms-community / hippo-essentials
Commits: f39e7a1f by Joeri de Gooijer at 2017-04-13T13:12:56+02:00 ESSENTIALS-1064 Update dependencies - - - - - bab7af37 by Joeri de Gooijer at 2017-04-13T13:14:35+02:00 ESSENTIALS-1064 Add grunt watch task - - - - - e5ece750 by Joeri de Gooijer at 2017-04-13T16:08:43+02:00 ESSENTIALS-1064 Remove unused service that caused error - - - - - a87fe9c1 by Joeri de Gooijer at 2017-04-13T16:11:45+02:00 ESSENTIALS-1064 Add license summary and shrinkwrap - - - - - 093602aa by Bert Leunis at 2017-04-14T13:38:34+02:00 ESSENTIALS-1062 include feature footer for installed tools also, to show the documentation link - - - - - bbaa7f3f by Ate Douma at 2017-04-23T03:41:29+02:00 ESSENTIALS-1066 upgrade to latest log4j2 This is part of CMS-10707 - - - - - 0ead6e16 by Ate Douma at 2017-04-23T03:43:38+02:00 ESSENTIALS-1066 upgrade to latest log4j2 Updating the log4j2.xml file(s) after committed rename (to keep history) - - - - - e40ce65d by Joeri de Gooijer at 2017-04-25T16:40:03+02:00 ESSENTIALS-1067 Fix tabs in selections plugin - - - - - 0370f7ff by Bert Leunis at 2017-05-05T15:56:04+02:00 ESSENTIALS-1065 set default container type to hst.vbox - - - - - 0db3cee8 by Bert Leunis at 2017-05-08T11:19:17+02:00 ESSENTIALS-1068 added prototype page definition - - - - - 32a97ac0 by Marijan Milicevic at 2017-05-09T14:29:06+02:00 ESSENTIALS-1068 Reintegrate feature/ESSENTIALS-1068 - - - - - aaf168f8 by Marijan Milicevic at 2017-05-09T14:58:03+02:00 ESSENTIALS-1065 Reintegrate feature/ESSENTIALS-1065 - - - - - 0fb8a569 by Marijan Milicevic at 2017-05-09T15:06:57+02:00 ESSENTIALS-1062 Reintegrate feature/ESSENTIALS-1062 - - - - - 190ec87d by jasper.floor at 2017-05-09T16:57:40+02:00 ESSENTIALS-1063 Merge master changes in feature/ESSENTIALS-1063 - - - - - 30 changed files: - dashboard/Gruntfile.js - dashboard/license-summary.json - dashboard/npm-shrinkwrap.json - dashboard/package.json - dashboard/src/main/webapp/WEB-INF/jsp/index.jsp - dashboard/src/main/webapp/directives/essentials-installed-tool.html - dashboard/src/main/webapp/directives/essentials-plugin.html - dashboard/src/main/webapp/js/app.js - − dashboard/src/test/resources/log4j.xml - + dashboard/src/test/resources/log4j2.xml - − plugin-sdk/api/src/test/resources/log4j.xml - + plugin-sdk/api/src/test/resources/log4j2.xml - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/NodeFolderInstructionTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/GlobalUtilsTest.java - − plugin-sdk/implementation/src/test/resources/log4j.xml - + plugin-sdk/implementation/src/test/resources/log4j2.xml - plugins/blog/src/main/resources/hst/workspace/bloglistdetail.xml - plugins/blog/src/main/resources/hst/workspace/bloglistsidebar.xml - plugins/blog/src/main/resources/hst/workspace/blogpagedetail.xml - plugins/blog/src/main/resources/hst/workspace/blogpagesidebar.xml - − plugins/blog/src/test/resources/log4j.xml - + plugins/blog/src/test/resources/log4j2.xml - − plugins/content-blocks/src/test/resources/log4j.xml - + plugins/content-blocks/src/test/resources/log4j2.xml - plugins/document-wizard/src/main/resources/META-INF/resources/feature/documentWizardPlugin/documentWizardPlugin.js - plugins/events/src/main/resources/xml/hst/workspace/eventslist.xml - plugins/events/src/main/resources/xml/hst/workspace/eventspage.xml - plugins/faq/src/main/resources/instructions/hst/faqlist-workspace.xml - plugins/news/src/main/resources/xml/hst/workspace/newslist.xml - plugins/news/src/main/resources/xml/hst/workspace/newspage.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/8fd6847891b257f8f2cb2284ab28d343cebe5886...190ec87d2c95a4c3793b036f26cf868d452426f7
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
