You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ad...@apache.org on 2019/07/12 12:44:06 UTC

[roller] branch roller-5.2.x updated (0c024ee -> 84436f1)

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 0c024ee  Merge pull request #31 from apache/ROL-2138-5.2.x
     add 05c8e03  Revert "Improved: Editor should confirm user before leaving the page (ROL-2136)"
     new 84436f1  Merge pull request #32 from apache/revert-30-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, 1 insertion(+), 11 deletions(-)


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

Posted by 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 84436f1602922939606971400bfda622387e7870
Merge: 0c024ee 05c8e03
Author: Aditya Sharma <ia...@gmail.com>
AuthorDate: Fri Jul 12 18:14:01 2019 +0530

    Merge pull request #32 from apache/revert-30-ROL-2136-5.2.x
    
    Revert "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, 1 insertion(+), 11 deletions(-)