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

dklco pushed a change to branch SLING-7858
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.


    from c351416  Removing the extra column and fixing the search feature
     new a2c172a  Fixing an issue where the page content can be created blank 
due to a race condition
     new df3497f  Merge branch 'master' into SLING-7858
     new d58be70  Fixed the editor to work and fixing a number of different 
components / fields

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../core/internal/filters/CMSSecurityFilter.java   |   4 +-
 .../core/internal/filters/EditIncludeFilter.java   |  47 +++++---
 .../cms/core/internal/filters/LocaleFilter.java    |  21 ++--
 .../cms/core/internal/filters/PublishFilter.java   |   4 +-
 .../internal/operations/BulkReplaceOperation.java  |   2 +-
 .../operations/PropertyHintNodeNameGenerator.java  |  20 ++--
 .../operations/UpdateReferencesPostOperation.java  |   2 +
 ui/src/main/frontend/gulpfile.js                   | 101 ++++++++++++++---
 ui/src/main/frontend/src/js/{scripts.js => cms.js} | 109 +++++-------------
 .../sling-cms-editor => frontend/src/js}/editor.js |  29 ++---
 ui/src/main/frontend/src/scss/_grid.scss           | 125 --------------------
 .../frontend/src/scss/{styles.scss => cms.scss}    |  33 ++++++
 ui/src/main/frontend/src/scss/editor.scss          |  64 +++++++++++
 ui/src/main/frontend/src/scss/index.scss           |  18 ---
 .../cms/contentactions/contentactions.jsp          |  25 ++--
 .../components/cms/i18ntable/i18ntable.jsp         |  16 ++-
 .../components/cms/pageeditbar/actions/actions.jsp |  26 +++--
 .../components/cms/pageeditbar/pageeditbar.jsp     |  20 +++-
 .../components/cms/pageeditor/pageeditor.jsp       |   4 +-
 .../cms/versionmanager/versionmanager.jsp          |  30 ++---
 .../components/editor/fields/base/base.jsp         |   2 +-
 .../components/editor/fields/path/path.jsp         |   2 +-
 .../editor/fields/references/references.jsp        |  24 ++--
 .../components/editor/fields/repeating/field.jsp   |  28 +++--
 .../editor/fields/siblingselect/siblingselect.jsp  |  78 ++++++-------
 .../components/editor/scripts/finalize.jsp         |  25 ++--
 .../sling-cms/components/editor/scripts/init.jsp   |   2 +-
 .../components/general/container/container.jsp     |  19 +++-
 .../libs/sling-cms/components/pages/base/body.jsp  |   1 +
 .../static/clientlibs/sling-cms-editor/editor.css  | 126 ---------------------
 .../static/clientlibs/sling-cms-editor/loader.gif  | Bin 673 -> 0 bytes
 31 files changed, 460 insertions(+), 547 deletions(-)
 rename ui/src/main/frontend/src/js/{scripts.js => cms.js} (81%)
 rename ui/src/main/{resources/jcr_root/static/clientlibs/sling-cms-editor => 
frontend/src/js}/editor.js (78%)
 delete mode 100644 ui/src/main/frontend/src/scss/_grid.scss
 rename ui/src/main/frontend/src/scss/{styles.scss => cms.scss} (82%)
 create mode 100644 ui/src/main/frontend/src/scss/editor.scss
 delete mode 100755 ui/src/main/frontend/src/scss/index.scss
 delete mode 100644 
ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css
 delete mode 100644 
ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/loader.gif

Reply via email to