Commit graph

10996 commits

Author SHA1 Message Date
Andy Allan
4dc584421a Refactor traces list display
Ideas taken from #3036
2021-03-17 18:04:00 +00:00
Andy Allan
6f70c13062 Use .add method for adding errors
This avoids a deprecation warning on rails 6.1
2021-03-17 17:09:34 +00:00
Andy Allan
a2ddcda911 Merge branch 'pull/3112' 2021-03-17 16:07:43 +00:00
Andy Allan
10c9f18bc2 Remove unused translations 2021-03-17 16:06:26 +00:00
Tom Hughes
12db71157a Merge remote-tracking branch 'upstream/pull/3137' 2021-03-17 15:56:27 +00:00
Andy Allan
0d313a9e03 Update code example to follow rubocop recommendations
Just for consistency with what you would see elsewhere in the codebase
2021-03-17 15:37:55 +00:00
Tom Hughes
cb422209a4 Update bundle 2021-03-16 11:56:43 +00:00
Tom Hughes
e04ddc3e15 Merge remote-tracking branch 'upstream/pull/3133' 2021-03-16 11:07:47 +00:00
Tom Hughes
789ac73905 Merge remote-tracking branch 'upstream/pull/3132' 2021-03-16 11:07:45 +00:00
Tom Hughes
93b8c47c8f Reject referers that do not include an absolute path 2021-03-16 11:07:34 +00:00
translatewiki.net
7967c20673 Localisation updates from https://translatewiki.net. 2021-03-15 19:08:21 +01:00
dependabot[bot]
b2134f2947
Bump eslint from 7.21.0 to 7.22.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.21.0 to 7.22.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.21.0...v7.22.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-15 05:02:22 +00:00
dependabot[bot]
f5677783ae
Bump leaflet.locatecontrol from 0.72.2 to 0.73.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.72.2 to 0.73.0.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.72.2...v0.73.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-15 05:02:04 +00:00
Tom Hughes
afb22209bf Allow form submission to any location from the login page
This allows openid login to work on browsers like chrome that enforce
the form-action rule for redirect POST requests.

Fixes #3131
2021-03-14 10:18:32 +00:00
Tom Hughes
7791283217 Merge remote-tracking branch 'upstream/pull/3130' 2021-03-14 09:41:59 +00:00
Simon Poole
37df9af7f7
Remove GL and SH cantonal WMS servers from black list
The previously restrictively licensed material is now available on relatively open terms directly from swisstopo per 1. March 2021, so these entries can be removed.
2021-03-13 20:25:43 +01:00
Michal Migurski
f5f84027fa Chasing parse errors 2021-03-13 10:49:52 -08:00
Michal Migurski
b7618b13dc Added missing translation 2021-03-13 10:49:52 -08:00
Michal Migurski
68896d5b2f Switched to hash rockets syntax per erblint feedback 2021-03-13 10:49:52 -08:00
Michal Migurski
d28ab8d3f2 Replaced H2 messages header links with Bootstrap nav links
Following suggestion from https://github.com/openstreetmap/openstreetmap-website/issues/2962#issuecomment-768985393
2021-03-13 10:49:52 -08:00
translatewiki.net
f2cb3b09c8 Localisation updates from https://translatewiki.net. 2021-03-12 07:06:49 +01:00
Tom Hughes
01b84a8107 Merge remote-tracking branch 'upstream/pull/3125' 2021-03-10 14:55:58 +00:00
Andy Allan
38ad8fbc36 Use login_path instead of explicit controller and actions
This makes future refactoring easier.
2021-03-10 14:31:55 +00:00
Tom Hughes
b750c31d47 Update bundle 2021-03-10 10:38:13 +00:00
Morten Bruhn
6f09f5d49c Added natural=peninsula 2021-03-09 20:44:21 +01:00
Morten Bruhn
0067ccaefb Added natural=coastline 2021-03-09 20:42:57 +01:00
translatewiki.net
aa5790655e Localisation updates from https://translatewiki.net. 2021-03-08 15:57:34 +01:00
Tom Hughes
6538f49994 Merge remote-tracking branch 'upstream/pull/3118' 2021-03-05 15:50:34 +00:00
Quincy Morgan
d16c4667ed Remove incidental additions 2021-03-05 10:37:22 -05:00
Quincy Morgan
9e98c9d41d Merge branch 'master' into iD-2.19.6 2021-03-05 10:30:24 -05:00
Tom Hughes
f87e9a1088 Remove swfobject from Vendorfile as it is no longer used 2021-03-04 14:46:02 +00:00
Tom Hughes
d8b9b6dd58 Merge remote-tracking branch 'upstream/pull/3121' 2021-03-04 13:45:34 +00:00
Tom Hughes
d66541124f Merge remote-tracking branch 'upstream/pull/3120' 2021-03-04 13:45:31 +00:00
translatewiki.net
1c2d0ba92d Localisation updates from https://translatewiki.net. 2021-03-04 14:05:49 +01:00
Andy Allan
18b8780f21 Remove CSS overrides for the login page at small screen sizes
Some of these selectors no longer apply, and the one that did just
made the behaviour worse, so they are all no longer required.
2021-03-04 11:09:16 +00:00
Andy Allan
9bd1d74091 Prevent input group wrapping when sidebar is resized
Fixes #3119
2021-03-04 11:04:47 +00:00
Quincy Morgan
d66ad4a455 Update to iD v2.19.6 2021-03-03 14:21:42 -05:00
Tom Hughes
dfeb93c9f8 Merge remote-tracking branch 'upstream/pull/3117' 2021-03-03 18:43:34 +00:00
Andy Allan
1c1bfd7488 Add a small margin before the changesets more button
See also #2717
2021-03-03 17:46:01 +00:00
Andy Allan
3fdf1e204a Remove unnecessary margin-tops 2021-03-03 17:16:31 +00:00
Andy Allan
926576881f Remove final uses of the deemphasize class 2021-03-03 15:51:11 +00:00
Andy Allan
952cf0fdb4 Remove the old richtext_area helper
This has been superseded by the `f.richtext_field` custom form builder.
2021-03-03 15:34:16 +00:00
Tom Hughes
2233edbcfa Use a 307 Temporary Redirect to redirect to authentication
When the user wants to enable an external authenticator we need
to redirect to omniauth but that now needs to be a POST so use a
redirect that preserves the POST method.

Fixes #3114
2021-03-03 09:27:33 +00:00
Tom Hughes
ff3a30d245 Fix new rubocop warnings 2021-03-02 08:24:15 +00:00
Tom Hughes
4eb2e318af Update bundle 2021-03-02 08:22:08 +00:00
Tom Hughes
00bd8be546 Merge remote-tracking branch 'upstream/pull/3113' 2021-03-02 08:14:16 +00:00
translatewiki.net
68e48d97ba Localisation updates from https://translatewiki.net. 2021-03-01 14:50:53 +01:00
dependabot[bot]
11317d635d
Bump eslint from 7.20.0 to 7.21.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.20.0 to 7.21.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.20.0...v7.21.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-01 05:05:49 +00:00
translatewiki.net
0072472607 Localisation updates from https://translatewiki.net. 2021-02-25 16:25:29 +01:00
Tom Hughes
8b9164644b Merge remote-tracking branch 'upstream/pull/3109' 2021-02-24 17:12:36 +00:00