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.

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

First update of upstream master (v3) into our own master branch. #81

Merged
merged 1,059 commits into from
Dec 4, 2019

Conversation

Bonkles
Copy link
Contributor

@Bonkles Bonkles commented Dec 4, 2019

In an attempt to get our master branch in sync with the upstream iD master branch (which is for iD v3 development) this is our first merge of that code.

An internal build of this code has been in use for a couple of months and appears stable.

quincylvania and others added 30 commits October 21, 2019 11:00
(the one breaking change from v2.0.0)
…be subway, light rail, etc.

Use the "station" tag to add public transport type tags like "subway=yes" (close #6948)
Remove "terms" property from all unsearchable presets and fields and their derived data
# Conflicts:
#	dist/locales/en.json
For new brands added in name-suggestion-index v3.3.0
bhousel and others added 29 commits November 27, 2019 10:54
Update various preset icons for temaki 2.3.0
Add term to stable preset
Increase matchScore of Boatbuilder preset
# Conflicts:
#	data/presets/presets.json
#	data/taginfo.json
Deprecate amenity=research_institution
# Conflicts:
#	modules/ui/preset_list.js
Adding this field in the main ones, just like for street crossings, as it is very important for accessibility and safety.
Adding this field in the main ones, just like for street crossings, as it is very important for accessibility and safety.
Update uglify-js to 3.7.1 (close #7065)
Update mapillary-js to 2.20.0 (close #7060)
Add Access Aisle preset and rendering (close #7083)
… #7085)

Add documentation note about `prerequisiteTag` property getting ignored if a value is present
Add US-only field for `gnis:feature_id` (close #7086)
Add tooltip to wikipedia field link button
# Conflicts:
#	data/presets/presets.json
Merge master with latest v3 code from upstream.
Merge master with latest v3 code from upstream.
@Bonkles Bonkles merged commit 3c84d9a into facebook:master Dec 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet