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 2020/02/08 05:44:47 UTC
[sling-org-apache-sling-app-cms] 02/03: Merge branch 'master' into
SLING-8917-ldap
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 897d7131804af6df89703c619d8ed50e10d95dc0
Merge: 43b4544 a5c6802
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Feb 7 22:21:58 2020 -0500
Merge branch 'master' into SLING-8917-ldap
.gitpod.Dockerfile | 12 +
.gitpod.yml | 6 +
README.md | 10 +-
api/pom.xml | 47 +-
.../sling/cms/{insights => i18n}/package-info.java | 7 +-
.../apache/sling/cms/insights/package-info.java | 3 +-
archetype/pom.xml | 4 +
.../main/resources/archetype-resources/README.md | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 77 +-
.../HelloWorldModel.java | 0
.../jcr_root/apps/__appName__/components/page.json | 2 +-
builder/src/main/provisioning/cms.txt | 41 +-
builder/src/main/provisioning/scripting.txt | 16 +-
builder/src/main/provisioning/sling.txt | 17 +-
core/bnd.bnd | 1 +
core/pom.xml | 60 +-
.../cms/core/internal/models/PageTemplateImpl.java | 11 +-
.../main/resources/OSGI-INF/l10n/bundle.properties | 2 +-
docker/README.md | 29 +
docker/{cache_disk.conf => cms/Dockerfile} | 22 +-
docker/docker-compose.yml | 31 +
docker/site.conf | 58 -
docker/{ => webcache}/Dockerfile | 24 +-
docker/{ => webcache}/cms.conf | 6 +-
docker/webcache/site.conf | 58 +
docs/administration.md | 22 +-
docs/component-policy.md | 44 +
docs/creating-plugins.md | 37 +
docs/developers.md | 20 +-
docs/img/edit-template.png | Bin 53255 -> 67533 bytes
docs/intro.md | 30 +-
docs/mongodb.md | 28 +-
docs/{administration.md => plugins.md} | 20 +-
docs/project-archetype.md | 43 +
docs/templates.md | 46 +-
pom.xml | 10 +-
reference/bnd.bnd | 8 +
reference/pom.xml | 58 +-
transformer/bnd.bnd | 3 +
transformer/pom.xml | 79 +-
.../transformer/internal/TikaFallbackProvider.java | 30 +-
.../cms/transformer/internal/TransformServlet.java | 23 +-
.../internal/TransformServletConfig.java | 21 +-
.../main/resources/OSGI-INF/l10n/bundle.properties | 35 +
.../transformer/helpers/SlingCMSContextHelper.java | 1 +
.../internal/TikaFallbackProviderTest.java | 11 +
.../transformer/internal/TransformServletTest.java | 6 +-
transformer/src/test/resources/content.json | 2 +-
transformer/src/test/resources/editor.min.css | 2854 ++++++++++++++++++++
ui/bnd.bnd | 4 +
ui/package-lock.json | 189 +-
ui/package.json | 6 +-
ui/pom.xml | 44 +-
ui/src/main/frontend/js/cms.form.js | 13 +-
ui/src/main/frontend/js/cms.labelfield.js | 1 +
ui/src/main/frontend/js/cms.modal.js | 15 +-
ui/src/main/frontend/js/cms.nav.js | 22 +-
ui/src/main/frontend/js/editor.js | 8 +-
ui/src/main/frontend/scss/cms.scss | 212 +-
ui/src/main/frontend/scss/editor.scss | 165 +-
.../libs/sling-cms/components/caconfig/site.json | 5 -
.../availablecomponenttypes.jsp | 46 +-
.../components/cms/contentgrid/contentgrid.jsp | 58 +-
.../components/cms/staticnav/staticnav.jsp | 2 +-
.../editor/fields/auth/members/values.jsp | 6 +-
.../editor/fields/auth/membership/values.jsp | 6 +-
.../components/editor/fields/labelfield/field.jsp | 8 +-
.../components/editor/fields/taxonomy/values.jsp | 6 +-
.../libs/sling/servlet/errorhandler/Throwable.jsp | 4 +-
vagrant/src/install-slingcms.sh | 4 +-
70 files changed, 3972 insertions(+), 829 deletions(-)