]> git.openstreetmap.org Git - rails.git/log
rails.git
30 hours agoMerge remote-tracking branch 'upstream/pull/5391'
Tom Hughes [Wed, 18 Dec 2024 14:11:51 +0000 (14:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5391'

30 hours agoMerge remote-tracking branch 'upstream/pull/5410'
Tom Hughes [Wed, 18 Dec 2024 13:54:12 +0000 (13:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5410'

31 hours agoMerge branch 'pull/4985'
Anton Khorev [Wed, 18 Dec 2024 13:35:01 +0000 (16:35 +0300)]
Merge branch 'pull/4985'

46 hours agoAdd social sharing functionality
Emin Kocan [Sat, 13 Jul 2024 19:54:39 +0000 (21:54 +0200)]
Add social sharing functionality

2 days agoMerge remote-tracking branch 'upstream/pull/5408'
Tom Hughes [Tue, 17 Dec 2024 19:12:49 +0000 (19:12 +0000)]
Merge remote-tracking branch 'upstream/pull/5408'

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

2 days agoMerge remote-tracking branch 'upstream/pull/5405'
Tom Hughes [Tue, 17 Dec 2024 19:08:52 +0000 (19:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5405'

2 days agoMerge remote-tracking branch 'upstream/pull/5398'
Tom Hughes [Tue, 17 Dec 2024 19:08:45 +0000 (19:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5398'

2 days agoUpdate bundle
Tom Hughes [Tue, 17 Dec 2024 19:06:26 +0000 (19:06 +0000)]
Update bundle

2 days agoMove api messages resources to api namespace
Anton Khorev [Tue, 17 Dec 2024 14:14:19 +0000 (17:14 +0300)]
Move api messages resources to api namespace

2 days agoAdd patch/put api message update
Anton Khorev [Tue, 17 Dec 2024 14:09:47 +0000 (17:09 +0300)]
Add patch/put api message update

2 days agoMerge pull request #5406 from AntonKhorev/offline-message-oauth
Andy Allan [Tue, 17 Dec 2024 10:39:47 +0000 (10:39 +0000)]
Merge pull request #5406 from AntonKhorev/offline-message-oauth

Check if db is writable on oauth authorization pages

2 days agoShow 'api offline' message on new note page
Anton Khorev [Tue, 17 Dec 2024 00:34:14 +0000 (03:34 +0300)]
Show 'api offline' message on new note page

2 days agoBump osm-community-index from 5.8.0 to 5.9.0
dependabot[bot] [Mon, 16 Dec 2024 23:19:28 +0000 (23:19 +0000)]
Bump osm-community-index from 5.8.0 to 5.9.0

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.8.0 to 5.9.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.8.0...v5.9.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>
2 days agoCheck if db is writable on oauth authorization pages
Anton Khorev [Mon, 16 Dec 2024 23:18:56 +0000 (02:18 +0300)]
Check if db is writable on oauth authorization pages

3 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Dec 2024 12:15:08 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

3 days agoadd lock, information and water classes for nominatim terms
Sarah Hoffmann [Mon, 16 Dec 2024 09:05:42 +0000 (10:05 +0100)]
add lock, information and water classes for nominatim terms

5 days agoBump eslint from 9.16.0 to 9.17.0
dependabot[bot] [Fri, 13 Dec 2024 23:58:41 +0000 (23:58 +0000)]
Bump eslint from 9.16.0 to 9.17.0

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

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

Signed-off-by: dependabot[bot] <support@github.com>
7 days agoMerge remote-tracking branch 'upstream/pull/5394'
Tom Hughes [Thu, 12 Dec 2024 18:14:33 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5394'

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

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

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

8 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

8 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).

8 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

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

8 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

9 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'

9 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'

9 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'

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

9 days agoMove admin users list to its own controller
Anton Khorev [Tue, 10 Dec 2024 15:04:50 +0000 (18:04 +0300)]
Move admin users list to its own controller

9 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

9 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

9 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

9 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'

10 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

10 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

10 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>

11 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'

11 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'

11 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'

11 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'

11 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'

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

12 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

13 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

13 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

13 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

3 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.

3 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.

3 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'

3 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

3 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

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

3 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.

3 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'

3 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

3 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