You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2018/07/17 20:13:12 UTC
[sling-org-apache-sling-app-cms] 07/07: Merging latest changes
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 7158c9f80c71571b0e03a596558d46a30f0a3552
Merge: fdd7f0e a9fdada
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Jul 17 16:12:12 2018 -0400
Merging latest changes
builder/src/main/provisioning/cms.txt | 16 ++
.../java/org/apache/sling/cms/CMSConstants.java | 5 +
.../apache/sling/cms/core/models/ErrorHandler.java | 2 +-
.../org/apache/sling/cms/core/models/Site.java | 1 +
.../cms/core/servlets/VersionInfoServlet.java | 2 +-
.../cms/core/usergenerated/UGCBucketConfig.java | 87 +++++++++++
.../usergenerated/UserGeneratedContentService.java | 53 +++++++
.../usergenerated/impl/ApproveUGCOperation.java | 119 +++++++++++++++
.../impl/UserGeneratedContentConfig.java | 35 +++++
.../impl/UserGeneratedContentServiceImpl.java | 123 +++++++++++++++
.../main/resources/OSGI-INF/l10n/bundle.properties | 16 +-
pom.xml | 16 +-
ui/src/main/frontend/src/scss/styles.scss | 2 +-
.../resources/SLING-INF/nodetypes/nodetypes.cnd | 11 ++
.../components/cms/pageeditbar/pageeditbar.jsp | 2 +-
.../suffixproperty/suffixproperty.jsp} | 12 +-
.../components/editor/scripts/finalize.jsp | 2 +-
.../sling-cms/components/editor/scripts/init.jsp | 2 +-
.../jcr_root/libs/sling-cms/content/start.json | 10 ++
.../sling-cms/content/usergenerated/content.json | 168 +++++++++++++++++++++
.../sling-cms/content/usergenerated/review.json | 83 ++++++++++
....sling.engine.impl.auth.SlingAuthenticator.json | 3 +-
.../clientlibs/sling-cms-editor/editor.css | 65 ++++----
.../clientlibs/sling-cms-editor/editor.js | 0
vagrant/Vagrantfile | 4 +-
25 files changed, 780 insertions(+), 59 deletions(-)
diff --cc pom.xml
index d8bc94c,2b49ce5..b79e319
--- a/pom.xml
+++ b/pom.xml
@@@ -41,15 -43,15 +41,13 @@@
<module>reference</module>
<module>builder</module>
</modules>
-
-
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-app-cms.git</url>
- <tag>org.apache.sling.cms-0.9.0</tag>
- </scm>
-
-
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-app-cms.git</url>
+ <tag>HEAD</tag>
+ </scm>
<dependencyManagement>
<dependencies>