Mercurial > hg > ConflictEditor
graph
-
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSONTue, 20 Sep 2011 17:00:45 +0200, by dirk
-
as per Jackson recommendation, don't use Reader objects but instead use just plain input streamTue, 20 Sep 2011 16:18:42 +0200, by dirk
-
implement resolving the conflictSun, 18 Sep 2011 19:06:59 +0200, by dirk
-
fix a bug with selection in the differences tableSun, 18 Sep 2011 11:28:20 +0200, by dirk
-
the current conflict is an ObjectNode now so there's less need for castsSun, 18 Sep 2011 11:27:55 +0200, by dirk
-
wire up the current value, conflict value and preview buttonsSun, 18 Sep 2011 11:00:16 +0200, by dirk
-
pull the buttons into their own panel so they can be activated/deactivated in a single operationSun, 18 Sep 2011 10:13:48 +0200, by dirk