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:46 UTC
[sling-org-apache-sling-app-cms] 01/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 43b45444696d49d5746f3f0134dc164fd0708a06
Merge: d913ef8 45cb96f
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Dec 19 16:49:48 2019 -0500
Merge branch 'master' into SLING-8917-ldap
ui/.eslintrc.js | 21 +
ui/gulpfile.js | 285 +++--
ui/package-lock.json | 1215 +++++++++++++++++++-
ui/package.json | 11 +-
ui/pom.xml | 390 +++----
ui/src/main/frontend/js/cms.draggable.js | 129 +--
ui/src/main/frontend/js/cms.fields.js | 272 +++--
ui/src/main/frontend/js/cms.form.js | 289 +++--
ui/src/main/frontend/js/cms.job.js | 44 +-
ui/src/main/frontend/js/cms.js | 339 +++---
ui/src/main/frontend/js/cms.labelfield.js | 126 +-
ui/src/main/frontend/js/cms.modal.js | 192 ++--
ui/src/main/frontend/js/cms.nav.js | 194 ++--
ui/src/main/frontend/js/cms.page.js | 119 +-
ui/src/main/frontend/js/cms.pathfield.js | 128 ++-
ui/src/main/frontend/js/cms.toggle.js | 63 +-
ui/src/main/frontend/js/editor.js | 617 +++++-----
.../components/cms/i18ncontainer/i18ncontainer.jsp | 11 +-
.../libs/sling-cms/content/i18n/entry/create.json | 8 +-
19 files changed, 2803 insertions(+), 1650 deletions(-)