Bryan Housel e3139e250e improvements to iD.actions.MergeRemoteChanges ...

* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..

2015-03-02 13:07:24 -05:00

..

presets

Change description for amenity=farm to "Farmland"

2015-02-03 12:42:36 -05:00

address-formats.json

…

core.yaml

improvements to iD.actions.MergeRemoteChanges

2015-03-02 13:07:24 -05:00

data_dev.js

…

deprecated.json

…

discarded.json

…

feature-icons.json

…

imagery.json

…

imperial.json

…

introGraph.js

…

line-icons.json

…

locales.json

…

maki_sprite.js

…

name-suggestions.json

…

operations-sprite.json

…

presets.yaml

Change description for amenity=farm to "Farmland"

2015-02-03 12:42:36 -05:00

relation-icons.json

…

taginfo.json

should be shop=houseware, not shop=household (closes #2509)

2015-02-03 10:48:40 -05:00

update_imagery.js

…

update_locales.js

…

wikipedia.json

…