Bryan Housel 1a8ef310c6 Merge branch 'master' into preset-cleanup ...

Conflicts:
	data/presets/presets.json
	data/presets/presets/amenity/post_office.json

2014-08-25 14:05:49 -04:00

..

presets

more consistency in presets..

2014-08-25 13:44:49 -04:00

address-formats.json

Drop postcode for Ireland addresses

2014-06-25 10:21:58 -07:00

core.yaml

Rewrite area intro sentence (#2336)

2014-08-25 10:26:27 -07:00

data_dev.js

Removed local countries.json

2014-06-05 20:33:38 +02:00

deprecated.json

add picnic area stuff: firepit, picnic_table, bbq

2014-03-19 17:33:28 -04:00

discarded.json

Add KSJ2 tags to discard list

2013-09-13 09:47:42 -07:00

feature-icons.json

fix typo: "only_straight_ahead" -> "only_straight_on"

2014-05-22 11:51:44 +02:00

imagery.json

Update imagery.json

2014-07-08 16:24:48 -04:00

imperial.json

Localize maxspeed field (mph and km/h)

2013-04-01 19:36:39 -04:00

introGraph.js

intro tutorial work in progress

2013-03-25 13:22:37 -04:00

line-icons.json

Add presets for new line icons

2013-05-24 17:17:41 -07:00

locales.json

Update translations

2014-05-03 13:12:24 -07:00

maki_sprite.js

Update maki; use prebuilt sprite (fixes #1916)

2013-10-25 12:16:47 -07:00

name-suggestions.json

Update name suggestions

2014-03-04 09:48:17 -05:00

operations-sprite.json

Initial support for only_* restrictions

2014-05-19 15:53:46 -07:00

presets.yaml

more consistency in presets..

2014-08-25 13:44:49 -04:00

relation-icons.json

fix typo: "only_straight_ahead" -> "only_straight_on"

2014-05-22 11:51:44 +02:00

update_imagery.js

Update imagery

2014-04-09 14:58:57 -04:00

update_locales.js

Use reviewed vi translations

2013-08-06 13:57:21 -07:00

wikipedia.json

wikipedia input field

2013-04-01 15:55:37 -04:00