Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pull in upstream changes #67

Merged
merged 276 commits into from
Mar 29, 2018
Merged

pull in upstream changes #67

merged 276 commits into from
Mar 29, 2018

Conversation

jgravois
Copy link
Collaborator

to get in sync with master

Benoit Costamagna and others added 30 commits January 29, 2018 13:20
correcting build issues
8e85fe8
@greenkeeper @bhousel
chore(package): update rollup-plugin-commonjs to version 8.3.0
f0c1f17
@greenkeeper @bhousel
chore(package): update d3 to version 4.13.0
a5f03b6
@bhousel
Merge pull request openstreetmap#4751 from bencostamagna/delete_warning
4476d2f 
Warning on multiple deletions: added some details.
@bhousel
Update @std/esm to v0.20.0
c8e89b7
@bhousel
Replace help icon
660a7c0 
(closes openstreetmap#4650)
@bhousel
Support multiple semicolon delimited direction values
80a998e 
(closes openstreetmap#4755)
Parking preset: Removed address from default fields
3c79f91
@bhousel
Remove brfs dependency (not using)
96c8243
@bhousel
Merge pull request openstreetmap#4756 from bencostamagna/parking_preset
f8aeef3 
Parking preset: Removed address from default fields
@bhousel
2.6.1 changelog
8f76c32
@bhousel
Treat both EsriWorldImagery layers the same (support vintage, etc)
9d55cfb
@bhousel
npm run imagery
19b87c0
@bhousel
npm run translations
68a4c1c
@bhousel
v2.6.1
db0858f
@jgravois
query the appropriate metadata for esri clarity
a96bf14
@bhousel
Merge pull request openstreetmap#4767 from jgravois/patch4766
35a7a4c 
query the appropriate metadata for esri clarity
@bhousel
Add support for complex intersection and via way restrictions
c1378a1
@bhousel
Add opening_hours field to amenity=police preset
d7bd3c6 
(closes openstreetmap#4753)
@bhousel
Add dispensing field to amenity=pharmacy preset
42dd36a 
(closes openstreetmap#4763)
@bhousel
Speedup hot code in actionDiscardTags
dac753c 
(re: openstreetmap#4611)
@bhousel
Avoid lodash in hot code in coreDifference
6c3a02c 
(closes openstreetmap#2743, closes openstreetmap#4611)
add wholesale shop preset (openstreetmap#4754)
a6f8401
add health food shop preset (openstreetmap#4754)
fb71294
@bhousel
Correctly catch loc changes
0c23073
@greenkeeper @bhousel
fix(package): update lodash-es to version 4.17.5
4e16d43
fix the names of new presets
fef30e0
@bhousel
Merge branch '4754_Create_new_presets_for_shop_wholesale_and_shop_hea…
e802492 
…lth_food' of https://github.com/fritruc/iD into fritruc-4754_Create_new_presets_for_shop_wholesale_and_shop_health_food
@bhousel
Adjust preset names, use warehouse icon for shop=wholesale
176d7d2
add amusement arcade preset (openstreetmap#4774)
14157a3
bhousel and others added 28 commits March 23, 2018 15:56
@bhousel
Copy edit icon to iD-sprite.src.idraw
5291ac9
@bhousel
Merge pull request openstreetmap#4905 from vershwal/building-height
aafc40b 
Added preset height for buildings.
@Xavier-J-Ortiz
added monastary
6c04f1d
@Xavier-J-Ortiz
corrected typo changed tags to monastery_grounds, as well as added mo…
790740d 
…nastery to terms
@Xavier-J-Ortiz
removed service_times from monastary
1b01b2e
@bhousel
Merge pull request openstreetmap#4936 from Xavier-J-Ortiz/add_amenity…
9e02cde 
…_monestary

added monastary
@bhousel
Switch "monastery_grounds" -> "monastery"
d9b6fce
@obama
Create antenna.json
17bbf0a 
see https://wiki.openstreetmap.org/wiki/Proposed_features/Telecommunications_tower
@bhousel
Add communication types field and terms to antenna preset
b328948
@Xavier-J-Ortiz
added pet_grooming to shop
5e8038e
@Xavier-J-Ortiz
corrected a typo mistake
483b907
@greenkeeper @bhousel
fix(package): update marked to version 0.3.19
35f0671
@bhousel
Merge pull request openstreetmap#4942 from Xavier-J-Ortiz/add_shop_pe…
523fb7f 
…t_grooming

added pet_grooming to shop
@bhousel
Merge branch 'fix4599' of https://github.com/vershwal/iD into vershwa…
3bf618a 
…l-fix4599
@hikemaniac
Added type of industry field.
192beec
@hikemaniac
Fixed a typo.
79c37cf
@bhousel
Merge pull request openstreetmap#4949 from hikemaniac/industrial
d09c7c9 
Add field for industrial=*
@bhousel
Split pane content into header and content, move close button
08ac17f
@bhousel
Merge branch 'vershwal-fix4599'
f504909
@bhousel
Handle variants of 'stop' and 'platform' when identifying PTv2 members
734957f 
(closes openstreetmap#4946)
@bhousel
Don't autocomplete numeric values in the combobox
4840fea 
(closes openstreetmap#4935)
@bhousel
Hide Turn Restriction field on trivial junctions
a160c00 
(closes openstreetmap#4934)
@bhousel
Add usage voltage frequency fields to several rail presets
bf8c24f 
(closes openstreetmap#4919)
@bhousel
Add more kinds of vending machines, change vending to multiple select…
02682f0 
… field

(closes openstreetmap#4888)
@greenkeeper @bhousel
fix(package): update lodash-es to version 4.17.8
07c406a
@bhousel
Rename "No Turns" to "Only Straight On", add "Only U-turn" preset
3b882c8 
(closes openstreetmap#4952)
@jgravois
Merge remote-tracking branch 'mapbox/master' into geoservices
3d08d6c
@jgravois
better merge conflict resolution
a970b4d
@mapmeld mapmeld merged commit 2656b4d into mapmeld:geoservices Mar 29, 2018
@jgravois jgravois deleted the geoservices branch March 29, 2018 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.