[HippoCMS-scm] [Git][cms-community/hippo-cms-project][master] CMS-10990 Upgrade to latest CXF 3.1.x version

2017-11-21 Thread Ate Douma
Ate Douma pushed to branch master at cms-community / hippo-cms-project


Commits:
e06f1194 by Ate Douma at 2017-11-21T16:06:32+01:00
CMS-10990 Upgrade to latest CXF 3.1.x version

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
 Note that there is *no* dependency management for the version 
properties below.
 -->
 
v3-rev116-1.20.0
-3.1.13
+3.1.14
 2.0.1
 1.9.13
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-project/commit/e06f11940013ffe06088c59a7f741a591e4ddfd1

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-project/commit/e06f11940013ffe06088c59a7f741a591e4ddfd1
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1512] 6 commits: CHANNELMGR-1601 Add skinny profile to speed up build

2017-11-21 Thread Michael Metternich
Michael Metternich pushed to branch feature/CC-CHANNELMGR-1512 at cms-community 
/ hippo-addon-channel-manager


Commits:
7cc8cc79 by Michael Metternich at 2017-11-21T13:45:27+01:00
CHANNELMGR-1601 Add skinny profile to speed up build

- - - - -
9ba1c031 by Ariel Weinberger at 2017-11-21T14:04:05+01:00
CHANNELMGR-1513 Fix missing document name in discard dialog

- - - - -
6fd47cc9 by Michael Metternich at 2017-11-21T14:38:24+01:00
CHANNELMGR-1601 Also remove awcache and dll in non-skinny profile

- - - - -
0b2be5fe by Michael Metternich at 2017-11-21T14:40:35+01:00
CHANNELMGR-1601 Reintegrate feature/CHANNELMGR-1601

- - - - -
5de7eebf by Michael Metternich at 2017-11-21T14:43:43+01:00
CHANNELMGR-1488 Merge master in create-content

- - - - -
dddb3731 by Michael Metternich at 2017-11-21T14:44:51+01:00
CHANNELMGR-1488 Merge create-content in feature

- - - - -


2 changed files:

- frontend-ng/pom.xml
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts


Changes:

=
frontend-ng/pom.xml
=
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -71,12 +71,19 @@
   
 
 maven-clean-plugin
+
+  
+ng-clean
+  
+
 
 
 
 cache
 coverage
 node_modules
+.awcache
+dll
 false
 
 
@@ -84,4 +91,47 @@
 
 
   
+
+  
+
+  skinny
+  
+
+  
+org.codehaus.mojo
+exec-maven-plugin
+${maven.plugin.exec.version}
+
+  
+npm-build
+process-resources
+exec
+
+  npm
+  run buildDev -- 
--transpileOnly
+
+  
+
+  
+  
+maven-clean-plugin
+
+  
+ng-clean
+  
+
+
+  
+
+  cache
+  coverage
+  false
+
+  
+
+  
+
+  
+
+  
 


=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
@@ -157,7 +157,7 @@ export class CreateContentStep2Component implements OnInit {
 
   private confirmDiscardChanges(): Promise {
 const messageParams = {
-  // documentName: this.doc.displayName,
+  documentName: this.doc.displayName,
 };
 
 const confirm = this.dialogService.confirm()



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/46a7a3bccdc76828aeca01f742bfaa4cb40aca64...dddb3731d662d5cc303d2f0c6fbeb143fc92729d

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/46a7a3bccdc76828aeca01f742bfaa4cb40aca64...dddb3731d662d5cc303d2f0c6fbeb143fc92729d
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] 4 commits: CHANNELMGR-1601 Add skinny profile to speed up build

2017-11-21 Thread Michael Metternich
Michael Metternich pushed to branch feature/create-content at cms-community / 
hippo-addon-channel-manager


Commits:
7cc8cc79 by Michael Metternich at 2017-11-21T13:45:27+01:00
CHANNELMGR-1601 Add skinny profile to speed up build

- - - - -
6fd47cc9 by Michael Metternich at 2017-11-21T14:38:24+01:00
CHANNELMGR-1601 Also remove awcache and dll in non-skinny profile

- - - - -
0b2be5fe by Michael Metternich at 2017-11-21T14:40:35+01:00
CHANNELMGR-1601 Reintegrate feature/CHANNELMGR-1601

- - - - -
5de7eebf by Michael Metternich at 2017-11-21T14:43:43+01:00
CHANNELMGR-1488 Merge master in create-content

- - - - -


1 changed file:

- frontend-ng/pom.xml


Changes:

=
frontend-ng/pom.xml
=
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -71,12 +71,19 @@
   
 
 maven-clean-plugin
+
+  
+ng-clean
+  
+
 
 
 
 cache
 coverage
 node_modules
+.awcache
+dll
 false
 
 
@@ -84,4 +91,47 @@
 
 
   
+
+  
+
+  skinny
+  
+
+  
+org.codehaus.mojo
+exec-maven-plugin
+${maven.plugin.exec.version}
+
+  
+npm-build
+process-resources
+exec
+
+  npm
+  run buildDev -- 
--transpileOnly
+
+  
+
+  
+  
+maven-clean-plugin
+
+  
+ng-clean
+  
+
+
+  
+
+  cache
+  coverage
+  false
+
+  
+
+  
+
+  
+
+  
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/9ba1c03138241f4700524820229aac65cebec5fe...5de7eebf549e0e385f876055be23051e87a35bca

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/9ba1c03138241f4700524820229aac65cebec5fe...5de7eebf549e0e385f876055be23051e87a35bca
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 3 commits: CHANNELMGR-1601 Add skinny profile to speed up build

2017-11-21 Thread Michael Metternich
Michael Metternich pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
7cc8cc79 by Michael Metternich at 2017-11-21T13:45:27+01:00
CHANNELMGR-1601 Add skinny profile to speed up build

- - - - -
6fd47cc9 by Michael Metternich at 2017-11-21T14:38:24+01:00
CHANNELMGR-1601 Also remove awcache and dll in non-skinny profile

- - - - -
0b2be5fe by Michael Metternich at 2017-11-21T14:40:35+01:00
CHANNELMGR-1601 Reintegrate feature/CHANNELMGR-1601

- - - - -


1 changed file:

- frontend-ng/pom.xml


Changes:

=
frontend-ng/pom.xml
=
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -71,12 +71,19 @@
   
 
 maven-clean-plugin
+
+  
+ng-clean
+  
+
 
 
 
 cache
 coverage
 node_modules
+.awcache
+dll
 false
 
 
@@ -84,4 +91,47 @@
 
 
   
+
+  
+
+  skinny
+  
+
+  
+org.codehaus.mojo
+exec-maven-plugin
+${maven.plugin.exec.version}
+
+  
+npm-build
+process-resources
+exec
+
+  npm
+  run buildDev -- 
--transpileOnly
+
+  
+
+  
+  
+maven-clean-plugin
+
+  
+ng-clean
+  
+
+
+  
+
+  cache
+  coverage
+  false
+
+  
+
+  
+
+  
+
+  
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/04d2da396f264ef58310ecfeab41a0343d3c78b8...0b2be5fe8b04764525344f4d92e4e996f1cbc63b

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/04d2da396f264ef58310ecfeab41a0343d3c78b8...0b2be5fe8b04764525344f4d92e4e996f1cbc63b
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1601] CHANNELMGR-1601 Also remove awcache and dll in non-skinny profile

2017-11-21 Thread Michael Metternich
Michael Metternich pushed to branch feature/CHANNELMGR-1601 at cms-community / 
hippo-addon-channel-manager


Commits:
6fd47cc9 by Michael Metternich at 2017-11-21T14:38:24+01:00
CHANNELMGR-1601 Also remove awcache and dll in non-skinny profile

- - - - -


1 changed file:

- frontend-ng/pom.xml


Changes:

=
frontend-ng/pom.xml
=
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -82,6 +82,8 @@
 cache
 coverage
 node_modules
+.awcache
+dll
 false
 
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6fd47cc98e409d7adc57e513cd75f922c30f388a

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6fd47cc98e409d7adc57e513cd75f922c30f388a
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CC-CHANNELMGR-1513

2017-11-21 Thread Ariel Weinberger
Ariel Weinberger deleted branch feature/CC-CHANNELMGR-1513 at cms-community / 
hippo-addon-channel-manager

---

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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] CHANNELMGR-1513 Fix missing document name in discard dialog

2017-11-21 Thread Ariel Weinberger
Ariel Weinberger pushed to branch feature/create-content at cms-community / 
hippo-addon-channel-manager


