This PR gets the latest from iD master and incorporates it into Rapid master. #97
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updating Chinese address scheme
# Conflicts: # data/presets/presets.json
Deprecate `man_made=gas_well` and `man_made=oil_well`
# Conflicts: # data/taginfo.json
…le rows from the raw tag editor (close #7087)
# Conflicts: # modules/ui/raw_tag_editor.js
…change in status (close #6650) Make API status messages more informative (close #7021) Add manual Retry button to "unable to connect" API status message (close #5864)
Pull latest from fb-upstream.
(closes #7101) This also adds fill styles for the other light-green things like cemetaries vineyards, etc.. For some reason they didn't have fill styles before so only the strokes were being styled light green.
Add a preset for shop=doors
…tions (close #7185) Update translations
…nexpectedly (close #7166) Add code test to account for deprecated tags with no replacement
Update address & phone formats in Peru
Update rolup/plugin-buble to 0.21.0 (close #7151)
…tions (close #7203)
# Conflicts: # dist/locales/en.json # modules/ui/splash.js
- Seems that the expected payload has changed so now all error types use key "targetIds" - Also includes minor fix so that comments display in the UI immediately
Add Used Car Dealership preset Deprecate clothes=second_hand when used with shop=clothes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There is but one noticeable change- since the 'modal.js' dialog functionality was changed to be more touch-friendly, I had to add an explicit 'close button' to the Rapid dialog.