source: josm/trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @4363   13 years stoecker use createLayout() in all internal ToggleDialog's
(edit) @3973   13 years mjulius Zoom to conflict now zooms to first selected conflict if there is one …
(edit) @3765   13 years stoecker fix help
(edit) @3754   13 years stoecker some cleanups in help page marking
(edit) @3416   14 years jttt Add Dataset.add/removeSelectionListener methods, change eclipse …
(edit) @3078   14 years bastiK fixed #4593 - conflict list and header not updated right away after …
(edit) @3058   14 years bastiK see #4593 - conflict list not updated right away
(edit) @3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2945   14 years jttt Improvements in conflicts gui
(edit) @2930   14 years jttt Make sure ConflictResolutionDialog is disposed when closed
(edit) @2880   14 years jttt Fixed #4411 Can't upload due to conflicts, but conflict list is empty
(edit) @2869   14 years jttt Removed ToggleDialog.tearDown(). All listeners should be unregistered …
(edit) @2711   14 years stoecker fix bad line endings
(edit) @2710   14 years stoecker close #4222 - unify design of right menus again
(edit) @2655   14 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2621   14 years Gubaer Moved layer listener management from Layer to MapView Made sure that …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2301   15 years Gubaer fixed #3765: Unable to resolve conflict Improved warning message for …
(edit) @2255   15 years Gubaer New utility class for help context aware option dialogs Improved …
(edit) @2252   15 years Gubaer Refactored JOSM help system, slightly extended Fixed problem with new …
(edit) @2131   15 years Gubaer see #3407: NPE in ConflictDialog when using OpenStreetBug plugin
(edit) @1937   15 years jttt Replace some occurrences of RelationMember.member with getters
(edit) @1925   15 years jttt Replaced Relation.members with Relation.getMembers()
(edit) @1898   15 years jttt Way refactoring - rewritten another parts of code to the new nodes api
(edit) @1814   15 years Gubaer removed dependencies to Main.ds, removed Main.ds removed AddVisitor, …
(edit) @1787   15 years stoecker unify design
(edit) @1750   15 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
(edit) @1725   15 years stoecker some cleanups
(edit) @1682   15 years Gubaer removed old conflict resolution code fixed bug in OsmApi (missing …
(edit) @1677   15 years stoecker remove all these ugly tab stops introduced in the last half year
(edit) @1652   15 years stoecker make extended conflict resolving default
(edit) @1642   15 years Gubaer added row numbers and synchronized scrolling in conflict resolution …
(edit) @1640   15 years stoecker little bit more refactoring of coordinate access - patch by jttt
(edit) @1622   15 years Gubaer first version of extended conflict resolution dialog.
(edit) @1523   15 years framm * Major redesign of how JOSM talks to the OSM server. Connections now …
(edit) @1419   15 years stoecker close #2192. Patch by xeen
(edit) @1228   15 years ulfl Improve panels on the right side: a) add a normal/minimized display …
(edit) @1221   15 years stoecker cleanup color handling
(edit) @1169   15 years stoecker removed usage of tab stops
(edit) @1117   15 years framm - list relation conflicts in conflict list. this is one issue relating …
(edit) @1084   15 years framm - cosmetics: rename ShortCut to Shortcut, and shortCut to shortcut
(edit) @1054   16 years stoecker fixed a lot of the shortcut related translations
(edit) @1023   16 years stoecker close bug #1622. Keyboard shortcuts and specific OS handling
(edit) @999   16 years stoecker close bug #1588, code cleanup by bruce89
(edit) @804   16 years stoecker cleanup color preferences a lot
(edit) @758   16 years stoecker unified translation a bit
(edit) @744   16 years stoecker unified buttons in right side tools, saved some space
(edit) @627   16 years framm - added svn:eol-style prop to all .java files. it is suggested that …
(edit) @626   16 years framm - ye grande eol style fixe
(edit) @608   16 years framm - new extrude mode allows creation of rectangular shapes - new …
(edit) @343   17 years gebner Merge 0.5.
(copy) @321   17 years (none) - restructure of repository to support branches. Do 'svn switch …
copied from src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
(edit) @301   17 years imi - fixed undo/redo to be global - fixed adding of objects work with …
Note: See TracRevisionLog for help on using the revision log.