Quincy Morgan 11b2102761 Merge branch 'master' into validation ...

# Conflicts:
#	data/core.yaml
#	dist/locales/en.json
#	modules/ui/commit_warnings.js
#	modules/ui/entity_editor.js
#	modules/util/index.js
#	modules/util/util.js
#	modules/validations/index.js
#	modules/validations/many_deletions.js
#	modules/validations/missing_tag.js

2019-01-14 10:13:56 -05:00

..

presets

Add a preset "RV Dealership" for shop=caravan

2019-01-11 18:02:17 -05:00

address-formats.json

Use json-stringify-pretty-compact for compacter json

2018-06-15 11:48:07 -04:00

core.yaml

Merge branch 'master' into validation

2019-01-14 10:13:56 -05:00

deprecated.json

Use json-stringify-pretty-compact for compacter json

2018-06-15 11:48:07 -04:00

discarded.json

Use json-stringify-pretty-compact for compacter json

2018-06-15 11:48:07 -04:00

drive-left.json

Use json-stringify-pretty-compact for compacter json

2018-06-15 11:48:07 -04:00

imagery.json

npm run imagery

2018-12-13 09:47:28 -05:00

imperial.json

Use json-stringify-pretty-compact for compacter json

2018-06-15 11:48:07 -04:00

index.js

Remove dataSuggestions and utilSuggestNames

2018-11-20 21:27:32 -05:00

intro_graph.json

Switch crossing presets to "marked"/"unmarked", retain "zebra" as unsearchable

2018-10-02 17:01:04 -04:00

keepRight.json

Improve URL error messages 411, 412, 413

2019-01-10 21:35:13 -05:00

locales.json

npm run translations

2018-08-26 02:17:11 -04:00

phone-formats.json

Use json-stringify-pretty-compact for compacter json

2018-06-15 11:48:07 -04:00

presets.yaml

Add a preset "RV Dealership" for shop=caravan

2019-01-11 18:02:17 -05:00

shortcuts.json

Add quickLinks to preset editor, zoom to selected feature

2019-01-09 21:56:08 -05:00

taginfo.json

Add a preset "RV Dealership" for shop=caravan

2019-01-11 18:02:17 -05:00

update_imagery.js

Show OpenTopoMap

2018-09-02 13:54:14 -04:00

update_locales.js

Actually throttle connection, filter out bad term translations

2018-06-25 19:33:36 -04:00