]> git.openstreetmap.org Git - rails.git/log
rails.git
34 hours agoMerge branch 'pull/5428' master
Anton Khorev [Fri, 20 Dec 2024 16:06:16 +0000 (19:06 +0300)]
Merge branch 'pull/5428'

34 hours agoMerge remote-tracking branch 'upstream/pull/5429'
Tom Hughes [Fri, 20 Dec 2024 15:51:04 +0000 (15:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5429'

34 hours agoMerge ApiCapability class into ApiAbility
Anton Khorev [Fri, 20 Dec 2024 14:46:45 +0000 (17:46 +0300)]
Merge ApiCapability class into ApiAbility

36 hours agoDon't map multiple paths in a single route
Tom Hughes [Fri, 20 Dec 2024 09:27:48 +0000 (09:27 +0000)]
Don't map multiple paths in a single route

This is deprecated in rails 8.0 and 8.1 will remove it.

36 hours agoMerge remote-tracking branch 'upstream/pull/5427'
Tom Hughes [Fri, 20 Dec 2024 13:45:23 +0000 (13:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5427'

36 hours agoUpdate stringio
Tom Hughes [Fri, 20 Dec 2024 13:43:30 +0000 (13:43 +0000)]
Update stringio

37 hours agoRemove code that added now-unused field_with_errors css class
Anton Khorev [Fri, 20 Dec 2024 13:10:40 +0000 (16:10 +0300)]
Remove code that added now-unused field_with_errors css class

41 hours agoUpdate bundle
Tom Hughes [Fri, 20 Dec 2024 08:58:26 +0000 (08:58 +0000)]
Update bundle

41 hours agoMerge remote-tracking branch 'upstream/pull/5425'
Tom Hughes [Fri, 20 Dec 2024 08:39:16 +0000 (08:39 +0000)]
Merge remote-tracking branch 'upstream/pull/5425'

41 hours agoMerge remote-tracking branch 'upstream/pull/5424'
Tom Hughes [Fri, 20 Dec 2024 08:38:28 +0000 (08:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5424'

41 hours agoMerge remote-tracking branch 'upstream/pull/5423'
Tom Hughes [Fri, 20 Dec 2024 08:37:42 +0000 (08:37 +0000)]
Merge remote-tracking branch 'upstream/pull/5423'

41 hours agoMerge remote-tracking branch 'upstream/pull/5422'
Tom Hughes [Fri, 20 Dec 2024 08:35:38 +0000 (08:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5422'

46 hours agoSimplify calls to user block path helpers
Anton Khorev [Fri, 20 Dec 2024 03:30:21 +0000 (06:30 +0300)]
Simplify calls to user block path helpers

46 hours agoSimplify calls to api_message_path helper
Anton Khorev [Fri, 20 Dec 2024 03:11:05 +0000 (06:11 +0300)]
Simplify calls to api_message_path helper

47 hours agoMove user preferences routes to api namespace
Anton Khorev [Fri, 20 Dec 2024 03:00:54 +0000 (06:00 +0300)]
Move user preferences routes to api namespace

47 hours agoReplace show and index abilities with read ability
Anton Khorev [Fri, 20 Dec 2024 02:21:06 +0000 (05:21 +0300)]
Replace show and index abilities with read ability

2 days agoMerge remote-tracking branch 'upstream/pull/5420' live
Tom Hughes [Thu, 19 Dec 2024 16:09:14 +0000 (16:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5420'

2 days agoMerge remote-tracking branch 'upstream/pull/5416'
Tom Hughes [Thu, 19 Dec 2024 16:06:40 +0000 (16:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5416'

2 days agoChange image download warning message to a list
Anton Khorev [Wed, 18 Dec 2024 16:55:45 +0000 (19:55 +0300)]
Change image download warning message to a list

2 days agoAdd 'canDownloadImage' layer option
Anton Khorev [Wed, 18 Dec 2024 16:41:25 +0000 (19:41 +0300)]
Add 'canDownloadImage' layer option

2 days agoTest share textarea not to leak into note text on hiding resolved notes
Anton Khorev [Thu, 19 Dec 2024 14:59:44 +0000 (17:59 +0300)]
Test share textarea not to leak into note text on hiding resolved notes

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

2 days agoMerge pull request #5417 from tomhughes/social-share-helper
Andy Allan [Thu, 19 Dec 2024 10:28:13 +0000 (10:28 +0000)]
Merge pull request #5417 from tomhughes/social-share-helper

Refactor social sharing helper

2 days agoMerge remote-tracking branch 'upstream/pull/5419'
Tom Hughes [Thu, 19 Dec 2024 08:42:02 +0000 (08:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5419'

2 days agoMerge remote-tracking branch 'upstream/pull/5418'
Tom Hughes [Thu, 19 Dec 2024 08:22:57 +0000 (08:22 +0000)]
Merge remote-tracking branch 'upstream/pull/5418'

2 days agoImprove testing of social sharing buttons
Tom Hughes [Wed, 18 Dec 2024 17:24:18 +0000 (17:24 +0000)]
Improve testing of social sharing buttons

2 days agoUse safe_join to join social sharing buttons
Tom Hughes [Wed, 18 Dec 2024 17:08:04 +0000 (17:08 +0000)]
Use safe_join to join social sharing buttons

2 days agoDrop unused options from social_share_buttons
Tom Hughes [Wed, 18 Dec 2024 16:57:08 +0000 (16:57 +0000)]
Drop unused options from social_share_buttons

2 days agoDrop unused ability to filter social sharing sites
Tom Hughes [Wed, 18 Dec 2024 16:45:42 +0000 (16:45 +0000)]
Drop unused ability to filter social sharing sites

2 days agoDrop render prefix from social_share_buttons function
Tom Hughes [Wed, 18 Dec 2024 16:42:56 +0000 (16:42 +0000)]
Drop render prefix from social_share_buttons function

2 days agoUse within_sidebar in CreateNoteTest
Anton Khorev [Thu, 19 Dec 2024 02:26:45 +0000 (05:26 +0300)]
Use within_sidebar in CreateNoteTest

2 days agoMove blocked resolve/reactivate tests to ResolveNoteTest
Anton Khorev [Thu, 19 Dec 2024 02:25:23 +0000 (05:25 +0300)]
Move blocked resolve/reactivate tests to ResolveNoteTest

2 days agoGet note text only from textarea within left sidebar
Anton Khorev [Thu, 19 Dec 2024 02:22:54 +0000 (05:22 +0300)]
Get note text only from textarea within left sidebar

2 days agoTest share textarea not to leak into note text on reactivation
Anton Khorev [Thu, 19 Dec 2024 02:14:15 +0000 (05:14 +0300)]
Test share textarea not to leak into note text on reactivation

3 days agoCenter share popup inside the browser window
Anton Khorev [Thu, 19 Dec 2024 01:09:31 +0000 (04:09 +0300)]
Center share popup inside the browser window

3 days agoMerge pull request #5388 from AntonKhorev/map-layer-can-embed
Andy Allan [Wed, 18 Dec 2024 16:03:10 +0000 (16:03 +0000)]
Merge pull request #5388 from AntonKhorev/map-layer-can-embed

Add 'canEmbed' layer option

3 days agoAdd 'canEmbed' layer option
Anton Khorev [Wed, 18 Dec 2024 15:36:44 +0000 (18:36 +0300)]
Add 'canEmbed' layer option

3 days agoAdd map.getMapBaseLayer()
Anton Khorev [Mon, 9 Dec 2024 21:31:59 +0000 (00:31 +0300)]
Add map.getMapBaseLayer()

3 days agoRename return values of getMapBaseLayerId() to layerId
Anton Khorev [Wed, 18 Dec 2024 15:28:18 +0000 (18:28 +0300)]
Rename return values of getMapBaseLayerId() to layerId

3 days agoMerge pull request #5413 from tomhughes/social-share-helper
Andy Allan [Wed, 18 Dec 2024 15:17:25 +0000 (15:17 +0000)]
Merge pull request #5413 from tomhughes/social-share-helper

Convert social share helper library into a real helper

3 days agoConvert social share helper library into a real helper
Tom Hughes [Wed, 18 Dec 2024 15:05:10 +0000 (15:05 +0000)]
Convert social share helper library into a real helper

3 days agoMerge pull request #5411 from tomhughes/bluesky-sharing
Andy Allan [Wed, 18 Dec 2024 15:06:18 +0000 (15:06 +0000)]
Merge pull request #5411 from tomhughes/bluesky-sharing

Add Bluesky to social sharing buttons

3 days agoMerge pull request #5412 from tomhughes/facebook-sharing
Andy Allan [Wed, 18 Dec 2024 15:05:09 +0000 (15:05 +0000)]
Merge pull request #5412 from tomhughes/facebook-sharing

Pass correct URL to Facebook sharing

3 days agoPass correct URL to Facebook sharing
Tom Hughes [Wed, 18 Dec 2024 14:50:49 +0000 (14:50 +0000)]
Pass correct URL to Facebook sharing

3 days agoAdd Bluesky to social sharing buttons
Tom Hughes [Wed, 18 Dec 2024 14:44:29 +0000 (14:44 +0000)]
Add Bluesky to social sharing buttons

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

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

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

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

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

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

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

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

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

4 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

4 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

4 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

5 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

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

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

5 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

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

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

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

10 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

10 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

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

10 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

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

11 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

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

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

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

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

11 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

11 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

11 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

11 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

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

12 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

12 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

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

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

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

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

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

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

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

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

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

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

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