Jeroen Hoffman pushed to branch bugfix/CMS-10148 at cms-community / hippo-cms
Commits: af818717 by Arthur Bogaart at 2016-06-24T12:08:53+02:00 CMS-10224 Render custom document icons with primary color - Added the appropriate CSS classes to custom icons if they are resolved in the listing - Added a third css class to set the primary color so we don't have to abuse .hi-file-text or .hi-folder - Make sure extraCssClasses of a ResourceIcon are copied by the copy constructor - Changed extraCssClasses into a set since it's values should be unique (cherry picked from commit c4068fad2d422909fa58ae1d6138dde9cdc22a62) - - - - - 0bc63a81 by Marijan Milicevic at 2016-06-27T21:36:51+02:00 CMS-9943 TIFF files cannot be uploaded as assets - add mimetypes.allowed multistring property - - - - - 50bf24c4 by Marijan Milicevic at 2016-06-28T16:11:14+02:00 CMS-10233 Copying document (trees) in the console breaks translations - keep translation id per hippo:handle node and use it as value for child nodes - - - - - 94012db9 by Pankaj Gupta at 2016-06-28T17:48:15+02:00 CMS-10230 prepare release hippo-cms-3.2.2 - - - - - 3e302fed by Pankaj Gupta at 2016-06-28T17:48:31+02:00 CMS-10230 prepare for next development iteration - - - - - 33da56d1 by Saimir Muco at 2016-06-29T17:26:52+02:00 CMS-10233 reuse a constant - - - - - da071978 by Marijan Milicevic at 2016-06-29T20:51:27+02:00 CMS-10023 Clicking twice on internal link toolbar button throws exception and requires to logout to recover - disable button for 300ms to prevent double clicks. - - - - - bdb02ba2 by Joeri de Gooijer at 2016-06-30T14:25:19+02:00 CMS-10247 Switch from bower to npm for dependency management (cherry picked from commit 464c0f2b29df961201a189356b33f6f3bed98b5e, 69c4d9d0af1e965a4a034f51a1ce32d987cae91d) - - - - - 430e7fd2 by Saimir Muco at 2016-07-01T13:46:39+02:00 CMS-10023 set the variable declaration in one statement - - - - - 99c15e05 by Joeri de Gooijer at 2016-07-04T16:27:18+02:00 CMS-10245 switch from bower to npm for frontend dependency management (cherry picked from commit ba7669d0cd61ba7a022dea4fcf4f56245824b090) CMS-10245 rework after review - Updated date in license headers - Renamed grunt tasks from 'bower' to 'npm' (cherry picked from commit 2778d56499e636ae629054d6392c52abd3360841) CMS-10245 Used latest hippo theme version supporting npm - - - - - da859d72 by Arthur Bogaart at 2016-07-04T16:45:23+02:00 CMS-10247 Reintegrate bugfix/CMS-10247 - - - - - 50bc1b7d by Arthur Bogaart at 2016-07-08T13:00:52+02:00 CMS-10233 Refactor GenerateNewTranslationIdsVisitor - simplified the code a bit by extending the Default TraversingitemVisitor - added a few tests - - - - - fa2aba4d by Arthur Bogaart at 2016-07-08T13:31:37+02:00 CMS-10023 Format code - - - - - f1b1b9ae by Arthur Bogaart at 2016-07-11T10:42:40+02:00 CMS-10023 Rename variable name - - - - - 75fd57f7 by Arthur Bogaart at 2016-07-11T10:54:08+02:00 CMS-10023 Reintegrate bugfix/CMS-10023 - - - - - 1fb572e8 by Jeroen Hoffman at 2016-07-12T12:25:00+02:00 CMS-9943 Merge release/3.2 changes into bugfix/CMS-9943 branch - - - - - 24c83c94 by Jeroen Hoffman at 2016-07-12T12:35:24+02:00 CMS-9943 Reintegrate bugfix/CMS-9943 branch into release/3.2 - - - - - c24899e5 by Jeroen Hoffman at 2016-07-12T12:40:32+02:00 CMS-9943 copyright to 2016 - - - - - 12b46eb0 by Mathijs den Burger at 2016-07-12T14:39:28+02:00 CMS-10233 Skip virtual nodes by using FilteringItemVisitor Separated the isVirtual logic into a predicate. To prevent visiting all properties (which is slow) we skip all properties and just check the t9id property when visiting a translated node. Bumped the repository version to be able to use MockNode#isVirtual and MockItem#accept. - - - - - d0374568 by Mathijs den Burger at 2016-07-12T14:42:24+02:00 CMS-10233 Reintegrate bugfix/CMS-10233 - - - - - 772ba844 by Jeroen Hoffman at 2016-07-12T16:57:01+02:00 CMS-10148 Merge release/3.2 changes into bugfix branch - - - - - 30 changed files: - − api/.bowerrc - api/.csslintrc - api/Gruntfile.js - api/README - − api/bower.json - api/build.config.js - api/npm-shrinkwrap.json - api/package.json - api/pom.xml - api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/GalleryFileUploadBehavior.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/icon/HippoIcon.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/list/resolvers/IconRenderUtil.java - api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java - api/src/main/resources/org/hippoecm/frontend/extjs/hippotheme/ExtHippoTheme.scss - api/src/main/styling/styles/_ajax_loader.scss - api/src/main/styling/styles/_hippo_logo.scss - api/src/main/styling/styles/_icons.scss - api/src/main/styling/styles/main.scss - automatic-export/frontend/pom.xml - automatic-export/pom.xml - automatic-export/repository/pom.xml - brokenlinks/common/pom.xml - brokenlinks/frontend/pom.xml - brokenlinks/pom.xml - brokenlinks/repository/pom.xml - brokenlinks/test/pom.xml - builtin/pom.xml - config/pom.xml - − console/frontend/.bowerrc - console/frontend/Gruntfile.js The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/ec40e131d7f312670ba37b5847954cb6a2e585ab...772ba84495b9c1ee758c4950113207748707e0e2
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
