]> git.openstreetmap.org Git - rails.git/log
rails.git
20 hours agoMerge remote-tracking branch 'upstream/pull/5394' master
Tom Hughes [Thu, 12 Dec 2024 18:14:33 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5394'

26 hours agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Dec 2024 12:16:15 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.

45 hours agoMerge remote-tracking branch 'upstream/pull/5387' live
Tom Hughes [Wed, 11 Dec 2024 17:09:07 +0000 (17:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5387'

46 hours agoMerge pull request #5362 from AntonKhorev/color-mode-preference-map
Andy Allan [Wed, 11 Dec 2024 16:53:15 +0000 (16:53 +0000)]
Merge pull request #5362 from AntonKhorev/color-mode-preference-map

Map color mode preference

2 days agoMerge pull request #5390 from AntonKhorev/trace-resourceful-routes
Andy Allan [Wed, 11 Dec 2024 14:04:19 +0000 (14:04 +0000)]
Merge pull request #5390 from AntonKhorev/trace-resourceful-routes

Resourceful routes for traces API

2 days agoiD: listen to manual hashchanges from iframe parent
Martin Raifer [Wed, 11 Dec 2024 13:59:02 +0000 (14:59 +0100)]
iD: listen to  manual hashchanges from iframe parent

Pan to the new `map` location when the hash change was not not triggered by map interaction from inside iD itself.

This mirrors the behaviour when manually editing the `map` hash parameter on osm.org outside of iD.

This also fixes https://github.com/openstreetmap/iD/issues/10592 (error in js console when iD is opened outside of an iframe by directly navigating to osm.org/id).

2 days agoDisable filter inheritance on tiles, apply filter to tile container
Anton Khorev [Mon, 9 Dec 2024 12:51:07 +0000 (15:51 +0300)]
Disable filter inheritance on tiles, apply filter to tile container

2 days agoAdd map filter css property
Anton Khorev [Mon, 9 Dec 2024 12:54:22 +0000 (15:54 +0300)]
Add map filter css property

2 days agoUpdate to rails 7.2.2.1
Tom Hughes [Tue, 10 Dec 2024 23:05:25 +0000 (23:05 +0000)]
Update to rails 7.2.2.1

2 days agoMerge remote-tracking branch 'upstream/pull/4200'
Tom Hughes [Tue, 10 Dec 2024 19:03:55 +0000 (19:03 +0000)]
Merge remote-tracking branch 'upstream/pull/4200'

2 days agoMerge remote-tracking branch 'upstream/pull/5389'
Tom Hughes [Tue, 10 Dec 2024 18:57:31 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5389'

2 days agoMerge remote-tracking branch 'upstream/pull/5385'
Tom Hughes [Tue, 10 Dec 2024 18:45:32 +0000 (18:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5385'

2 days agoUpdate bundle
Tom Hughes [Tue, 10 Dec 2024 18:18:46 +0000 (18:18 +0000)]
Update bundle

3 days agoUse resourceful routes for api trace data
Anton Khorev [Tue, 10 Dec 2024 11:06:26 +0000 (14:06 +0300)]
Use resourceful routes for api trace data

3 days agoUse resourceful routes for api trace create
Anton Khorev [Sun, 8 Dec 2024 13:02:51 +0000 (16:02 +0300)]
Use resourceful routes for api trace create

3 days agoUse resourceful routes for api trace show, update, destroy
Anton Khorev [Tue, 10 Dec 2024 09:31:35 +0000 (12:31 +0300)]
Use resourceful routes for api trace show, update, destroy

3 days agoRename 'keyid' layer option to 'layerId'
Anton Khorev [Mon, 9 Dec 2024 22:23:41 +0000 (01:23 +0300)]
Rename 'keyid' layer option to 'layerId'

4 days agoAdjust browse line/icon height/alignment for text-only zooming
Anton Khorev [Wed, 27 Nov 2024 14:37:54 +0000 (17:37 +0300)]
Adjust browse line/icon height/alignment for text-only zooming

4 days agoAllow to specify browse icon priorities
Anton Khorev [Mon, 9 Dec 2024 10:04:32 +0000 (13:04 +0300)]
Allow to specify browse icon priorities

4 days agoWrite browse element icons as <img>
Anton Khorev [Mon, 25 Nov 2024 03:33:37 +0000 (06:33 +0300)]
Write browse element icons as <img>

5 days agoMerge remote-tracking branch 'upstream/pull/5375'
Tom Hughes [Sun, 8 Dec 2024 14:55:55 +0000 (14:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5375'

5 days agoMerge remote-tracking branch 'upstream/pull/5386'
Tom Hughes [Sun, 8 Dec 2024 11:27:18 +0000 (11:27 +0000)]
Merge remote-tracking branch 'upstream/pull/5386'

5 days agoMerge remote-tracking branch 'upstream/pull/5384'
Tom Hughes [Sun, 8 Dec 2024 10:47:43 +0000 (10:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5384'

5 days agoMerge remote-tracking branch 'upstream/pull/5383'
Tom Hughes [Sun, 8 Dec 2024 10:40:04 +0000 (10:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5383'

5 days agoMerge remote-tracking branch 'upstream/pull/5382'
Tom Hughes [Sun, 8 Dec 2024 10:37:47 +0000 (10:37 +0000)]
Merge remote-tracking branch 'upstream/pull/5382'

5 days agoProtect against malicious branch names
Tom Hughes [Sat, 7 Dec 2024 17:04:03 +0000 (17:04 +0000)]
Protect against malicious branch names

5 days agoAllow specifying extra layer options in layers.yml
Anton Khorev [Sat, 7 Dec 2024 16:07:40 +0000 (19:07 +0300)]
Allow specifying extra layer options in layers.yml

7 days agoRemove logger.debug from relation update action
Anton Khorev [Fri, 6 Dec 2024 11:27:46 +0000 (14:27 +0300)]
Remove logger.debug from relation update action

7 days agoLet header username expand to screen width in small nav mode
Anton Khorev [Fri, 6 Dec 2024 09:19:43 +0000 (12:19 +0300)]
Let header username expand to screen width in small nav mode

7 days agoDon't interpolate type in issue title
Anton Khorev [Fri, 6 Dec 2024 08:15:34 +0000 (11:15 +0300)]
Don't interpolate type in issue title

7 days agoMerge remote-tracking branch 'upstream/pull/5377'
Tom Hughes [Thu, 5 Dec 2024 18:41:10 +0000 (18:41 +0000)]
Merge remote-tracking branch 'upstream/pull/5377'

7 days agoMerge remote-tracking branch 'upstream/pull/5381'
Tom Hughes [Thu, 5 Dec 2024 18:34:41 +0000 (18:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5381'

7 days agoMerge remote-tracking branch 'upstream/pull/5380'
Tom Hughes [Thu, 5 Dec 2024 18:31:56 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5380'

8 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Dec 2024 12:13:52 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

8 days agoDon't show types twice in issue type select
Anton Khorev [Thu, 5 Dec 2024 09:47:58 +0000 (12:47 +0300)]
Don't show types twice in issue type select

8 days agoUse translated model names in issue type select
Anton Khorev [Thu, 5 Dec 2024 09:29:13 +0000 (12:29 +0300)]
Use translated model names in issue type select

8 days agoMerge remote-tracking branch 'upstream/pull/5374'
Tom Hughes [Wed, 4 Dec 2024 18:59:21 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5374'

8 days agoMerge remote-tracking branch 'upstream/pull/5378'
Tom Hughes [Wed, 4 Dec 2024 18:53:37 +0000 (18:53 +0000)]
Merge remote-tracking branch 'upstream/pull/5378'

8 days agoMerge remote-tracking branch 'upstream/pull/5376'
Tom Hughes [Wed, 4 Dec 2024 18:46:39 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/pull/5376'

8 days agoInclude data: when using allow_thirdparty_images CSP
Anton Khorev [Wed, 4 Dec 2024 16:26:21 +0000 (19:26 +0300)]
Include data: when using allow_thirdparty_images CSP

9 days agoTruncate if necessary and set dir=auto for note usernames
Anton Khorev [Wed, 4 Dec 2024 10:53:20 +0000 (13:53 +0300)]
Truncate if necessary and set dir=auto for note usernames

9 days agoTruncate usernames in trace navigation tabs
Anton Khorev [Wed, 4 Dec 2024 10:09:46 +0000 (13:09 +0300)]
Truncate usernames in trace navigation tabs

9 days agoUse fetch() instead of iframe to make remote control requests
Anton Khorev [Thu, 20 Oct 2022 12:29:57 +0000 (15:29 +0300)]
Use fetch() instead of iframe to make remote control requests

9 days agoChange block end column to display strictly ends_at
Anton Khorev [Thu, 24 Aug 2023 02:35:53 +0000 (05:35 +0300)]
Change block end column to display strictly ends_at

Could display when block was viewed before. That's going to be unintuitive if sorting by different times is introduced.

9 days agoRearrange data in blocks table to start/end/status columns
Anton Khorev [Wed, 23 Aug 2023 16:59:30 +0000 (19:59 +0300)]
Rearrange data in blocks table to start/end/status columns

9 days agoUse relation icon instead of word in containing relations
Anton Khorev [Wed, 4 Dec 2024 07:30:44 +0000 (10:30 +0300)]
Use relation icon instead of word in containing relations

9 days agoMerge remote-tracking branch 'upstream/pull/5372'
Tom Hughes [Tue, 3 Dec 2024 18:36:23 +0000 (18:36 +0000)]
Merge remote-tracking branch 'upstream/pull/5372'

9 days agoMerge remote-tracking branch 'upstream/pull/5371'
Tom Hughes [Tue, 3 Dec 2024 18:33:38 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/5371'

9 days agoUpdate bundle
Tom Hughes [Tue, 3 Dec 2024 18:19:50 +0000 (18:19 +0000)]
Update bundle

10 days agoTruncate if necessary and set dir=auto for message usernames
Anton Khorev [Tue, 3 Dec 2024 07:48:59 +0000 (10:48 +0300)]
Truncate if necessary and set dir=auto for message usernames

10 days agoTruncate if necessary and set dir=auto for changeset usernames
Anton Khorev [Tue, 3 Dec 2024 07:24:56 +0000 (10:24 +0300)]
Truncate if necessary and set dir=auto for changeset usernames

10 days agoMerge remote-tracking branch 'upstream/pull/5366'
Tom Hughes [Mon, 2 Dec 2024 15:00:45 +0000 (15:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5366'

10 days agoMerge remote-tracking branch 'upstream/pull/5365'
Tom Hughes [Mon, 2 Dec 2024 15:00:42 +0000 (15:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5365'

10 days agoMerge remote-tracking branch 'upstream/pull/5364'
Tom Hughes [Mon, 2 Dec 2024 15:00:39 +0000 (15:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5364'

11 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Dec 2024 12:14:19 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

11 days agoTruncate usernames in block navigation tabs
Anton Khorev [Mon, 2 Dec 2024 09:22:45 +0000 (12:22 +0300)]
Truncate usernames in block navigation tabs

11 days agoSet dir=auto on usernames in block lists
Anton Khorev [Mon, 2 Dec 2024 09:02:04 +0000 (12:02 +0300)]
Set dir=auto on usernames in block lists

11 days agoSet dir=auto on username in header
Anton Khorev [Mon, 2 Dec 2024 07:56:23 +0000 (10:56 +0300)]
Set dir=auto on username in header

11 days agoMerge remote-tracking branch 'upstream/pull/5360'
Tom Hughes [Sun, 1 Dec 2024 19:25:10 +0000 (19:25 +0000)]
Merge remote-tracking branch 'upstream/pull/5360'

12 days agoStore selected map color scheme
Anton Khorev [Sun, 1 Dec 2024 01:18:56 +0000 (04:18 +0300)]
Store selected map color scheme

12 days agoAdd map color scheme select to preferences form
Anton Khorev [Sun, 1 Dec 2024 01:02:51 +0000 (04:02 +0300)]
Add map color scheme select to preferences form

12 days agoShow map color scheme on user preferences page
Anton Khorev [Sun, 1 Dec 2024 01:00:25 +0000 (04:00 +0300)]
Show map color scheme on user preferences page

12 days agoSet map color scheme depending on user preferences
Anton Khorev [Sun, 1 Dec 2024 00:54:36 +0000 (03:54 +0300)]
Set map color scheme depending on user preferences

12 days agoMake a generic preferred color scheme method
Anton Khorev [Sun, 1 Dec 2024 00:04:09 +0000 (03:04 +0300)]
Make a generic preferred color scheme method

12 days agoStore selected site color scheme
Anton Khorev [Sat, 16 Nov 2024 15:13:03 +0000 (18:13 +0300)]
Store selected site color scheme

12 days agoAdd site color scheme select to preferences form
Anton Khorev [Sat, 16 Nov 2024 15:09:15 +0000 (18:09 +0300)]
Add site color scheme select to preferences form

12 days agoShow site color scheme on user preferences page
Anton Khorev [Sat, 16 Nov 2024 14:59:17 +0000 (17:59 +0300)]
Show site color scheme on user preferences page

12 days agoAdd auto/manual color scheme stylesheets depending on user preferences
Anton Khorev [Sat, 16 Nov 2024 14:51:50 +0000 (17:51 +0300)]
Add auto/manual color scheme stylesheets depending on user preferences

13 days agoBump eslint from 9.15.0 to 9.16.0
dependabot[bot] [Fri, 29 Nov 2024 23:47:00 +0000 (23:47 +0000)]
Bump eslint from 9.15.0 to 9.16.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.15.0 to 9.16.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.15.0...v9.16.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
13 days agoDon't send comment text when reopening a note
Tom Hughes [Fri, 29 Nov 2024 17:41:00 +0000 (17:41 +0000)]
Don't send comment text when reopening a note

Fixes #5359.

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Nov 2024 12:14:20 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

2 weeks agoMove html_safe declaration for user_mailer from layout to helper
Andy Allan [Wed, 27 Nov 2024 18:04:32 +0000 (18:04 +0000)]
Move html_safe declaration for user_mailer from layout to helper

This allows us to enable output safety checks for all code within
erb files.

`rubocop --auto-gen-config` ignores code within the erb files, so
it is easier to maintain an exclusion on the helper than inside
the layout.

2 weeks agoMerge remote-tracking branch 'upstream/pull/5357'
Tom Hughes [Wed, 27 Nov 2024 17:55:09 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5357'

2 weeks agoResolve erb_lint deprecations
Andy Allan [Wed, 27 Nov 2024 17:10:08 +0000 (17:10 +0000)]
Resolve erb_lint deprecations

They have standardized on underscores. See
https://github.com/Shopify/erb_lint/pull/360

2 weeks agoMerge pull request #4316 from AntonKhorev/block-reason-max-length
Andy Allan [Wed, 27 Nov 2024 17:02:25 +0000 (17:02 +0000)]
Merge pull request #4316 from AntonKhorev/block-reason-max-length

Set max length of block reason

2 weeks agoUpdate bundle
Tom Hughes [Tue, 26 Nov 2024 18:38:29 +0000 (18:38 +0000)]
Update bundle

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Nov 2024 12:14:48 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

2 weeks agoMerge remote-tracking branch 'upstream/pull/5353'
Tom Hughes [Sun, 24 Nov 2024 10:40:39 +0000 (10:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5353'

2 weeks agoAdd default browse icons for nodes, ways, relations
Anton Khorev [Sun, 24 Nov 2024 00:04:11 +0000 (03:04 +0300)]
Add default browse icons for nodes, ways, relations

2 weeks agoMerge remote-tracking branch 'upstream/pull/5349'
Tom Hughes [Fri, 22 Nov 2024 17:51:49 +0000 (17:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5349'

3 weeks agoMove layer definitions to yml
Anton Khorev [Thu, 21 Nov 2024 22:18:55 +0000 (01:18 +0300)]
Move layer definitions to yml

3 weeks agoMerge remote-tracking branch 'upstream/pull/5346'
Tom Hughes [Thu, 21 Nov 2024 22:13:33 +0000 (22:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5346'

3 weeks agoMove map layer ids/codes/keys to layer definition data
Anton Khorev [Thu, 21 Nov 2024 17:58:47 +0000 (20:58 +0300)]
Move map layer ids/codes/keys to layer definition data

3 weeks agoAdd subscribe/unsubscribe buttons to note pages
Anton Khorev [Thu, 24 Oct 2024 03:02:07 +0000 (06:02 +0300)]
Add subscribe/unsubscribe buttons to note pages

3 weeks agoMerge remote-tracking branch 'upstream/pull/5348'
Tom Hughes [Thu, 21 Nov 2024 18:58:14 +0000 (18:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5348'

3 weeks agoCollect map layer credits into a data structure
Anton Khorev [Thu, 21 Nov 2024 17:08:43 +0000 (20:08 +0300)]
Collect map layer credits into a data structure

3 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Nov 2024 12:15:02 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

3 weeks agoMerge pull request #5314 from AntonKhorev/note-subscriptions-api
Andy Allan [Wed, 20 Nov 2024 18:21:11 +0000 (18:21 +0000)]
Merge pull request #5314 from AntonKhorev/note-subscriptions-api

Note subscriptions API

3 weeks agoAdd destroy note subscription api endpoint
Anton Khorev [Thu, 24 Oct 2024 01:46:57 +0000 (04:46 +0300)]
Add destroy note subscription api endpoint

3 weeks agoAdd create note subscription api endpoint
Anton Khorev [Thu, 24 Oct 2024 01:11:37 +0000 (04:11 +0300)]
Add create note subscription api endpoint

3 weeks agoUpdate bundle
Tom Hughes [Tue, 19 Nov 2024 18:21:14 +0000 (18:21 +0000)]
Update bundle

3 weeks agoMerge remote-tracking branch 'upstream/pull/5341'
Tom Hughes [Tue, 19 Nov 2024 18:10:38 +0000 (18:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5341'

3 weeks agoBump qs from 6.13.0 to 6.13.1
dependabot[bot] [Tue, 19 Nov 2024 00:15:49 +0000 (00:15 +0000)]
Bump qs from 6.13.0 to 6.13.1

Bumps [qs](https://github.com/ljharb/qs) from 6.13.0 to 6.13.1.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.13.0...v6.13.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 weeks agoMerge branch 'pull/5297'
Anton Khorev [Mon, 18 Nov 2024 15:15:25 +0000 (18:15 +0300)]
Merge branch 'pull/5297'

3 weeks agoAdd status filter to user's note page
Emin Kocan [Wed, 30 Oct 2024 21:00:59 +0000 (22:00 +0100)]
Add status filter to user's note page

3 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Nov 2024 12:14:43 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

3 weeks agoMerge remote-tracking branch 'upstream/pull/5335'
Tom Hughes [Sun, 17 Nov 2024 18:48:37 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/5335'

3 weeks agoMerge remote-tracking branch 'upstream/pull/5334'
Tom Hughes [Sun, 17 Nov 2024 18:46:45 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/pull/5334'

3 weeks agoMerge branch 'pull/5338'
Anton Khorev [Sun, 17 Nov 2024 16:59:20 +0000 (19:59 +0300)]
Merge branch 'pull/5338'

3 weeks agoEnable dark mode attribution font color
Marwin Hochfelsner [Sun, 17 Nov 2024 14:28:06 +0000 (15:28 +0100)]
Enable dark mode attribution font color

Increases the specificity of the dark mode attribution selector. This makes it overwrite Leaflet's default link selector.