[xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
Hi devs, The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history). I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1. Thanks, Marius
Here's the link, in case you haven't found the branch already https://github.com/xwiki/xwiki-commons/compare/feature-diff-display Thanks, Marius On Mon, Jun 4, 2012 at 11:38 AM, Marius Dumitru Florea <mariusdumitru.florea@xwiki.com> wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius
+1 In case it's not clear for some of you, it' s a display oriented API on top of the new base diff API and not a different diff module ;) On Mon, Jun 4, 2012 at 10:38 AM, Marius Dumitru Florea <mariusdumitru.florea@xwiki.com> wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius _______________________________________________ devs mailing list devs@xwiki.org http://lists.xwiki.org/mailman/listinfo/devs
-- Thomas Mortagne
+1 Best Regards, /Andreas On 2012-06-04 10:38, Marius Dumitru Florea wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius _______________________________________________ devs mailing list devs@xwiki.org http://lists.xwiki.org/mailman/listinfo/devs .
Anyone against this? Thanks, Marius On Mon, Jun 4, 2012 at 11:38 AM, Marius Dumitru Florea <mariusdumitru.florea@xwiki.com> wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius
+1 Thanks -Vincent On Jun 4, 2012, at 10:38 AM, Marius Dumitru Florea wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius
+0 Thanks, Eduard On Tue, Jun 5, 2012 at 11:23 AM, Vincent Massol <vincent@massol.net> wrote:
+1
Thanks -Vincent
On Jun 4, 2012, at 10:38 AM, Marius Dumitru Florea wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius
devs mailing list devs@xwiki.org http://lists.xwiki.org/mailman/listinfo/devs
+1 Thanks, Caty On Tue, Jun 5, 2012 at 12:06 PM, Eduard Moraru <enygma2002@gmail.com> wrote:
+0
Thanks, Eduard
On Tue, Jun 5, 2012 at 11:23 AM, Vincent Massol <vincent@massol.net> wrote:
+1
Thanks -Vincent
On Jun 4, 2012, at 10:38 AM, Marius Dumitru Florea wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius
devs mailing list devs@xwiki.org http://lists.xwiki.org/mailman/listinfo/devs
_______________________________________________ devs mailing list devs@xwiki.org http://lists.xwiki.org/mailman/listinfo/devs
5 +1, 1 +0, no -1. Doing the merge. Thanks, Marius On Mon, Jun 4, 2012 at 11:38 AM, Marius Dumitru Florea <mariusdumitru.florea@xwiki.com> wrote:
Hi devs,
The feature-diff-display branch provides a new diff module, xwiki-commons-diff-display, with APIs to help displaying diffs. Currently it supports two diff formats: unified (GitHub style, suited for code) and inline (suited for free text). I'm using this module for the merge conflict resolution UI and for an improved document compare UI (when comparing two versions from a document history).
I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1.
Thanks, Marius
participants (6)
-
Andreas Jonsson -
Ecaterina Moraru (Valica) -
Eduard Moraru -
Marius Dumitru Florea -
Thomas Mortagne -
Vincent Massol