Search:
Login
Preferences
Help/Guide
About Trac
Register
Forgot your password?
Wiki
Timeline
Changelog
Browse Source
View Tickets
New Ticket
Roadmap
Builds
Sonar
Search
Context Navigation
View Latest Revision
source:
josm
/
trunk
/
src
/
org
/
openstreetmap
/
josm
/
gui
/
dialogs
/
ConflictResolutionDialog.java
Revision Log Mode:
Stop on copy
Follow copies
Show only adds and deletes
View log starting at
and back to
Show at most
revisions per page.
Show full log messages
Legend:
Added
Modified
Copied or renamed
Diff
Rev
Age
Author
Log Message
(edit)
@2308
15 years
Gubaer
fixed
#3762
: Deleted relation still referenced when deleting former …
(edit)
@2301
15 years
Gubaer
fixed
#3765
: Unable to resolve conflict Improved warning message for …
(edit)
@2274
15 years
Gubaer
Improved help browser layout (now uses custom CSS shipped with JOSM) …
(edit)
@2252
15 years
Gubaer
Refactored JOSM help system, slightly extended Fixed problem with new …
(edit)
@2017
15 years
Gubaer
removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit)
@1990
15 years
Gubaer
fixed
#3261
: Use the "name:$CURRENT_LOCALE" name in the JOSM UI …
(edit)
@1987
15 years
Gubaer
removed all occurences of setAlwaysOnTop(). See …
(edit)
@1954
15 years
Gubaer
Moved package org.openstreetmap.josm.gui.conflict to …
(edit)
@1904
15 years
Gubaer
fixed
#3141
: conflict resolution: "apply partial resolution" doesn't work
(edit)
@1857
15 years
Gubaer
replaced JOptionDialog.show... by OptionPaneUtil.show.... improved …
(edit)
@1847
15 years
Gubaer
replaced calls to JOptionPane.* by calls to OptionPaneUtil.*
(edit)
@1782
15 years
stoecker
fixed
#2928
- patch by Michi - unify GUI
(edit)
@1690
15 years
Gubaer
new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit)
@1677
15 years
stoecker
remove all these ugly tab stops introduced in the last half year
(edit)
@1654
15 years
Gubaer
added merge support for coordinate conflicts added merge support for …
(edit)
@1642
15 years
Gubaer
added row numbers and synchronized scrolling in conflict resolution …
(edit)
@1631
15 years
Gubaer
added support for merging member lists of relations in extended …
(edit)
@1627
15 years
ce
removed two @Override to make it compile with java 1.5
(add)
@1622
15 years
Gubaer
first version of extended conflict resolution dialog.
Note:
See
TracRevisionLog
for help on using the revision log.
Download in other formats:
RSS Feed
ChangeLog