4 Jun
2012
4 Jun
'12
10:38 a.m.
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
4 Jun
4 Jun
10:40 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
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(a)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
10:49 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
+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(a)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(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
--
Thomas Mortagne
11:11 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
+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(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
.
5 Jun
5 Jun
9:23 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
Anyone against this?
Thanks,
Marius
On Mon, Jun 4, 2012 at 11:38 AM, Marius Dumitru Florea
<mariusdumitru.florea(a)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
10:23 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
+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
11:06 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
+0
Thanks,
Eduard
On Tue, Jun 5, 2012 at 11:23 AM, Vincent Massol <vincent(a)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(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
11:24 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
+1
Thanks,
Caty
On Tue, Jun 5, 2012 at 12:06 PM, Eduard Moraru <enygma2002(a)gmail.com> wrote:
+0
Thanks,
Eduard
On Tue, Jun 5, 2012 at 11:23 AM, Vincent Massol <vincent(a)massol.net>
wrote:
+1
Thanks
-Vincent
On Jun 4, 2012, at 10:38 AM, Marius Dumitru Florea wrote:
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
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(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
11:51 a.m.
New subject: [xwiki-devs] [VOTE] Merge feature-diff-display branch into commons master
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(a)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
4539
days inactive
4540
days old
8 comments
6 participants
participants (6)
-
Andreas Jonsson -
Ecaterina Moraru (Valica) -
Eduard Moraru -
Marius Dumitru Florea -
Thomas Mortagne -
Vincent Massol