Bryan Housel 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution ...

Merge Conflict Resolution

2015-03-05 19:49:15 -05:00

..

actions

Merge pull request #2525 from openstreetmap/conflict-resolution

2015-03-05 19:49:15 -05:00

behavior

Merge pull request #2525 from openstreetmap/conflict-resolution

2015-03-05 19:49:15 -05:00

core

Initial support for Multi Fetch GET

2015-03-03 20:54:09 -05:00

geo

add deep equals to extent

2014-10-28 21:37:03 -04:00

modes

refactor Conflicts ui into its own component

2015-03-04 11:46:56 -05:00

operations

performance tuning work-in-progress

2014-11-05 00:27:14 -05:00

presets

field.geometry is a string, not an array

2014-05-18 16:02:46 -07:00

renderer

Merge pull request #2525 from openstreetmap/conflict-resolution

2015-03-05 19:49:15 -05:00

services

Don't include geometry filter for taginfo keys query (#2333)

2014-08-26 09:46:29 -07:00

svg

features performance enhancements

2014-11-18 22:05:08 -05:00

ui

Merge pull request #2525 from openstreetmap/conflict-resolution

2015-03-05 19:49:15 -05:00

util

Add SuggestNames util

2013-11-01 16:52:37 -07:00

actions.js

…

behavior.js

…

end.js

jshint fixes

2013-10-24 15:33:52 -07:00

geo.js

Better polygon intersection test

2014-08-12 22:40:43 -04:00

id.js

Merge pull request #2525 from openstreetmap/conflict-resolution

2015-03-05 19:49:15 -05:00

modes.js

…

operations.js

…

presets.js

Fix areaKeys whitelist/blacklist and blacklist junction=roundabout

2015-02-24 12:25:51 -05:00

start.js

jshint fixes

2013-10-24 15:33:52 -07:00

svg.js

Only render oneway markers that actually appear in the viewport

2014-05-31 03:23:31 -04:00

ui.js

style cleanup

2015-02-10 11:08:01 -05:00

util.js

Add accessor to get conflict details from iD.actions.MergeRemoteChanges

2014-12-29 22:47:44 -05:00

validate.js

Don’t interpolate geometry type

2014-06-15 09:56:00 -07:00