]> git.openstreetmap.org Git - rails.git/log
rails.git
9 hours agoMerge remote-tracking branch 'upstream/pull/4889' master live
Tom Hughes [Tue, 11 Jun 2024 16:59:58 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/4889'

9 hours agoUpdate bundle
Tom Hughes [Tue, 11 Jun 2024 16:36:42 +0000 (17:36 +0100)]
Update bundle

15 hours agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 11 Jun 2024 10:47:19 +0000 (12:47 +0200)]
Localisation updates from https://translatewiki.net.

16 hours agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 11 Jun 2024 09:42:49 +0000 (11:42 +0200)]
Localisation updates from https://translatewiki.net.

36 hours agoMove diary comments index action to comments controller
Anton Khorev [Mon, 10 Jun 2024 13:09:07 +0000 (16:09 +0300)]
Move diary comments index action to comments controller

2 days agoMerge remote-tracking branch 'upstream/pull/4883'
Tom Hughes [Sun, 9 Jun 2024 14:37:17 +0000 (15:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4883'

2 days agoDrop dummy classes that are unneeded and don't work
Tom Hughes [Sun, 9 Jun 2024 13:54:29 +0000 (14:54 +0100)]
Drop dummy classes that are unneeded and don't work

2 days agoMerge remote-tracking branch 'upstream/pull/4875'
Tom Hughes [Sun, 9 Jun 2024 13:42:50 +0000 (14:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4875'

2 days agoMerge remote-tracking branch 'upstream/pull/4888'
Tom Hughes [Sun, 9 Jun 2024 10:52:56 +0000 (11:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4888'

2 days agoMerge remote-tracking branch 'upstream/pull/4886'
Tom Hughes [Sun, 9 Jun 2024 10:43:27 +0000 (11:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4886'

2 days agoMerge remote-tracking branch 'upstream/pull/4885'
Tom Hughes [Sun, 9 Jun 2024 10:40:44 +0000 (11:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4885'

3 days agoRedraw routing sprites
Anton Khorev [Thu, 16 May 2024 23:00:33 +0000 (02:00 +0300)]
Redraw routing sprites

4 days agoAdd note and diary comments counts to the user profile
Nenad Vujicic [Mon, 3 Jun 2024 12:58:23 +0000 (14:58 +0200)]
Add note and diary comments counts to the user profile

Fixes #1643

4 days agoDon't set width of richtext preview
Anton Khorev [Fri, 7 Jun 2024 15:00:09 +0000 (18:00 +0300)]
Don't set width of richtext preview

4 days agoRemove unused map link locale strings
Anton Khorev [Fri, 7 Jun 2024 10:15:42 +0000 (13:15 +0300)]
Remove unused map link locale strings

4 days agoDon't add site name to og:title when page title is provided
Anton Khorev [Fri, 7 Jun 2024 08:33:00 +0000 (11:33 +0300)]
Don't add site name to og:title when page title is provided

5 days agoMerge remote-tracking branch 'upstream/pull/4882'
Tom Hughes [Thu, 6 Jun 2024 18:09:15 +0000 (19:09 +0100)]
Merge remote-tracking branch 'upstream/pull/4882'

5 days agoMerge remote-tracking branch 'upstream/pull/4881'
Tom Hughes [Thu, 6 Jun 2024 17:35:48 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4881'

5 days agoAdd last edited date to user profile
Nenad Vujicic [Thu, 6 Jun 2024 12:35:31 +0000 (14:35 +0200)]
Add last edited date to user profile

Fixes #3437

5 days agoEnsure that Open Graph image url is absolute
Anton Khorev [Thu, 6 Jun 2024 15:01:23 +0000 (18:01 +0300)]
Ensure that Open Graph image url is absolute

5 days agoSet Open Graph image to first image for diary entries
Anton Khorev [Thu, 6 Jun 2024 14:28:57 +0000 (17:28 +0300)]
Set Open Graph image to first image for diary entries

5 days agoAdd image method to get first image from rich text
Anton Khorev [Thu, 6 Jun 2024 13:47:06 +0000 (16:47 +0300)]
Add image method to get first image from rich text

6 days agoMerge remote-tracking branch 'upstream/pull/4877'
Tom Hughes [Wed, 5 Jun 2024 17:37:57 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4877'

6 days agoMerge remote-tracking branch 'upstream/pull/4878'
Tom Hughes [Wed, 5 Jun 2024 17:36:30 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4878'

6 days agoMerge remote-tracking branch 'upstream/pull/4876'
Tom Hughes [Wed, 5 Jun 2024 17:34:06 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4876'

7 days agoUpdate to rails 7.1.3.4
Tom Hughes [Tue, 4 Jun 2024 23:06:53 +0000 (00:06 +0100)]
Update to rails 7.1.3.4

7 days agoUpdate bundle
Tom Hughes [Tue, 4 Jun 2024 16:07:19 +0000 (17:07 +0100)]
Update bundle

7 days agoMove changeset subscribe/unsubscribe locale strings out of javascripts
Anton Khorev [Tue, 4 Jun 2024 13:34:03 +0000 (16:34 +0300)]
Move changeset subscribe/unsubscribe locale strings out of javascripts

7 days agoWrite changeset subscribe/unsubscribe buttons using tag.button
Anton Khorev [Tue, 4 Jun 2024 13:28:26 +0000 (16:28 +0300)]
Write changeset subscribe/unsubscribe buttons using tag.button

7 days agoMove comment changeset locale string out of javascripts
Anton Khorev [Tue, 4 Jun 2024 13:17:20 +0000 (16:17 +0300)]
Move comment changeset locale string out of javascripts

7 days agoWrite changeset comment button using tag.button
Anton Khorev [Tue, 4 Jun 2024 13:15:18 +0000 (16:15 +0300)]
Write changeset comment button using tag.button

7 days agoMove show/hide changeset comment locale strings out of javascripts
Anton Khorev [Tue, 4 Jun 2024 13:07:25 +0000 (16:07 +0300)]
Move show/hide changeset comment locale strings out of javascripts

7 days agoFix setting "From" in directions form based on search query
Anton Khorev [Tue, 4 Jun 2024 12:49:56 +0000 (15:49 +0300)]
Fix setting "From" in directions form based on search query

7 days agoRemove Open Graph og:image:secure_url property
Anton Khorev [Tue, 4 Jun 2024 10:42:01 +0000 (13:42 +0300)]
Remove Open Graph og:image:secure_url property

7 days agoMerge remote-tracking branch 'upstream/pull/4871'
Tom Hughes [Tue, 4 Jun 2024 09:38:20 +0000 (10:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4871'

8 days agoMerge remote-tracking branch 'upstream/pull/4873'
Tom Hughes [Mon, 3 Jun 2024 19:26:13 +0000 (20:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4873'

8 days agoMerge remote-tracking branch 'upstream/pull/4870'
Tom Hughes [Mon, 3 Jun 2024 19:14:55 +0000 (20:14 +0100)]
Merge remote-tracking branch 'upstream/pull/4870'

8 days agoRemove .btn-sm from changeset comment button
Anton Khorev [Mon, 3 Jun 2024 15:17:22 +0000 (18:17 +0300)]
Remove .btn-sm from changeset comment button

8 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Jun 2024 12:17:15 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

8 days agoUse button elements that allow word wrap for note controls
Anton Khorev [Mon, 3 Jun 2024 10:40:11 +0000 (13:40 +0300)]
Use button elements that allow word wrap for note controls

8 days agoDecrease bottom padding of search form
Anton Khorev [Mon, 3 Jun 2024 09:29:34 +0000 (12:29 +0300)]
Decrease bottom padding of search form

8 days agoUse flex in routing form for vertical gaps
Anton Khorev [Mon, 3 Jun 2024 09:26:57 +0000 (12:26 +0300)]
Use flex in routing form for vertical gaps

8 days agoUse flex in routing form to fix marker column width
Anton Khorev [Mon, 3 Jun 2024 09:21:11 +0000 (12:21 +0300)]
Use flex in routing form to fix marker column width

8 days agoIncrease font size in directions controls
Anton Khorev [Mon, 3 Jun 2024 08:59:18 +0000 (11:59 +0300)]
Increase font size in directions controls

9 days agoMerge remote-tracking branch 'upstream/pull/4864'
Tom Hughes [Sun, 2 Jun 2024 10:19:16 +0000 (11:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4864'

9 days agoMerge remote-tracking branch 'upstream/pull/4868'
Tom Hughes [Sun, 2 Jun 2024 09:54:37 +0000 (10:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4868'

9 days agoMerge remote-tracking branch 'upstream/pull/4867'
Tom Hughes [Sun, 2 Jun 2024 09:52:43 +0000 (10:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4867'

9 days agoMerge remote-tracking branch 'upstream/pull/4866'
Tom Hughes [Sun, 2 Jun 2024 09:43:41 +0000 (10:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4866'

9 days agoMerge remote-tracking branch 'upstream/pull/4863'
Tom Hughes [Sun, 2 Jun 2024 09:41:20 +0000 (10:41 +0100)]
Merge remote-tracking branch 'upstream/pull/4863'

10 days agoInline svg sprites on about page
Anton Khorev [Sat, 1 Jun 2024 08:02:16 +0000 (11:02 +0300)]
Inline svg sprites on about page

10 days agoWrite closed note controls using submit_tag
Anton Khorev [Sat, 1 Jun 2024 06:05:19 +0000 (09:05 +0300)]
Write closed note controls using submit_tag

10 days agoIncrease font size in search form
Anton Khorev [Sat, 1 Jun 2024 04:28:00 +0000 (07:28 +0300)]
Increase font size in search form

10 days agoReplace search button text with svg icon
Anton Khorev [Sat, 1 Jun 2024 03:41:10 +0000 (06:41 +0300)]
Replace search button text with svg icon

11 days agoDon't include language prefix in wikipedia links
Anton Khorev [Sat, 1 Jun 2024 01:56:57 +0000 (04:56 +0300)]
Don't include language prefix in wikipedia links

11 days agoBump eslint from 9.3.0 to 9.4.0
dependabot[bot] [Fri, 31 May 2024 23:11:33 +0000 (23:11 +0000)]
Bump eslint from 9.3.0 to 9.4.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.3.0 to 9.4.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.3.0...v9.4.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
12 days agoMerge remote-tracking branch 'upstream/pull/4843'
Tom Hughes [Thu, 30 May 2024 15:33:59 +0000 (16:33 +0100)]
Merge remote-tracking branch 'upstream/pull/4843'

12 days agoMerge remote-tracking branch 'upstream/pull/4857'
Tom Hughes [Thu, 30 May 2024 15:22:38 +0000 (16:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4857'

12 days agoMerge remote-tracking branch 'upstream/pull/4847'
Tom Hughes [Thu, 30 May 2024 15:20:54 +0000 (16:20 +0100)]
Merge remote-tracking branch 'upstream/pull/4847'

12 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 May 2024 12:23:28 +0000 (14:23 +0200)]
Localisation updates from https://translatewiki.net.

12 days agoFixed "or divider" issue described in #4773 by adding mb-2 below "or" divider
Nenad Vujicic [Wed, 29 May 2024 09:32:48 +0000 (11:32 +0200)]
Fixed "or divider" issue described in #4773 by adding mb-2 below "or" divider

12 days agoSocial sign-in: avoid re-authorization in `users_controller#create`
Milan Cvetkovic [Mon, 27 May 2024 14:40:53 +0000 (14:40 +0000)]
Social sign-in: avoid re-authorization in `users_controller#create`

It does not add any additional guards against malicious users:

Malicious user may attempt to invoke `POST /users/new` with bogus
values for `auth_provider` and `auth_uid` resulting
with a new account to which user would have a way to login, other than
sending a password reset request.

In some cases, re-authorization would introduce additional
"Please login to your social account", or "Are you sure you want to be logged in"
popup triggered by identity provider.

This PR removes the re-authorization request from `POST /users/new` in authorization flow.

13 days 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'

13 days 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.

13 days 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

13 days 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'

13 days 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'

13 days 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'

13 days 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.

13 days 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.

13 days 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.

13 days 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

13 days 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

13 days 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)

13 days 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

13 days 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

2 weeks 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>
2 weeks agoFix new rubocop warnings
Tom Hughes [Tue, 28 May 2024 16:39:33 +0000 (17:39 +0100)]
Fix new rubocop warnings

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

2 weeks 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'

2 weeks 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

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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.

2 weeks 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.

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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

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

2 weeks 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

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

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

2 weeks 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

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

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