Mercurial > hg > ConflictEditor
graph
-
replace the text field for the db url with a combo box that is populated from the preferences.Fri, 07 Oct 2011 03:58:41 +0200, by dirk
-
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences tableTue, 20 Sep 2011 17:47:59 +0200, by dirk
-
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)Tue, 20 Sep 2011 17:21:03 +0200, by dirk
-
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
-
change column namesSun, 18 Sep 2011 09:40:58 +0200, by dirk
-
do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.Sun, 18 Sep 2011 09:37:40 +0200, by dirk