Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-7862

Display all document changes in the merge conflic resolution UI

    XMLWordPrintable

Details

    • Improvement
    • Resolution: Fixed
    • Major
    • 4.1-rc-1
    • 4.1-milestone-2
    • Extension
    • High
    • Medium

    Description

      Best is to improve the current document compare UI (changesdoc.vm) and to reuse it in the EM's merge conflict resolution UI.

      Attachments

        1. EM-mergeConflict.png
          175 kB
          Marius Dumitru Florea

        Issue Links

          depends on

          New Feature - A new feature of the product, which has yet to be developed. XWIKI-7649 Introduce document merge conflict resolution UI

          • Major - Major loss of function.
          • Closed
          is duplicated by

          Bug - A problem which impairs or prevents the functions of the product. XWIKI-2231 Velocity code is evaluated when viewing diff on objects

          • Major - Major loss of function.
          • Closed

          Activity

            People

              mflorea Marius Dumitru Florea
              mflorea Marius Dumitru Florea
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: