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

This PR gets the latest from iD master and incorporates it into Rapid master. #97

Merged
merged 243 commits into from
Jan 7, 2020

Commits on Nov 28, 2019

  1. Update address format in China

    Tanuki authored and Tanuki committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    5f40521 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. Merge pull request #7075 from koaber/locale-check

    Updating Chinese address scheme
    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    770ab13 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e83c094 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    86b87a2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6f3debe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0c7e2ef View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    91da602 View commit details
    Browse the repository at this point in the history
  7. Merge branch '2.x'

    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    d415f36 View commit details
    Browse the repository at this point in the history
  8. Add fields to man_made=petroleum_well

    Deprecate `man_made=gas_well` and `man_made=oil_well`
    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    f5ea983 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f6ed843 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    4b98237 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    236273e View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    # Conflicts:
    #	data/taginfo.json
    quincylvania committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    f80e144 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Configuration menu
    Copy the full SHA
    a2ada42 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    db300d1 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    quincylvania committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    c9c6269 View commit details
    Browse the repository at this point in the history
  4. Fix issue where a new row would not appear last after deleting multip…

    …le rows from the raw tag editor (close #7087)
    quincylvania committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    88ff303 View commit details
    Browse the repository at this point in the history
  5. Merge branch '2.x'

    # Conflicts:
    #	modules/ui/raw_tag_editor.js
    quincylvania committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    be3a79c View commit details
    Browse the repository at this point in the history
  6. Reload API status automatically when a response indicates a probable …

    …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)
    quincylvania committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    c1f7721 View commit details
    Browse the repository at this point in the history
  7. Merge branch '2.x'

    quincylvania committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    8efe1a3 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. Configuration menu
    Copy the full SHA
    b028a67 View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.x'

    quincylvania committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    15463d7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    38ebef1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dc2d489 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #13 from facebookincubator/master

    Pull latest from fb-upstream.
    Bonkles committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    98a80a5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f29fe41 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f078c34 View commit details
    Browse the repository at this point in the history
  8. Merge branch '2.x'

    quincylvania committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    e13160f View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. Configuration menu
    Copy the full SHA
    bb18921 View commit details
    Browse the repository at this point in the history
  2. User lighter green fill for golf=green

    (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.
    bhousel committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    baca525 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    bhousel committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    bf849dd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    89e340a View commit details
    Browse the repository at this point in the history
  5. Add unsearchable preset for demolished:building=yes (close #7098)

    Render features with a status prefix in the provisional styles (e.g. dashed outline)
    quincylvania committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    231e2c7 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.x'

    quincylvania committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    3bc5db3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3943963 View commit details
    Browse the repository at this point in the history
  8. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    #	data/taginfo.json
    quincylvania committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    39b7f57 View commit details
    Browse the repository at this point in the history
  9. Make point markers more circular with larger icons (close #6163)

    Tweak the grey style of points linked to wikidata
    quincylvania committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    00e8a12 View commit details
    Browse the repository at this point in the history
  10. Merge branch '2.x'

    quincylvania committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    7c456b9 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. fix issue #7090

    An easier way to recreate the issue is by creating two ways of different type then select both and undo one of the lines. This patch removes the removed selected ids from the editor by manipulating _entityIDs in historyChange().
    anonomis committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    7ab2d71 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #7103 from anonomis/patch-1

    fix issue #7090
    quincylvania committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    84de962 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9aa27f6 View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    quincylvania committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    db01cf5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    dffe80f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5cab4b1 View commit details
    Browse the repository at this point in the history
  7. Fix issue facebook#84: Change feature count tracking to operate acro…

    …ss AI source types (facebook#85)
    
    Fix AI Feature maximum-count-per-changeset logic to include all AI features, not just roads.
    Bonkles committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    9e1f955 View commit details
    Browse the repository at this point in the history
  8. Fix performance issue where breathe behavior would be called for each…

    … selected element instead of just for the surface (close #3571)
    quincylvania committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    4b4ea12 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5ab7134 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. Use tunnel=culvert on waterways when using the "add a tunnel" cross…

    …ing ways fix (re: #6617)
    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    a7dd6db View commit details
    Browse the repository at this point in the history
  2. Fix mapillary detection selection rendering in Firefox and Safari (cl…

    …ose #6804)
    
    Fix mapillary feature detection tooltips (re: #7079)
    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    df3b281 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    70e96fa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0b7d5b2 View commit details
    Browse the repository at this point in the history
  5. Don't style untagged multipolygon member lines as area boundaries if …

    …they also have belong to non-multipolygon relations (close #6787)
    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    e335f0a View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.x'

    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    d40a1e3 View commit details
    Browse the repository at this point in the history
  7. Store selected mapillary image by its key rather than its object

    Properly sort selected mapillary signs and features above unselected ones
    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    0d5bd8b View commit details
    Browse the repository at this point in the history
  8. Fix lint warning

    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    5e756bb View commit details
    Browse the repository at this point in the history
  9. Rely more on mapillary selected photo key than photoviewer datum

    Remove mapillary map feature selection outline when closing photoviewer
    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    4d8d27f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8818bf1 View commit details
    Browse the repository at this point in the history
  11. Merge branch '2.x'

    quincylvania committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    140bfaa View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. Configuration menu
    Copy the full SHA
    e99f6f1 View commit details
    Browse the repository at this point in the history
  2. Add "Ride" to name of attraction=drop_tower preset

    Add terms to various presets
    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    20ca241 View commit details
    Browse the repository at this point in the history
  3. Update to temaki v3.5.0

    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    f989153 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c6db769 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f78c920 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    34a7664 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f6266de View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a319bf7 View commit details
    Browse the repository at this point in the history
  9. Merge branch '2.x'

    # Conflicts:
    #	modules/ui/feature_list.js
    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    1bcb399 View commit details
    Browse the repository at this point in the history
  10. Revert c6db769 - back to Raster API (again)

    The image quality is better from this one
    bhousel committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    21e6c27 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    960d0d5 View commit details
    Browse the repository at this point in the history
  12. Merge branch 2.x

    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    9352fb4 View commit details
    Browse the repository at this point in the history
  13. Rename rendererMap.editable function to more precise rendererMap.edit…

    …ableDataEnabled
    
    Make coreContext.editable function also account for whether user is in modeSave
    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    9d936b4 View commit details
    Browse the repository at this point in the history
  14. Allow viewing and editing the tags/relations of selected features at…

    … any zoom level in 2.x (re: #5001)
    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    912151f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    03cea64 View commit details
    Browse the repository at this point in the history
  16. Prevent partial rendering of selection style when showing only select…

    …ed features at low zooms
    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    ff506fc View commit details
    Browse the repository at this point in the history
  17. Merge branch '2.x'

    # Conflicts:
    #	modules/core/context.js
    #	modules/modes/select.js
    #	modules/renderer/map.js
    #	modules/ui/tools/add_favorite.js
    #	modules/ui/tools/add_recent.js
    #	modules/ui/tools/modes.js
    #	modules/ui/tools/search_add.js
    #	modules/ui/tools/undo_redo.js
    quincylvania committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    c36c6f9 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. Lower matchScore of generic Boundary preset to be below that of the A…

    …dministrative Boundary preset (close #7118)
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    bc56d2c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    827c803 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9ce0535 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e352d42 View commit details
    Browse the repository at this point in the history
  5. Fix typo in comment

    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    9920c7d View commit details
    Browse the repository at this point in the history
  6. 2.x: Highlight relation members in yellow when a relation is selected…

    …, including in a multi-selection (re: #5766, re: cf29355)
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    7473d32 View commit details
    Browse the repository at this point in the history
  7. Correctly remove yellow member highlight when removing member from se…

    …lect relation (close #6772)
    
    Don't exit select mode when panning selected feature out of view
    Return false when checking selected IDs and switching between single and multiselect in modeSelect
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    61f0a67 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    91b6844 View commit details
    Browse the repository at this point in the history
  9. Merge branch '2.x'

    # Conflicts:
    #	modules/modes/select.js
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    f7c99c0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6cbdb41 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    09eb3ba View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    # Conflicts:
    #	css/80_app.css
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    7af4e90 View commit details
    Browse the repository at this point in the history
  13. 2.x: Don't render multipolygon members in yellow when the multipolygo…

    …n is selected (re: #6558, re: 4ab9712)
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    7ca9f55 View commit details
    Browse the repository at this point in the history
  14. Cherry pick b45dc7e

    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    77d30ee View commit details
    Browse the repository at this point in the history
  15. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets.json
    #	data/taginfo.json
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    95b8998 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    260bf4b View commit details
    Browse the repository at this point in the history
  17. Merge branch '2.x'

    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    51b56c4 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    cf599dc View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    73591bf View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    590f4f9 View commit details
    Browse the repository at this point in the history
  21. Merge branch '2.x'

    # Conflicts:
    #	data/presets/presets/power/substation.json
    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    5e12f9e View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    f2fb3cf View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    9ad5991 View commit details
    Browse the repository at this point in the history
  24. Merge branch '2.x'

    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    c8f2086 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    c849619 View commit details
    Browse the repository at this point in the history
  26. Merge branch '2.x'

    quincylvania committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    f4cc0f5 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2019

  1. increase width of input field

    iriman committed Dec 15, 2019
    Configuration menu
    Copy the full SHA
    8f9facf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    23cc54a View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. Merge pull request #7128 from mikini/patch-2

    Fix typo in orthogonalize.too_large.multiple
    quincylvania committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    637087c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e87ea7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9e912df View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3b124bf View commit details
    Browse the repository at this point in the history
  5. Update generic preset names to be categorical (e.g. "this is a Touris…

    …m Feature" instead of "this is a Tourism")
    quincylvania committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    c08b0d4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9b8439f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    da6fac2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6c7ed79 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0208524 View commit details
    Browse the repository at this point in the history
  10. Merge branch '2.x'

    quincylvania committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    c00d410 View commit details
    Browse the repository at this point in the history
  11. 2.x: Make toolbar horizontally scrollable when it overflows (re: #675…

    …5, re: 7545f67)
    
    Generalize tooltip into popover control
    Use the same popover control for tooltip as the preset browser and tools list popovers
    Smartly position the preset browser popover and menu bar tooltips to stay fully onscreen
    Position most tooltips closer to their controls
    Fix small gap that could appear between a tooltip and its arrow
    Allow wider toolbar tooltips
    quincylvania committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    523a467 View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    # Conflicts:
    #	css/80_app.css
    #	modules/ui/feature_info.js
    #	modules/ui/radial_menu.js
    #	modules/ui/tools/add_favorite.js
    #	modules/ui/tools/add_recent.js
    #	modules/ui/tools/modes.js
    #	modules/ui/tools/notes.js
    #	modules/ui/tools/save.js
    #	modules/ui/tools/search_add.js
    #	modules/ui/tools/sidebar_toggle.js
    #	modules/ui/tools/undo_redo.js
    #	modules/ui/top_toolbar.js
    quincylvania committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    c60e4ad View commit details
    Browse the repository at this point in the history
  13. Remove duplicate CSS

    quincylvania committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    6103526 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2c96fb2 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    0e3c0ca View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    201d451 View commit details
    Browse the repository at this point in the history
  17. Merge branch '2.x'

    quincylvania committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    4ce88db View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Configuration menu
    Copy the full SHA
    e9a9780 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    27f538b View commit details
    Browse the repository at this point in the history
  3. Add privacy policy and link to it

    (re: #7040)
    bhousel committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    ac27456 View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    bhousel committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    18a1f27 View commit details
    Browse the repository at this point in the history
  5. Update temaki to 3.6.0

    quincylvania committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    1020d04 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    93ff34d View commit details
    Browse the repository at this point in the history
  7. Merge branch '2.x'

    quincylvania committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    d6ab5f7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    72c7163 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ad5579b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0f0d76b View commit details
    Browse the repository at this point in the history
  11. es6 preset_icon.js

    bhousel committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    afba579 View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    bhousel committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    5a7d896 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Configuration menu
    Copy the full SHA
    c9348e2 View commit details
    Browse the repository at this point in the history
  2. Update marked to 0.8.0 (close #7113)

    Update fast-json-stable-stringify to 2.1.0 (close #7121)
    quincylvania committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    3f728c5 View commit details
    Browse the repository at this point in the history
  3. Remove old, unused implementations of favorite, recent, and search-to…

    …-add preset toolbar items
    quincylvania committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    e8d154a View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    # Conflicts:
    #	css/80_app.css
    #	modules/ui/preset_icon.js
    #	modules/ui/tools/index.js
    #	modules/ui/top_toolbar.js
    quincylvania committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    cccbc41 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' of https://github.com/openstreetmap/iD

    # Conflicts:
    #	modules/ui/preset_icon.js
    quincylvania committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    b7d6dd0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bb8ec36 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #7126 from iriman/patch-1

    increase width of input field
    quincylvania committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    c962f4e View commit details
    Browse the repository at this point in the history
  8. increase width of input field

    iriman authored and quincylvania committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    986131e View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4592f93 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7f76e00 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2455ca2 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    189a3f8 View commit details
    Browse the repository at this point in the history
  13. Merge branch 2.x

    quincylvania committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    49712a4 View commit details
    Browse the repository at this point in the history
  14. Use foreach instead of for loops for clarity

    Also rename `loc` to `point` (elsewhere in iD code `loc` is a lon/lat)
    bhousel committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    20f90f8 View commit details
    Browse the repository at this point in the history
  15. Comment routeSegments

    bhousel committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    491d57a View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    24515b4 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    32a2eab View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    a470298 View commit details
    Browse the repository at this point in the history
  19. Merge branch '2.x'

    bhousel committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    bc2e293 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    7f2c206 View commit details
    Browse the repository at this point in the history
  21. Merge branch '2.x'

    bhousel committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    0b25258 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. Add privacy policy version check to context and splash screen

    (closes #7040)
    
    A few other minor things in this commit
    - migrated several ui modal files to ES6 syntax
    - switched the splash link from ideditor.org -> ideditor.blog
    bhousel committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    ada4fb5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e4ab7d7 View commit details
    Browse the repository at this point in the history
  3. Contributing notes on ES6

    bhousel committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    38ee538 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7a97200 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    917d0ba View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    813b711 View commit details
    Browse the repository at this point in the history
  7. Add derived data

    quincylvania committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    a474f02 View commit details
    Browse the repository at this point in the history
  8. Add to 2.17.0 changelog

    quincylvania committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    24a5f9a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    cd5837c View commit details
    Browse the repository at this point in the history
  10. Update temaki to v3.7.0 (close #7142)

    Update icon for bunker presets (close #7139)
    Update icon for Boat Store and Boatyard presets
    quincylvania committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    8210a80 View commit details
    Browse the repository at this point in the history
  11. Update changelog

    quincylvania committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    eb53f35 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. Merge branch '2.x'

    # Conflicts:
    #	css/80_app.css
    #	data/core.yaml
    #	dist/locales/en.json
    #	modules/ui/restore.js
    #	modules/ui/splash.js
    quincylvania committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    3157761 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f357023 View commit details
    Browse the repository at this point in the history
  3. Revert references to the v3 UI in the Keyboard Shortcuts menu

    Remove unused preset favoriting functionality
    quincylvania committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    f676923 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    11dfe7e View commit details
    Browse the repository at this point in the history
  5. Merge branch '2.x'

    # Conflicts:
    #	css/80_app.css
    #	modules/presets/index.js
    #	modules/ui/entity_editor.js
    #	modules/ui/preset_favorite_button.js
    #	modules/ui/top_toolbar.js
    quincylvania committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    8e3f841 View commit details
    Browse the repository at this point in the history
  6. Update derived data

    quincylvania committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    7902424 View commit details
    Browse the repository at this point in the history
  7. Fix issue where presets with special characters in their names could …

    …not be dragged around in the toolbar
    quincylvania committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    d305fce View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    96250be View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    af8f480 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    11507b8 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    4734194 View commit details
    Browse the repository at this point in the history
  12. Merge branch '2.x'

    # Conflicts:
    #	modules/ui/note_editor.js
    quincylvania committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    ef3ccca View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2019

  1. Configuration menu
    Copy the full SHA
    6eee7bf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a523f1d View commit details
    Browse the repository at this point in the history
  3. Update to temaki v3.8.0

    quincylvania committed Dec 21, 2019
    Configuration menu
    Copy the full SHA
    23d7e75 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ae33f4a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    11950a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2019

  1. Configuration menu
    Copy the full SHA
    ba59bdf View commit details
    Browse the repository at this point in the history
  2. Update to name-suggestion-index 3.5.0

    (closes #7157)
    bhousel committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    dcf7723 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ae7eadb View commit details
    Browse the repository at this point in the history
  4. Merge pull request #7147 from 51114u9/formats-bolivia

    Update address & phone formats in bolivia
    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    69b80a6 View commit details
    Browse the repository at this point in the history
  5. Add new presets for nsi 3.5.0

    - craft/cleaning.json
    - shop/camera.json
    - shop/flooring.json
    - shop/pottery.json
    - shop/tool_hire.json
    bhousel committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    66d5b5d View commit details
    Browse the repository at this point in the history
  6. update address format in Bolivia

    51114u9 authored and quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    2216ed6 View commit details
    Browse the repository at this point in the history
  7. update phone format in Bolivia

    51114u9 authored and quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    ef2ecc3 View commit details
    Browse the repository at this point in the history
  8. Update changelog

    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    8452232 View commit details
    Browse the repository at this point in the history
  9. Update changelog

    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    994b9af View commit details
    Browse the repository at this point in the history
  10. Update changelog

    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    820dfbd View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    24b82e9 View commit details
    Browse the repository at this point in the history
  12. npm run imagery

    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    79bcc4a View commit details
    Browse the repository at this point in the history
  13. vA.B.C

    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    1e90212 View commit details
    Browse the repository at this point in the history
  14. Revert "vA.B.C"

    This reverts commit 1e90212.
    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    6f7f2ab View commit details
    Browse the repository at this point in the history
  15. v2.17.0

    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    7b7a42c View commit details
    Browse the repository at this point in the history
  16. Merge branch '2.x'

    # Conflicts:
    #	modules/ui/tools/undo_redo.js
    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    1b5f51d View commit details
    Browse the repository at this point in the history
  17. Fix errant CSS

    quincylvania committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    acfd1af View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2019

  1. Added peruvian phone format

    sguinetti committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    7463ce3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    619417c View commit details
    Browse the repository at this point in the history
  3. Update AU phone format

    tastrax committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    f6273bf View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.x'

    quincylvania committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    09c2c53 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b557461 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.x'

    quincylvania committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    bfc58ef View commit details
    Browse the repository at this point in the history
  7. Merge pull request #7160 from tastrax/patch-1

    Update AU phone format
    quincylvania committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    a657ab8 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2019

  1. Make link to privacy notice in splash screen translatable

    (closes #7171)
    bhousel committed Dec 25, 2019
    Configuration menu
    Copy the full SHA
    96b2b42 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2019

  1. Arabic + Latin Bidi labels

    mapmeld committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    e2001b0 View commit details
    Browse the repository at this point in the history
  2. numerals fix

    mapmeld committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    345ee6b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c458456 View commit details
    Browse the repository at this point in the history
  4. Add more fields to the tourism=camp_site preset (close #7169)

    Add Backcountry Camping Area and Group Camping Area presets
    Add Hot Water field to the Shower preset
    Deprecate low usage `showers` tag in favor of `shower`
    quincylvania committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    2c9aa35 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #7182 from Georeactor/2.x

    Arabic + Latin combined labels
    quincylvania committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    8555dcc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6208998 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1a2539f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1546b31 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2019

  1. Configuration menu
    Copy the full SHA
    7d02dcb View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2019

  1. Merge pull request #7192 from hikemaniac/shop-doors

    Add a preset for shop=doors
    quincylvania committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    42182d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    15cc88f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    577b849 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    92472b7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    450547b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7897a56 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    421426e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    48f4462 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2019

  1. Add warnings about duplicate keyboard shortcuts when building transla…

    …tions (close #7185)
    
    Update translations
    quincylvania committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    c8ce5eb View commit details
    Browse the repository at this point in the history
  2. Fix JavaScript error that could cause validation warnings to appear u…

    …nexpectedly (close #7166)
    
    Add code test to account for deprecated tags with no replacement
    quincylvania committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    31941e9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    11c45a1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c735dc8 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2020

  1. Configuration menu
    Copy the full SHA
    e284273 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    971aa13 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b140edc View commit details
    Browse the repository at this point in the history
  4. Merge pull request #7159 from sguinetti/2.x

    Update address & phone formats in Peru
    quincylvania committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    2efb6bc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    66a2c10 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f36356e View commit details
    Browse the repository at this point in the history
  7. Update D3 to 5.15.0 (close #7191)

    Update rolup/plugin-buble to 0.21.0 (close #7151)
    quincylvania committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    a760a8f View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. Configuration menu
    Copy the full SHA
    ec98a06 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a3b3df View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.x'

    # Conflicts:
    #	dist/locales/en.json
    #	modules/ui/splash.js
    quincylvania committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    77a69d7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dd2ad8f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fa2b891 View commit details
    Browse the repository at this point in the history
  6. Fix ImproveOSM request payload

    - 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
    kymckay committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    820e86a View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Add Secondhand Clothing Store preset (close #7164)

    Add Used Car Dealership preset
    Deprecate clothes=second_hand when used with shop=clothes
    quincylvania committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    b8e7fa2 View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.x'

    quincylvania committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    e1b8f1b View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Configuration menu
    Copy the full SHA
    9531c2a View commit details
    Browse the repository at this point in the history