source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @5299   9 years Don-vip conflict dialog: better display of empty rows in members tab, like …
(edit) @5298   9 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
(edit) @5297   9 years Don-vip fix #4493, fix #7750: conflict dialog, nodes and members tab: allow …
(edit) @5296   9 years Don-vip conflict dialog, nodes tab: better display of empty rows (display a …
(edit) @5291   9 years Don-vip fix #4688 - conflict manager, member and nodes tabs: set width of …
(edit) @5288   9 years Don-vip fix #7601 - Conflicts dialog is now opened at the first tab showing a …
(edit) @5266   9 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @5170   9 years Don-vip cleanup svn:mime-type properties preventing Java sources from being …
(edit) @4478   10 years Don-vip fix #5374 and #6315 - NPE in relations conflict manager
(edit) @4310   10 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4191   10 years stoecker remove old debug stuff
(edit) @4163   10 years stoecker improve color names of last checkin
(edit) @4162   10 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @4116   10 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4115   10 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4072   10 years jttt Fix #6301 Check for null mandatory in …
(edit) @3995   11 years mjulius fix #3590 - Primitives or objects: Pick one
(edit) @3844   11 years stoecker see #5899 - support different display of closed ways and areas
(edit) @3786   11 years Upliner remove OperationCancelledException class which is unused since [3362]
(edit) @3766   11 years stoecker fix help
(edit) @3719   11 years bastiK added missing license information
(edit) @3530   11 years stoecker fix array preferences
(edit) @3408   11 years jttt Show only actions that can work on all selected layers in …
(edit) @3362   11 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3218   11 years stoecker typos, close #4989 - patch by mikalaari
(edit) @3083   12 years bastiK added svn:eol-style=native to source files
(edit) @3061   12 years jttt Fix #4612 delete members while relation dialog is open leads to data …
(edit) @3034   12 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @3025   12 years jttt Fix tests
(edit) @2991   12 years Gubaer Updated two tooltip texts
(edit) @2990   12 years jttt Fix some eclipse warnings
(edit) @2983   12 years Gubaer see #4054: Improving user feedback when trying to merge a deleted …
(edit) @2982   12 years jttt Calculate bbox for relations, use it in mappaint.
(edit) @2949   12 years jttt Show only one message box in conflicts dialog when multiple members …
(edit) @2945   12 years jttt Improvements in conflicts gui
(edit) @2940   12 years mjulius display list of referrers in ConflictResolutionDialog
(edit) @2938   12 years jttt Addition to #4408 (don't require to merge coordinates after primitive …
(edit) @2936   12 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2882   12 years jttt Fixed #4409 after confict management: nodes are not selectable
(edit) @2881   12 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2846   12 years mjulius fix messages for gui/conflict
(edit) @2711   12 years stoecker fix bad line endings
(edit) @2626   12 years jttt Fixed some of the warnings found by FindBugs
(edit) @2624   12 years mjulius fixes #4088,#4155 - when after conflict resolving the primitive has …
(edit) @2612   12 years mjulius Fixes #4083 - exception when copying relation with incomplete node …
(edit) @2569   12 years Gubaer fixed #3684: Add "chunked" upload mode Removed support for API "0.5" …
(edit) @2512   12 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2285   12 years Gubaer Improved Download Location Dialog and created …
(edit) @2273   12 years jttt Replace testing for id <= 0 with isNew() method
(edit) @2181   12 years stoecker lots of i18n fixes
(edit) @2165   12 years stoecker applied #3532 - path by Dave Hansen - infrastructure for faster data access
(edit) @2083   12 years Gubaer Removed deprecated constructors in ExtendedDialog Turned most of the …
(edit) @2070   12 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2039   12 years Gubaer applied #3377: patch by xeen: Less warnings for JOSM
(edit) @2017   12 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1990   12 years Gubaer fixed #3261: Use the "name:$CURRENT_LOCALE" name in the JOSM UI …
(edit) @1989   12 years Gubaer fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative …
(add) @1954   12 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
Note: See TracRevisionLog for help on using the revision log.