Commits:
9ba1c031 by Ariel Weinberger at 2017-11-21T14:04:05+01:00
CHANNELMGR-1513 Fix missing document name in discard dialog

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
@@ -159,7 +159,7 @@ export class CreateContentStep2Component implements OnInit {
 
   private confirmDiscardChanges(): Promise {
 const messageParams = {
-  // documentName: this.doc.displayName,
+  documentName: this.doc.displayName,
 };
 
 const confirm = this.dialogService.confirm()



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/9ba1c03138241f4700524820229aac65cebec5fe

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/9ba1c03138241f4700524820229aac65cebec5fe
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1601

2017-11-21 Thread Michael Metternich
Michael Metternich pushed new branch feature/CHANNELMGR-1601 at cms-community / 
hippo-addon-channel-manager

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1601
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CC-CHANNELMGR-1513

2017-11-21 Thread Ariel Weinberger
Ariel Weinberger pushed new branch feature/CC-CHANNELMGR-1513 at cms-community 
/ hippo-addon-channel-manager

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1513
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


[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/HSTTWO-4169

2017-11-21 Thread Bert Leunis
Bert Leunis pushed new branch feature/HSTTWO-4169 at cms-community / 
hippo-site-toolkit

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/tree/feature/HSTTWO-4169
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


[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10015] CMS-10015 Hide vertical scroll bar in Edge

2017-11-21 Thread Bert Leunis
Bert Leunis pushed to branch feature/CMS-10015 at cms-community / hippo-cms


Commits:
494da7f5 by Bert Leunis at 2017-11-21T12:00:25+01:00
CMS-10015 Hide vertical scroll bar in Edge

- - - - -


1 changed file:

- api/src/main/styling/styles/_admin-perspective.scss


Changes:

=
api/src/main/styling/styles/_admin-perspective.scss
=
--- a/api/src/main/styling/styles/_admin-perspective.scss
+++ b/api/src/main/styling/styles/_admin-perspective.scss
@@ -282,7 +282,7 @@
   border-top: 1px solid $dark-gray;
 
   padding: 4px 0 0 0;
-  flex: 1 0 auto;
+  flex: 0;
 
   > div.hippo-tree > div.wicket-tree {
 .row {



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/494da7f57d01e7f2c2ff38e798e18568221aa26b

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/494da7f57d01e7f2c2ff38e798e18568221aa26b
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CC-CHANNELMGR-1513

2017-11-21 Thread Ariel Weinberger
Ariel Weinberger deleted branch feature/CC-CHANNELMGR-1513 at cms-community / 
hippo-addon-channel-manager

---

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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] CHANNELMGR-1596 Revert wrong indentation

2017-11-21 Thread Arthur Bogaart
Arthur Bogaart pushed to branch feature/create-content at cms-community / 
hippo-addon-channel-manager


Commits:
9db43bc2 by Arthur Bogaart at 2017-11-21T11:44:50+01:00
CHANNELMGR-1596 Revert wrong indentation

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.component.ts


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.component.ts
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.component.ts
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.component.ts
@@ -50,8 +50,10 @@ export class CreateContentComponent implements OnInit {
 }
   }
 
-  constructor(private createContentService: CreateContentService, private 
feedbackService: FeedbackService,
-private translate: TranslateService) { }
+  constructor(
+private createContentService: CreateContentService,
+private feedbackService: FeedbackService,
+private translate: TranslateService) {}
 
   ngOnInit() {
 if (!this.options) {
@@ -65,8 +67,8 @@ export class CreateContentComponent implements OnInit {
 this.createContentService
   .getTemplateQuery(this.options.templateQuery)
   .subscribe(
-  (templateQuery) => this.onLoadDocumentTypes(templateQuery.documentTypes),
-  (error) => this.onErrorLoadingTemplateQuery(error),
+(templateQuery) => 
this.onLoadDocumentTypes(templateQuery.documentTypes),
+(error) => this.onErrorLoadingTemplateQuery(error),
 );
   }
 
@@ -91,8 +93,8 @@ export class CreateContentComponent implements OnInit {
 this.createContentService
   .createDraft(document)
   .subscribe(
-  (response) => this.onContinue.emit(),
-  (error) => this.onErrorCreatingDraft(error),
+(response) => this.onContinue.emit(),
+(error) => this.onErrorCreatingDraft(error),
 );
   }
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/9db43bc2c4601538fdc003efe1d27b6253e7bbe5

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/9db43bc2c4601538fdc003efe1d27b6253e7bbe5
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


[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CC-CHANNELMGR-1526

2017-11-21 Thread Arthur Bogaart
Arthur Bogaart pushed new branch feature/CC-CHANNELMGR-1526 at cms-community / 
hippo-addon-channel-manager

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1526
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


[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy] Deleted branch feature/HIPPLUG-1495

2017-11-21 Thread Jeroen Hoffman
Jeroen Hoffman deleted branch feature/HIPPLUG-1495 at cms-community / 
hippo-plugin-taxonomy

---

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


[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1113] ESSENTIALS-1113 Move PluginContextFactoryImpl back to SDK

2017-11-21 Thread Tobias Jeger
Tobias Jeger pushed to branch feature/ESSENTIALS-1113 at cms-community / 
hippo-essentials


Commits:
a5767bf9 by Tobias Jeger at 2017-11-21T09:47:17+01:00
ESSENTIALS-1113 Move PluginContextFactoryImpl back to SDK

I realized that my goal should not be to get rid of the
plugin-sdk/implementation, but to get rid of the need for Essentials
plugins to depend on it, rather than on the plugin-sdk/api only. API
and implementation should have the same lifecycle, which should be
distict from the lifecycle of the dashboard, such that we can eventually
move the plugins to their appropriate location (outside of the
Essentials project).

- - - - -


1 changed file:

- 
dashboard/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java
 → 
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java


Changes:

=
dashboard/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java
 → 
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java
=



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/a5767bf92e6b4aaa915bba1d698a6d54a4c773dc

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/a5767bf92e6b4aaa915bba1d698a6d54a4c773dc
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


[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][feature/HIPPLUG-1495] 11 commits: HIPPLUG-1487 introduce locale with also a region code

2017-11-21 Thread Jeroen Hoffman
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