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 2019/01/13 01:25:41 UTC

[sling-org-apache-sling-app-cms] 01/01: Merge branch 'master' into feature/file-metadata-loaded

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch feature/file-metadata-loaded
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 7ebe51ceafc4fccfc120eab5bfc009a3ab1fe30f
Merge: 5562827 55cc13a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Sat Jan 12 20:25:26 2019 -0500

    Merge branch 'master' into feature/file-metadata-loaded

 ui/src/main/frontend/src/js/cms.js                 | 27 -------
 ui/src/main/frontend/src/js/cms.page.js            | 83 ++++++++++++++++++++++
 .../components/cms/pageproperties/include.jsp      |  5 +-
 vagrant/Vagrantfile                                |  6 +-
 vagrant/site.conf                                  |  4 +-
 5 files changed, 89 insertions(+), 36 deletions(-)