16273 Commits

Author SHA1 Message Date
Minh Nguyễn 471c97db26 Updated presets correctly 2017-10-09 08:45:26 -07:00
Seth Fitzsimmons 37cf22e1a2 Treat punctuation as hashtag delimiters
Unicode ranges for punctuation are simpler than creating a Unicode-aware
word class, so delimit on non-words.

Fixes #4398
2017-10-09 10:14:25 -04:00
Bryan Housel d1f0cb24ad Add instructions about release notes 2017-10-08 22:59:39 -04:00
Bryan Housel 2716b78e87 v2.4.2 2017-10-08 22:27:27 -04:00
Bryan Housel 10747dec5c npm run translations 2017-10-08 22:18:39 -04:00
Bryan Housel 62b2b699d8 Merge pull request #4412 from jleh/overlapping-presets-fix
Fixed overlapping in feature editor
2017-10-08 21:10:36 -04:00
Bryan Housel 548dda7a13 npm run build for new presets 2017-10-08 21:09:49 -04:00
Bryan Housel 41023a5b37 Merge pull request #4413 from TheGreenToaster/trade-presets
Added Trade Shop presets #4410
2017-10-08 20:43:51 -04:00
Bryan Housel 13f7beb237 Merge pull request #4411 from TheGreenToaster/tile-shop
Added Tile Shop preset
2017-10-08 20:42:49 -04:00
Minh Nguyễn 9ba17bb8b1 Merry-go-round is synonymous with roundabout 2017-10-08 15:37:48 -07:00
Minh Nguyễn 68bf15de55 Renamed Springy Rocker preset to Spring Rocker
Also added some synonyms.
2017-10-08 15:09:43 -07:00
Bryan Housel 17c2e358bd v2.4.2 changelog 2017-10-08 12:36:52 -04:00
wingra2 ae935a562d Added Trade Shop presets #4410 2017-10-08 08:46:55 -05:00
Juuso Lehtinen 20d5e8a30d Increased preset list max height
Fixes possible overlapping when multiple tag references are expanded.
New max-height 190 px = button 80 px + content 110 px

Closes #4023
2017-10-08 16:13:53 +03:00
wingra2 147cb88d16 Added Tile Shop preset 2017-10-08 08:12:14 -05:00
Bryan Housel bfda2c5438 Add healthcare tagging to suggestion presets 2017-10-07 12:12:56 -04:00
Bryan Housel ba7e0c39c1 Pull updates to name-suggestion-index 2017-10-06 23:04:03 -04:00
Bryan Housel 8b41e7947e npm run imagery 2017-10-06 22:49:46 -04:00
JamesKingdom 074b874160 Remove address from fitness station
(closes #4373)
2017-10-06 20:52:57 +01:00
JamesKingdom 2dca3012b4 Adding fitness_station_type field 2017-10-06 20:45:06 +01:00
JamesKingdom 7e98d7f989 Allow crane preset on a vertex
(closes #4403)
2017-10-06 20:02:03 +01:00
Bryan Housel 3c4a02aba1 Add crane icon 2017-10-06 14:48:43 -04:00
Bryan Housel 7a616cc49f Switch to EsriWorldImagery background layer for the tutorial.. 2017-10-06 00:31:28 -04:00
greenkeeper[bot] 3714486ad3 chore(package): update mocha to version 4.0.0 2017-10-06 00:21:40 -04:00
greenkeeper[bot] 6b17d54144 chore(package): update d3 to version 4.11.0 2017-10-06 00:20:26 -04:00
Bryan Housel 07e0ee0d69 Merge pull request #4402 from pwelby/patch-1
Disable source switcher during walkthrough
2017-10-06 00:12:19 -04:00
pwelby 7586f7e086 Disable source switcher during walkthrough
Closes #4401 -- fixed as proposed in the issue's comments
2017-10-05 23:53:14 -04:00
Bryan Housel dd40dd5fad Merge pull request #4400 from openstreetmap/cam
Allow cameras on a vertex
2017-10-05 21:59:08 -04:00
JamesKingdom 20e47a4685 Allow cameras on a vertex
(closes #4394)
2017-10-05 18:12:20 +01:00
Bryan Housel 810c74f6a4 Merge pull request #4396 from arka-nitd/master
changed label for hashtag field to suggested hashtag
2017-10-04 20:33:20 -04:00
Arka Roy 7b470eab29 changed label for hashtag field to suggested hashtag 2017-10-05 03:38:58 +05:30
Bryan Housel 795fe0c391 Correct path crane_type -> crane/type 2017-10-04 11:51:47 -04:00
Wille Marcel 0de9ea3cff change location of crane:type field 2017-10-04 06:30:57 -03:00
Wille Marcel 2b00b85a7e add preset for man_made=crane 2017-10-03 18:07:44 -03:00
Bryan Housel d11cdcf628 Merge pull request #4389 from openstreetmap/sweet
Update confectionery presets
2017-10-03 13:32:16 -04:00
JamesKingdom d1a59ca953 Add sweet term and build npm 2017-10-03 17:56:48 +01:00
JamesKingdom ecb07f2b3b Rename to Candy Maker and change sweets > sweet 2017-10-03 17:46:10 +01:00
Bryan Housel 2b47ac4b3e Replace tunnel_waterway combo with structure_water radio
(closes #4384)

- adds the `layer` field so it works like the structure field on highways
- also defaults the tunnel type to `culvert` for waterways
- also fixed so that `layer` gets removed if user changes types or clicks delete
2017-10-02 11:24:59 -04:00
Bryan Housel 7376787c44 If showing layer= field, add to field.keys so delete will remove it 2017-10-02 09:40:54 -04:00
Bryan Housel 7ba3bf3a45 Don't hard code form-field-structure field name
(radiobox with structure extras can be used for other fields)
2017-10-02 09:26:54 -04:00
Bryan Housel f7b7bd7d5f Change "listening on" console message from red to yellow
(Because red looks like an error)
2017-10-02 08:53:10 -04:00
Bryan Housel a20cc8ed3f Standardize on one access_simple field that includes "yes" option
(closes #4383)

`access_toilets` used to be the only one with the "yes" option,
now it's not needed.
2017-10-02 08:49:32 -04:00
Bryan Housel b0c50bcc32 Add "trim trail" as a term for fitness station preset
(re: https://github.com/openstreetmap/iD/issues/4373#issuecomment-333307431)
2017-10-01 10:23:02 -04:00
Bryan Housel e6f46831f0 Pacify eslint 2017-09-29 10:13:42 -04:00
Bryan Housel 4fb81748dc Update to sinon v4, sinon-chai v2.14 2017-09-29 10:09:38 -04:00
Bryan Housel 63450b05b5 Merge pull request #4380 from openstreetmap/build
Streamline build steps
2017-09-28 22:38:15 -04:00
Kushan Joshi 81b91ad676 fix travis 2017-09-28 17:57:06 +05:30
Kushan Joshi 84fd3d7d16 fix lodash merge 2017-09-28 17:32:55 +05:30
Kushan Joshi 6e3795bfd8 Merge branch 'master' of github.com:openstreetmap/iD into build
# Conflicts:
#	build_data.js
#	development_server.js
#	modules/services/mapillary.js
2017-09-28 17:27:34 +05:30
Kushan Joshi 6eb509d413 promisify build steps 2017-09-28 17:10:30 +05:30