]> git.openstreetmap.org Git - rails.git/log
rails.git
6 months agoMerge remote-tracking branch 'upstream/pull/4860'
Tom Hughes [Wed, 29 May 2024 18:18:23 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/4860'

6 months agoRe-enable autocomplete for passwords
Andy Allan [Wed, 29 May 2024 17:49:30 +0000 (18:49 +0100)]
Re-enable autocomplete for passwords

Regression for c4347c8d9a10bf5c141ad7d355594b93e20545f6

Thankfully browsers ignore this for login fields, but it shouldn't
be turned off anyway.

6 months agoRe-enable translations for password field
Andy Allan [Wed, 29 May 2024 17:48:01 +0000 (18:48 +0100)]
Re-enable translations for password field

Fixes regression introduced in c4347c8d9a10bf5c141ad7d355594b93e20545f6

6 months agoMerge remote-tracking branch 'upstream/pull/4859'
Tom Hughes [Wed, 29 May 2024 17:47:04 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4859'

6 months agoMerge remote-tracking branch 'upstream/pull/4853'
Tom Hughes [Wed, 29 May 2024 16:58:21 +0000 (17:58 +0100)]
Merge remote-tracking branch 'upstream/pull/4853'

6 months agoMerge remote-tracking branch 'upstream/pull/4849'
Tom Hughes [Wed, 29 May 2024 16:52:40 +0000 (17:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4849'

6 months agoMove check_api_readable to api_controller
Andy Allan [Wed, 29 May 2024 13:54:16 +0000 (14:54 +0100)]
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.

6 months agoTest the versions and capabilities api in various statuses
Andy Allan [Wed, 29 May 2024 13:45:35 +0000 (14:45 +0100)]
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.

6 months agoStandardise on avoiding except lists for check_api_readable
Andy Allan [Wed, 29 May 2024 13:33:20 +0000 (14:33 +0100)]
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.

6 months agoRemove duplicate database status checks
Andy Allan [Wed, 29 May 2024 13:50:48 +0000 (14:50 +0100)]
Remove duplicate database status checks

These are already done as part of the api checks

6 months agoAdd api_status checks for user preferences API
Andy Allan [Wed, 29 May 2024 13:32:12 +0000 (14:32 +0100)]
Add api_status checks for user preferences API

6 months agoMerge pull request #4856 from tyrasd/patch-2
Andy Allan [Wed, 29 May 2024 12:14:10 +0000 (13:14 +0100)]
Merge pull request #4856 from tyrasd/patch-2

reintroduce unsafe-eval CSP rule for iD (Mapillary layer)

6 months agoreintroduce unsafe-eval CSP rule for iD
Martin Raifer [Wed, 29 May 2024 09:26:08 +0000 (11:26 +0200)]
reintroduce unsafe-eval CSP rule for iD

fixes https://github.com/openstreetmap/iD/issues/10265

6 months agoFixed "auth_button_preferred alignment" issue described in #4773
Nenad Vujicic [Mon, 27 May 2024 13:21:15 +0000 (15:21 +0200)]
Fixed "auth_button_preferred alignment" issue described in #4773

6 months agoBump osm-community-index from 5.7.0 to 5.7.1
dependabot[bot] [Tue, 28 May 2024 23:29:15 +0000 (23:29 +0000)]
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>
6 months agoFix new rubocop warnings
Tom Hughes [Tue, 28 May 2024 16:39:33 +0000 (17:39 +0100)]
Fix new rubocop warnings

6 months agoUpdate bundle
Tom Hughes [Tue, 28 May 2024 16:30:50 +0000 (17:30 +0100)]
Update bundle

6 months agoMerge remote-tracking branch 'upstream/pull/4848'
Tom Hughes [Tue, 28 May 2024 07:15:49 +0000 (08:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4848'

6 months agoAdded gps.tile.openstreetmap.org as allowed source for images
Dimitar [Tue, 28 May 2024 07:12:31 +0000 (10:12 +0300)]
Added gps.tile.openstreetmap.org as allowed source for images

Resolves #4845

6 months agoMerge remote-tracking branch 'upstream/pull/4842'
Tom Hughes [Mon, 27 May 2024 14:11:16 +0000 (15:11 +0100)]
Merge remote-tracking branch 'upstream/pull/4842'

6 months agoMerge remote-tracking branch 'upstream/pull/4828'
Tom Hughes [Mon, 27 May 2024 14:05:43 +0000 (15:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4828'

6 months agoMerge remote-tracking branch 'upstream/pull/4846'
Tom Hughes [Mon, 27 May 2024 14:00:51 +0000 (15:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4846'

6 months agoAdd proper referrer for authorization scenario
Milan Cvetkovic [Mon, 27 May 2024 12:38:06 +0000 (12:38 +0000)]
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.

6 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 May 2024 12:17:16 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

6 months agoMerge remote-tracking branch 'upstream/pull/4844'
Tom Hughes [Mon, 27 May 2024 09:52:32 +0000 (10:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4844'

6 months agoMerge remote-tracking branch 'upstream/pull/4838'
Tom Hughes [Mon, 27 May 2024 09:48:30 +0000 (10:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4838'

6 months agoMerge remote-tracking branch 'upstream/pull/4837'
Tom Hughes [Mon, 27 May 2024 09:46:38 +0000 (10:46 +0100)]
Merge remote-tracking branch 'upstream/pull/4837'

6 months agoMerge remote-tracking branch 'upstream/pull/4836'
Tom Hughes [Mon, 27 May 2024 09:44:26 +0000 (10:44 +0100)]
Merge remote-tracking branch 'upstream/pull/4836'

6 months agoMerge remote-tracking branch 'upstream/pull/4835'
Tom Hughes [Mon, 27 May 2024 09:42:50 +0000 (10:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4835'

6 months agoMerge remote-tracking branch 'upstream/pull/4841'
Tom Hughes [Mon, 27 May 2024 09:33:34 +0000 (10:33 +0100)]
Merge remote-tracking branch 'upstream/pull/4841'

6 months agoMerge remote-tracking branch 'upstream/pull/4840'
Tom Hughes [Mon, 27 May 2024 09:31:33 +0000 (10:31 +0100)]
Merge remote-tracking branch 'upstream/pull/4840'

6 months agoReplace png directions icon with inline svg
Anton Khorev [Mon, 27 May 2024 01:20:39 +0000 (04:20 +0300)]
Replace png directions icon with inline svg

6 months agoInline welcome/fixthemap sprites
Anton Khorev [Mon, 27 May 2024 00:16:33 +0000 (03:16 +0300)]
Inline welcome/fixthemap sprites

6 months agoReplace way icon path with line and circles
Anton Khorev [Mon, 27 May 2024 00:01:24 +0000 (03:01 +0300)]
Replace way icon path with line and circles

6 months agoRound node icon coordinate
Anton Khorev [Sun, 26 May 2024 23:56:45 +0000 (02:56 +0300)]
Round node icon coordinate

6 months agoDecrease image width and height
Anton Khorev [Mon, 20 May 2024 16:48:14 +0000 (19:48 +0300)]
Decrease image width and height

6 months agoGroup elements of rules and questions icons
Anton Khorev [Mon, 20 May 2024 16:36:10 +0000 (19:36 +0300)]
Group elements of rules and questions icons

6 months agoGroup elements of tag icon
Anton Khorev [Mon, 20 May 2024 16:34:16 +0000 (19:34 +0300)]
Group elements of tag icon

6 months agoGroup elements of way icon
Anton Khorev [Mon, 20 May 2024 16:11:04 +0000 (19:11 +0300)]
Group elements of way icon

6 months agoGroup elements of node icon
Anton Khorev [Mon, 20 May 2024 16:05:24 +0000 (19:05 +0300)]
Group elements of node icon

6 months agoGroup elements of cross icon
Anton Khorev [Mon, 20 May 2024 15:47:53 +0000 (18:47 +0300)]
Group elements of cross icon

6 months agoGroup elements of check icon
Anton Khorev [Mon, 20 May 2024 15:46:07 +0000 (18:46 +0300)]
Group elements of check icon

6 months agoRemove outer group
Anton Khorev [Mon, 20 May 2024 15:44:13 +0000 (18:44 +0300)]
Remove outer group

6 months agoRemove vertical translation
Anton Khorev [Mon, 20 May 2024 15:43:19 +0000 (18:43 +0300)]
Remove vertical translation

6 months agoReplace cubic bezier approximations of circles with circles
Anton Khorev [Mon, 20 May 2024 15:29:50 +0000 (18:29 +0300)]
Replace cubic bezier approximations of circles with circles

6 months agoRemove invisible elements
Anton Khorev [Mon, 20 May 2024 15:27:25 +0000 (18:27 +0300)]
Remove invisible elements

6 months agoRemove reference to a missing filter
Anton Khorev [Mon, 20 May 2024 15:24:02 +0000 (18:24 +0300)]
Remove reference to a missing filter

6 months agoTruncate username in user menu
Anton Khorev [Sun, 26 May 2024 22:59:32 +0000 (01:59 +0300)]
Truncate username in user menu

6 months agoAdjust vertical alignment of user button contents
Anton Khorev [Fri, 24 May 2024 17:04:53 +0000 (20:04 +0300)]
Adjust vertical alignment of user button contents

6 months agoIncrease secondary nav item padding to compensate removed whitespace
Anton Khorev [Fri, 24 May 2024 16:48:46 +0000 (19:48 +0300)]
Increase secondary nav item padding to compensate removed whitespace

6 months agoUse Bootstrap .nav in secondary header navigation
Anton Khorev [Fri, 24 May 2024 16:41:55 +0000 (19:41 +0300)]
Use Bootstrap .nav in secondary header navigation

6 months agoupdate script-src CSP rules for iD
Martin Raifer [Sun, 26 May 2024 13:24:57 +0000 (15:24 +0200)]
update script-src CSP rules for iD

6 months agoallow data URIs for images in iD
Martin Raifer [Sun, 26 May 2024 12:26:31 +0000 (14:26 +0200)]
allow data URIs for images in iD

6 months agoRemove unused #container css
Anton Khorev [Sun, 26 May 2024 03:28:19 +0000 (06:28 +0300)]
Remove unused #container css

6 months agoReplace .btn-wrapper with Bootstrap gutters/gaps
Anton Khorev [Sun, 26 May 2024 02:38:27 +0000 (05:38 +0300)]
Replace .btn-wrapper with Bootstrap gutters/gaps

6 months agoRemove unused .browse_status css class
Anton Khorev [Sun, 26 May 2024 02:08:11 +0000 (05:08 +0300)]
Remove unused .browse_status css class

6 months agoRemove custom css from "Load Data" button
Anton Khorev [Sun, 26 May 2024 01:51:42 +0000 (04:51 +0300)]
Remove custom css from "Load Data" button

6 months agoMerge remote-tracking branch 'upstream/pull/4832'
Tom Hughes [Sat, 25 May 2024 13:43:04 +0000 (14:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4832'

6 months agoMerge remote-tracking branch 'upstream/pull/4833'
Tom Hughes [Sat, 25 May 2024 13:31:44 +0000 (14:31 +0100)]
Merge remote-tracking branch 'upstream/pull/4833'

6 months agoMerge remote-tracking branch 'upstream/pull/4829'
Tom Hughes [Sat, 25 May 2024 13:30:06 +0000 (14:30 +0100)]
Merge remote-tracking branch 'upstream/pull/4829'

6 months agoMerge remote-tracking branch 'upstream/pull/4831'
Tom Hughes [Sat, 25 May 2024 13:27:27 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/4831'

6 months agoMerge remote-tracking branch 'upstream/pull/4830'
Tom Hughes [Sat, 25 May 2024 13:27:21 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/4830'

6 months agoRemove custom css from note descriptions
Anton Khorev [Sat, 25 May 2024 02:07:24 +0000 (05:07 +0300)]
Remove custom css from note descriptions

6 months agoRemove custom css from "Enable overlays" text
Anton Khorev [Sat, 25 May 2024 01:47:32 +0000 (04:47 +0300)]
Remove custom css from "Enable overlays" text

6 months agoBump osm-community-index from 5.6.3 to 5.7.0
dependabot[bot] [Fri, 24 May 2024 23:50:16 +0000 (23:50 +0000)]
Bump osm-community-index from 5.6.3 to 5.7.0

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.6.3 to 5.7.0.
- [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.6.3...v5.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
6 months agoBump leaflet.locatecontrol from 0.81.0 to 0.81.1
dependabot[bot] [Fri, 24 May 2024 23:50:07 +0000 (23:50 +0000)]
Bump leaflet.locatecontrol from 0.81.0 to 0.81.1

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.81.0 to 0.81.1.
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.81.0...v0.81.1)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
6 months agoKeep header h1 height equal to default header height
Anton Khorev [Fri, 24 May 2024 18:18:27 +0000 (21:18 +0300)]
Keep header h1 height equal to default header height

6 months agoAdjust vertical alignment of user button contents
Anton Khorev [Fri, 24 May 2024 17:04:53 +0000 (20:04 +0300)]
Adjust vertical alignment of user button contents

6 months agoIncrease secondary nav item padding to compensate removed whitespace
Anton Khorev [Fri, 24 May 2024 16:48:46 +0000 (19:48 +0300)]
Increase secondary nav item padding to compensate removed whitespace

6 months agoUse Bootstrap .nav in secondary header navigation
Anton Khorev [Fri, 24 May 2024 16:41:55 +0000 (19:41 +0300)]
Use Bootstrap .nav in secondary header navigation

6 months agoMerge remote-tracking branch 'upstream/pull/4826'
Tom Hughes [Fri, 24 May 2024 10:59:52 +0000 (11:59 +0100)]
Merge remote-tracking branch 'upstream/pull/4826'

6 months agoFixed "Tab alignment" issue described in #4773
Nenad Vujicic [Thu, 23 May 2024 14:26:19 +0000 (16:26 +0200)]
Fixed "Tab alignment" issue described in #4773

Fixed "Tab alignment" for "Sign up" button issue described in #4773 and #4826

6 months agoMerge remote-tracking branch 'upstream/pull/4826'
Tom Hughes [Fri, 24 May 2024 10:10:03 +0000 (11:10 +0100)]
Merge remote-tracking branch 'upstream/pull/4826'

6 months agoFixed "Tab alignment" for "Sign up" button issue described in #4773 and #4826
Nenad Vujicic [Fri, 24 May 2024 09:44:33 +0000 (11:44 +0200)]
Fixed "Tab alignment" for "Sign up" button issue described in #4773 and #4826

6 months agoFixed "Tab alignment" issue described in #4773
Nenad Vujicic [Thu, 23 May 2024 14:26:19 +0000 (16:26 +0200)]
Fixed "Tab alignment" issue described in #4773

6 months agoMerge remote-tracking branch 'upstream/pull/4827'
Tom Hughes [Thu, 23 May 2024 17:25:29 +0000 (18:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4827'

6 months agoFixed "Top menu buttons" issue mentioned in the #4773
Nenad Vujicic [Thu, 23 May 2024 15:02:44 +0000 (17:02 +0200)]
Fixed "Top menu buttons" issue mentioned in the #4773

6 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 May 2024 12:19:37 +0000 (14:19 +0200)]
Localisation updates from https://translatewiki.net.

6 months agoMerge remote-tracking branch 'upstream/pull/4823'
Tom Hughes [Wed, 22 May 2024 17:37:01 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4823'

6 months agoMerge pull request #4627 from tomhughes/security-policy
Andy Allan [Wed, 22 May 2024 15:54:18 +0000 (16:54 +0100)]
Merge pull request #4627 from tomhughes/security-policy

Switch to using rails builtin content security policy support

6 months agoSwitch to using rails builtin content security policy support
Tom Hughes [Thu, 21 Mar 2024 20:32:12 +0000 (20:32 +0000)]
Switch to using rails builtin content security policy support

6 months agoMerge pull request #4756 from tomhughes/text-muted
Andy Allan [Wed, 22 May 2024 11:32:38 +0000 (12:32 +0100)]
Merge pull request #4756 from tomhughes/text-muted

Replace deprecated text-muted class with text-body-secondary

6 months agoMerge pull request #4758 from tomhughes/login-referer
Andy Allan [Wed, 22 May 2024 11:09:31 +0000 (12:09 +0100)]
Merge pull request #4758 from tomhughes/login-referer

Stop using the session to persist the referer during login

6 months agoMerge pull request #4816 from tomhughes/login-focus
Andy Allan [Wed, 22 May 2024 11:06:38 +0000 (12:06 +0100)]
Merge pull request #4816 from tomhughes/login-focus

Make the login and signup screens focus on the first input

6 months agoReplace deprecated text-muted class with text-body-secondary
Tom Hughes [Mon, 6 May 2024 08:49:51 +0000 (09:49 +0100)]
Replace deprecated text-muted class with text-body-secondary

6 months agoMerge pull request #4824 from AntonKhorev/no-user-button
Andy Allan [Wed, 22 May 2024 09:54:32 +0000 (10:54 +0100)]
Merge pull request #4824 from AntonKhorev/no-user-button

Remove unnecessary user menu wrapper

6 months agoRemove unnecessary user menu wrapper
Anton Khorev [Tue, 21 May 2024 22:38:21 +0000 (01:38 +0300)]
Remove unnecessary user menu wrapper

6 months agoUse .icon-link to align logo
Anton Khorev [Tue, 21 May 2024 17:43:55 +0000 (20:43 +0300)]
Use .icon-link to align logo

6 months agoMerge remote-tracking branch 'upstream/pull/4822'
Tom Hughes [Tue, 21 May 2024 17:34:52 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4822'

6 months agoDrop bogus html.dir from ne locale
Tom Hughes [Tue, 21 May 2024 17:29:06 +0000 (18:29 +0100)]
Drop bogus html.dir from ne locale

6 months agoFix new rubocop warnings
Tom Hughes [Tue, 21 May 2024 17:21:56 +0000 (18:21 +0100)]
Fix new rubocop warnings

6 months agoUpdate bundle
Tom Hughes [Tue, 21 May 2024 17:06:06 +0000 (18:06 +0100)]
Update bundle

6 months agoRemove inbox template and anchor id
Anton Khorev [Tue, 21 May 2024 16:57:16 +0000 (19:57 +0300)]
Remove inbox template and anchor id

6 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 May 2024 12:14:53 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

6 months agoMake the login and signup screens focus on the first input
Tom Hughes [Sun, 19 May 2024 18:37:30 +0000 (19:37 +0100)]
Make the login and signup screens focus on the first input

Fixes #4814

6 months agoMerge remote-tracking branch 'upstream/pull/4795'
Tom Hughes [Sun, 19 May 2024 18:21:45 +0000 (19:21 +0100)]
Merge remote-tracking branch 'upstream/pull/4795'

6 months agoMerge remote-tracking branch 'upstream/pull/4812'
Tom Hughes [Sun, 19 May 2024 17:58:46 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/4812'

6 months agoMerge remote-tracking branch 'upstream/pull/4811'
Tom Hughes [Sun, 19 May 2024 17:50:15 +0000 (18:50 +0100)]
Merge remote-tracking branch 'upstream/pull/4811'

6 months agoMerge remote-tracking branch 'upstream/pull/4810'
Tom Hughes [Sun, 19 May 2024 17:47:56 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4810'

6 months agoMerge remote-tracking branch 'upstream/pull/4808'
Tom Hughes [Sun, 19 May 2024 17:46:58 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/4808'