[roller] branch roller-5.2.x updated (f0433b7 -> 8e1d268)

[ad...@apache.org]

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

adityasharma pushed a change to branch roller-5.2.x
in repository https://gitbox.apache.org/repos/asf/roller.git.


    from f0433b7  Prepare for rc-2.
     add 7e94603  Improved: Editor should confirm user before leaving the page (ROL-2136) On the pages where editors are used, if the user has done some unsaved changes. Before closing window/tab it should confirm user. Done following changes: 1. Included UnsavedChanges plugin for Xinha editor that implicitly handles it 2. Added custom code to add confimation box for text area which adds an event handler to beforeunload event if the text area is changed.
     add e7bf827  Reverted: unwanted changes (ROL-2136)
     new 8e1d268  Merge pull request #30 from apache/ROL-2136-5.2.x

The 1 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:
 app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

[roller] 01/01: Merge pull request #30 from apache/ROL-2136-5.2.x

[ad...@apache.org]

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

adityasharma pushed a commit to branch roller-5.2.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 8e1d26844143f20734d15fefb6d24500daab4cac
Merge: f0433b7 e7bf827
Author: Aditya Sharma <ad...@apache.org>
AuthorDate: Thu Jun 13 09:59:53 2019 +0530

    Merge pull request #30 from apache/ROL-2136-5.2.x
    
    Improved: Editor should confirm user before leaving the page (ROL-2136)

 app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)