Commit graph

14740 commits

Author SHA1 Message Date
Tom Hughes
6f1a783900 Merge remote-tracking branch 'upstream/pull/4853' 2024-05-29 17:58:21 +01:00
Tom Hughes
b5dd8c19b9 Merge remote-tracking branch 'upstream/pull/4849' 2024-05-29 17:52:40 +01:00
Andy Allan
c1cccd40fc Move check_api_readable to api_controller
It's easier to skip the check in the two places that we need to, and
include it by default everywhere else.
2024-05-29 14:54:16 +01:00
Andy Allan
0bbfe922ea Test the versions and capabilities api in various statuses
These both need to keep working, even when the rest of the api is
unavailable, since that's how we communicate that status with the
api clients.
2024-05-29 14:51:47 +01:00
Andy Allan
f2aaec4735 Standardise on avoiding except lists for check_api_readable
Although this is technically duplicative, it's much easier to read
and therefore to maintain, particularly if you put the _readable one
first.
2024-05-29 14:51:47 +01:00
Andy Allan
995bfa91ff Remove duplicate database status checks
These are already done as part of the api checks
2024-05-29 14:51:20 +01:00
Andy Allan
91fc588556 Add api_status checks for user preferences API 2024-05-29 14:51:20 +01:00
Andy Allan
9004c2d28d
Merge pull request #4856 from tyrasd/patch-2
reintroduce unsafe-eval CSP rule for iD (Mapillary layer)
2024-05-29 13:14:10 +01:00
Martin Raifer
ed15352f56
reintroduce unsafe-eval CSP rule for iD
fixes https://github.com/openstreetmap/iD/issues/10265
2024-05-29 11:26:08 +02:00
Nenad Vujicic
1d35daa0b5 Fixed "auth_button_preferred alignment" issue described in #4773 2024-05-29 11:20:13 +02:00
dependabot[bot]
511f9f7d7c
Bump osm-community-index from 5.7.0 to 5.7.1
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.7.0...v5.7.1)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-28 23:29:15 +00:00
Tom Hughes
d3d0da0328 Fix new rubocop warnings 2024-05-28 17:39:33 +01:00
Tom Hughes
d21cbc0464 Update bundle 2024-05-28 17:30:50 +01:00
Tom Hughes
bd3507291c Merge remote-tracking branch 'upstream/pull/4848' 2024-05-28 08:15:49 +01:00
Dimitar
00251a6621
Added gps.tile.openstreetmap.org as allowed source for images
Resolves #4845
2024-05-28 10:12:31 +03:00
Tom Hughes
a90302aecf Merge remote-tracking branch 'upstream/pull/4842' 2024-05-27 15:11:16 +01:00
Tom Hughes
2c9043283e Merge remote-tracking branch 'upstream/pull/4828' 2024-05-27 15:05:43 +01:00
Tom Hughes
49b98c1fdd Merge remote-tracking branch 'upstream/pull/4846' 2024-05-27 15:00:51 +01:00
Milan Cvetkovic
22bceff40b Add proper referrer for authorization scenario
Fixes the following:
- `users_controller#new` loses referer in authorization scenario, when it was invoked after social signup succeded
- the second invocation of `auth_success`, triggered by re-authorization initiated from `users_controller#create`
  does not have referrer field set
- as a result, the final welcome screen does not offer final authorization, and drops into ID instead

Introduced by #4758.
2024-05-27 13:31:20 +00:00
translatewiki.net
3765c23518 Localisation updates from https://translatewiki.net. 2024-05-27 14:17:16 +02:00
Tom Hughes
8e5dbbc09f Merge remote-tracking branch 'upstream/pull/4844' 2024-05-27 10:52:32 +01:00
Tom Hughes
7a5524c854 Merge remote-tracking branch 'upstream/pull/4838' 2024-05-27 10:48:30 +01:00
Tom Hughes
26af28b7cb Merge remote-tracking branch 'upstream/pull/4837' 2024-05-27 10:46:38 +01:00
Tom Hughes
94afd0df1c Merge remote-tracking branch 'upstream/pull/4836' 2024-05-27 10:44:26 +01:00
Tom Hughes
d8332d0572 Merge remote-tracking branch 'upstream/pull/4835' 2024-05-27 10:42:50 +01:00
Tom Hughes
c834f9afe7 Merge remote-tracking branch 'upstream/pull/4841' 2024-05-27 10:33:34 +01:00
Tom Hughes
c8748442ae Merge remote-tracking branch 'upstream/pull/4840' 2024-05-27 10:31:33 +01:00
Anton Khorev
0b0f4b36ab Replace png directions icon with inline svg 2024-05-27 04:34:06 +03:00
Anton Khorev
1cf4bf5d98 Inline welcome/fixthemap sprites 2024-05-27 03:29:34 +03:00
Anton Khorev
e459aa9cdd Replace way icon path with line and circles 2024-05-27 03:01:24 +03:00
Anton Khorev
38ca6a9f14 Round node icon coordinate 2024-05-27 02:56:45 +03:00
Anton Khorev
dfa1255fee Decrease image width and height 2024-05-27 02:24:08 +03:00
Anton Khorev
4593f00d41 Group elements of rules and questions icons 2024-05-27 02:24:08 +03:00
Anton Khorev
2926be3755 Group elements of tag icon 2024-05-27 02:24:08 +03:00
Anton Khorev
e700dc3432 Group elements of way icon 2024-05-27 02:24:08 +03:00
Anton Khorev
059d395006 Group elements of node icon 2024-05-27 02:24:08 +03:00
Anton Khorev
ffa5492f66 Group elements of cross icon 2024-05-27 02:24:08 +03:00
Anton Khorev
689e629ded Group elements of check icon 2024-05-27 02:24:08 +03:00
Anton Khorev
69c2f64c69 Remove outer group 2024-05-27 02:24:08 +03:00
Anton Khorev
494ea6f09f Remove vertical translation 2024-05-27 02:24:08 +03:00
Anton Khorev
1f35f4ca8c Replace cubic bezier approximations of circles with circles 2024-05-27 02:24:08 +03:00
Anton Khorev
8a88351a83 Remove invisible elements 2024-05-27 02:24:08 +03:00
Anton Khorev
95976f9eb1 Remove reference to a missing filter 2024-05-27 02:24:08 +03:00
Anton Khorev
b79e4f04b9 Truncate username in user menu 2024-05-27 01:59:32 +03:00
Anton Khorev
037e05d737 Adjust vertical alignment of user button contents 2024-05-27 01:47:25 +03:00
Anton Khorev
93d3345e25 Increase secondary nav item padding to compensate removed whitespace 2024-05-27 01:47:25 +03:00
Anton Khorev
f06e37bb68 Use Bootstrap .nav in secondary header navigation 2024-05-27 01:47:25 +03:00
Martin Raifer
416fca5703
update script-src CSP rules for iD 2024-05-26 15:24:57 +02:00
Martin Raifer
4ef6876b32
allow data URIs for images in iD 2024-05-26 15:01:30 +02:00
Anton Khorev
aac2829ea8 Remove unused #container css 2024-05-26 06:28:19 +03:00