Jeroen Hoffman pushed to branch feature/HIPPLUG-1495 at cms-community / hippo-plugin-taxonomy
Commits: 2aab8669 by Bert Leunis at 2017-10-05T15:26:17+02:00 HIPPLUG-1487 introduce locale with also a region code - - - - - 8038802b by Bert Leunis at 2017-10-06T16:13:39+02:00 HIPPLUG-1487 to have a big tree in the demo is a good thing - - - - - b1773ef1 by Tobias Jeger at 2017-10-11T15:47:02+02:00 HIPPLUG-1497 Fix bootstrap warnings (cherry picked from commit 94125ea358684bc22084aeb6d74490a4261f5b97) - - - - - 2c7e90ab by Tobias Jeger at 2017-10-30T14:45:43+01:00 HIPPLUG-1502 Move content categorization from demo to plugin - - - - - 6fb6346d by Tobias Jeger at 2017-10-30T14:55:30+01:00 HIPPLUG-1502 Fix auto-export setup in demo project - - - - - a2e0cfcb by Jeroen Hoffman at 2017-11-20T11:28:13+01:00 HIPPLUG-1487 Merge branch 'master' into feature/HIPPLUG-1487 # Conflicts: # demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml - - - - - 06ea3091 by Jeroen Hoffman at 2017-11-20T11:44:51+01:00 HIPPLUG-1487 bump referenced to demo parent to 4.1.0-SNAPSHOT - - - - - abcf0d27 by Jeroen Hoffman at 2017-11-20T12:06:47+01:00 HIPPLUG-1487 rename channels from Selection Demo to Taxonomy Demo - - - - - a4668705 by Jeroen Hoffman at 2017-11-20T12:11:54+01:00 HIPPLUG-1487 Reintegrate branch 'feature/HIPPLUG-1487' into master - - - - - 55b31bfd by Jeroen Hoffman at 2017-11-20T12:18:33+01:00 HIPPLUG-1495 Merge branch 'master' into feature/HIPPLUG-1495 - - - - - bb1e885c by Jeroen Hoffman at 2017-11-21T09:23:16+01:00 HIPPLUG-1495 Remove space between details labels and colon because it made the colon wrap to next line in case of larger texts - - - - - 30 changed files: - addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyBrowser$Details.html - addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/style.css - addon/repository/src/main/resources/hcm-config/main.yaml - demo/cms/pom.xml - demo/plugin/pom.xml - demo/plugin/src/main/resources/hcm-config/main.yaml - demo/pom.xml - demo/repository-data/pom.xml - demo/repository-data/src/main/resources/hcm-config/hst-configurations.yaml - demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml - demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml - demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-fr/channel.yaml → demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/channel.yaml - demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-fr/sitemap.yaml → demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/sitemap.yaml - demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-fr/sitemenus.yaml → demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/sitemenus.yaml - demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en/channel.yaml - demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-nl/channel.yaml - demo/repository-data/src/main/resources/hcm-config/localeproviderservice.yaml - demo/repository-data/src/main/resources/hcm-config/main.yaml - demo/repository-data/src/main/resources/hcm-content/taxonomies.yaml - + demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-en-gb.yaml - demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-en.yaml - − demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-fr.yaml - demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-nl.yaml - + demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-en-gb.yaml - demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-en.yaml - − demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-fr.yaml - demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-nl.yaml - demo/site/pom.xml - demo/site/src/main/java/org/onehippo/taxonomy/demo/components/TaxonomyCategoryResult.java - + demo/site/src/main/java/org/onehippo/taxonomy/demo/components/TaxonomyCategoryResultInfo.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/220ddb65ef94949e153426d75c4f8ca2209e22e5...bb1e885cc3ddad310dfefbf5927e16dd85726a3b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/220ddb65ef94949e153426d75c4f8ca2209e22e5...bb1e885cc3ddad310dfefbf5927e16dd85726a3b You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
