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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @2779   14 years mjulius fixes #4253 - Combine way conflict dialog - check box for "Show tags …
(edit) @2726   14 years framm fix message text
(edit) @2712   14 years mjulius fixes #4252 - Handling relations of way combining unintuitive For both …
(edit) @2711   14 years stoecker fix bad line endings
(edit) @2655   14 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2626   14 years jttt Fixed some of the warnings found by FindBugs
(edit) @2624   14 years mjulius fixes #4088,#4155 - when after conflict resolving the primitive has …
(edit) @2612   14 years mjulius Fixes #4083 - exception when copying relation with incomplete node …
(edit) @2569   14 years Gubaer fixed #3684: Add "chunked" upload mode Removed support for API "0.5" …
(edit) @2565   14 years Gubaer Removed BackReferenceDataSet and CollectBackReferenceVisitor because …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2326   14 years Gubaer Slightly improved dialogs for way combining and node merging. Added …
(edit) @2285   15 years Gubaer Improved Download Location Dialog and created …
(edit) @2273   15 years jttt Replace testing for id <= 0 with isNew() method
(edit) @2237   15 years stoecker removed translation conflict (now also compiles)
(edit) @2236   15 years stoecker removed translation conflict
(edit) @2220   15 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2165   15 years stoecker applied #3532 - path by Dave Hansen - infrastructure for faster data access
(edit) @2164   15 years stoecker fixed typo
(edit) @2157   15 years Gubaer fixed #3534: Merge dialog "remembers" old relations
(edit) @2141   15 years Gubaer applied #3513: patch by Claudius Henrichs : Typos and unifying …
(edit) @2115   15 years Gubaer new: reading open changesets from the server new: reading user info …
(edit) @2104   15 years Gubaer fixed #3402: Conflict in created_by when merging nodes or ways …
(edit) @2103   15 years Gubaer fixing bug member conflict handling
(edit) @2099   15 years Gubaer added auto completion to combine way dialog fixed #3461: Value …
(edit) @2095   15 years Gubaer rewrite of MergeNodesAction new: new conflict resolution dialog for …
(edit) @2083   15 years Gubaer Removed deprecated constructors in ExtendedDialog Turned most of the …
(edit) @2070   15 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2039   15 years Gubaer applied #3377: patch by xeen: Less warnings for JOSM
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
(edit) @1990   15 years Gubaer fixed #3261: Use the "name:$CURRENT_LOCALE" name in the JOSM UI …
(edit) @1989   15 years Gubaer fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative …
(edit) @1954   15 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
(edit) @1942   15 years Gubaer fixed #3230: Bug affecting conflict resolving
(edit) @1938   15 years jttt Replace some occurrences of RelationMember.member with getters
(edit) @1930   15 years jttt Replace RelationMember.role with RelationMember.getRole() and …
(edit) @1928   15 years jttt Make parameterless RelationMember constructor deprecated
(edit) @1925   15 years jttt Replaced Relation.members with Relation.getMembers()
(edit) @1911   15 years Gubaer fixed #3193: No layer is left highlighted when the bottom most one is …
(edit) @1904   15 years Gubaer fixed #3141: conflict resolution: "apply partial resolution" doesn't work
(edit) @1898   15 years jttt Way refactoring - rewritten another parts of code to the new nodes api
(edit) @1847   15 years Gubaer replaced calls to JOptionPane.* by calls to OptionPaneUtil.*
(edit) @1843   15 years jttt Use OsmPrimitive methods instead of direct access to keys field when …
(edit) @1811   15 years jttt PleaseWait refactoring. Progress is now reported using ProgressMonitor …
(edit) @1790   15 years Gubaer Relation Editor: complete rework Relation Editor: had to temporarily …
(edit) @1692   15 years Gubaer
(edit) @1690   15 years Gubaer new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit) @1676   15 years stoecker fix typos
(edit) @1669   15 years stoecker updated i18n
(edit) @1666   15 years Gubaer bug fix: wrong merge state
(edit) @1655   15 years stoecker better i18n of new conflict stuff
(edit) @1654   15 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1653   15 years stoecker add support for compressed OSM files (bzip2, gzip)
(edit) @1650   15 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
(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) @1631   15 years Gubaer added support for merging member lists of relations in extended …
(edit) @1626   15 years stoecker fixed Java 1.5 problems
(add) @1622   15 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.