Nikola Plesa ca7e44d2f0 Fix merge conflicts

2020-10-15 18:15:57 +02:00

..

actions

Fix potential JavaScript error

2020-10-09 10:24:53 -04:00

behavior

Add plural form support for multiselection page title (close #8026)

2020-09-27 18:42:27 -04:00

core

Fix a new typo which snuck in

2020-10-05 23:23:16 +01:00

geo

Fix export of geoVecLengthSquare

2020-08-11 11:47:04 +02:00

modes

Support Downgrade and Delete operations at the same time (close #7682)

2020-09-28 17:19:40 -04:00

operations

Highlight related but unselected features when hovering over operations in the edit menu (close #8034)

2020-09-30 16:46:13 -04:00

osm

Deprecate vending=parcel_mail_in;parcel_pickup -> vending=parcel_pickup;parcel_mail_in (close #7988)

2020-09-28 16:07:11 -04:00

presets

Add lang attribute to more display text (re: #7963)

2020-09-24 11:34:33 -04:00

renderer

Fix merge conflicts

2020-10-15 18:15:57 +02:00

services

Merge branch 'develop' into photo-filter-temp

2020-10-12 16:16:32 -04:00

svg

Merge branch 'develop' into photo-filter-temp

2020-10-12 16:16:32 -04:00

ui

Fix merge conflicts

2020-10-15 18:15:57 +02:00

util

Display the expected preset name for the mismatched geometry issue messages (close #8018)

2020-09-24 08:58:45 -04:00

validations

Merge pull request #7752 from peternewman/patch-6

2020-10-05 14:02:19 -04:00

id.js

…

index.js

…