]> git.openstreetmap.org Git - rails.git/log
rails.git
19 months agoMerge remote-tracking branch 'upstream/pull/5855'
Tom Hughes [Thu, 27 Mar 2025 17:27:40 +0000 (17:27 +0000)]
Merge remote-tracking branch 'upstream/pull/5855'

19 months agoMerge remote-tracking branch 'upstream/pull/5852'
Tom Hughes [Thu, 27 Mar 2025 17:23:38 +0000 (17:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5852'

19 months agoShorten matching wiki urls in linkify
Anton Khorev [Thu, 27 Mar 2025 14:23:12 +0000 (17:23 +0300)]
Shorten matching wiki urls in linkify

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Mar 2025 12:15:47 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

19 months agoMerge pull request #5849 from AntonKhorev/fix-github-badges
Andy Allan [Thu, 27 Mar 2025 09:03:15 +0000 (09:03 +0000)]
Merge pull request #5849 from AntonKhorev/fix-github-badges

Fix GitHub badges in readme

19 months agoRemove extra sanitize after simple_format RichText::HTML
Anton Khorev [Thu, 27 Mar 2025 01:29:31 +0000 (04:29 +0300)]
Remove extra sanitize after simple_format RichText::HTML

simple_format already calls sanitize internally. We don't call sanitize again from a similar place of RichText::Text.

19 months agoRemove TagHelper include from RichText module
Anton Khorev [Thu, 27 Mar 2025 00:47:32 +0000 (03:47 +0300)]
Remove TagHelper include from RichText module

19 months agoFix GitHub badges in readme
Anton Khorev [Wed, 26 Mar 2025 23:51:10 +0000 (02:51 +0300)]
Fix GitHub badges in readme

19 months agoMerge remote-tracking branch 'upstream/pull/5842'
Tom Hughes [Wed, 26 Mar 2025 18:23:27 +0000 (18:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5842'

19 months agoMerge pull request #5848 from tomhughes/test-migrations
Andy Allan [Wed, 26 Mar 2025 16:52:03 +0000 (16:52 +0000)]
Merge pull request #5848 from tomhughes/test-migrations

Test migrations

19 months agoCorrect structure.sql
Tom Hughes [Wed, 26 Mar 2025 16:11:10 +0000 (16:11 +0000)]
Correct structure.sql

19 months agoRemove structure.sql to force a migration
Tom Hughes [Wed, 26 Mar 2025 15:59:43 +0000 (15:59 +0000)]
Remove structure.sql to force a migration

Fixes #5847

19 months agoMerge remote-tracking branch 'upstream/pull/5846'
Tom Hughes [Wed, 26 Mar 2025 16:04:51 +0000 (16:04 +0000)]
Merge remote-tracking branch 'upstream/pull/5846'

19 months agoUpdate strong_migrations to be compatible with rails 8
Andy Allan [Wed, 26 Mar 2025 15:09:43 +0000 (15:09 +0000)]
Update strong_migrations to be compatible with rails 8

We previously pinned to an old version for ruby 3.1 support, but
that's no longer required since rails needs 3.2 anyway.

Fixes #5845

19 months agoFix lock file
Tom Hughes [Tue, 25 Mar 2025 20:43:11 +0000 (20:43 +0000)]
Fix lock file

19 months agoPin uri as dartsass-ruby doesn't work with 1.x
Tom Hughes [Tue, 25 Mar 2025 20:39:52 +0000 (20:39 +0000)]
Pin uri as dartsass-ruby doesn't work with 1.x

19 months agoMerge remote-tracking branch 'upstream/pull/4872'
Tom Hughes [Tue, 25 Mar 2025 19:15:47 +0000 (19:15 +0000)]
Merge remote-tracking branch 'upstream/pull/4872'

19 months agoMerge remote-tracking branch 'upstream/pull/5844'
Tom Hughes [Tue, 25 Mar 2025 19:09:44 +0000 (19:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5844'

19 months agoMerge remote-tracking branch 'upstream/pull/5843'
Tom Hughes [Tue, 25 Mar 2025 18:18:20 +0000 (18:18 +0000)]
Merge remote-tracking branch 'upstream/pull/5843'

19 months agoUpdate bundle
Tom Hughes [Tue, 25 Mar 2025 18:09:39 +0000 (18:09 +0000)]
Update bundle

19 months agoShorten matching urls in linkify
Anton Khorev [Tue, 25 Mar 2025 01:04:46 +0000 (04:04 +0300)]
Shorten matching urls in linkify

19 months agoSplit RichText text-to-html test
Anton Khorev [Tue, 25 Mar 2025 02:36:00 +0000 (05:36 +0300)]
Split RichText text-to-html test

19 months agoBump @types/leaflet from 1.9.16 to 1.9.17
dependabot[bot] [Tue, 25 Mar 2025 01:39:19 +0000 (01:39 +0000)]
Bump @types/leaflet from 1.9.16 to 1.9.17

Bumps [@types/leaflet](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/leaflet) from 1.9.16 to 1.9.17.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/leaflet)

---
updated-dependencies:
- dependency-name: "@types/leaflet"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
19 months agoRemove html-safe/unsafe branches from rich text linkify
Anton Khorev [Mon, 24 Mar 2025 12:51:26 +0000 (15:51 +0300)]
Remove html-safe/unsafe branches from rich text linkify

Rinku outputs html. It would make no sense to escape Rinku's output, the output should be safe when it's created. To make sure that it's safe, we need to escape the input. As it is currently used in osm-website, the input is already html-safe and escaping does nothing. However it's safer to escape anyway in case the future usage changes.

19 months agoMerge branch 'pull/5841'
Anton Khorev [Tue, 25 Mar 2025 00:38:31 +0000 (03:38 +0300)]
Merge branch 'pull/5841'

19 months agoFix "undefined" comment when hiding resolved notes
Anton Khorev [Tue, 25 Mar 2025 00:21:58 +0000 (03:21 +0300)]
Fix "undefined" comment when hiding resolved notes

19 months agoFix typo in comment about Gravatar setting
Mateusz [Mon, 24 Mar 2025 23:57:55 +0000 (00:57 +0100)]
Fix typo in comment about Gravatar setting

19 months agoRe-enable support for logging to a file in production
Tom Hughes [Mon, 24 Mar 2025 17:36:42 +0000 (17:36 +0000)]
Re-enable support for logging to a file in production

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Mar 2025 12:14:23 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

19 months agoMerge remote-tracking branch 'upstream/pull/5826'
Tom Hughes [Sun, 23 Mar 2025 19:42:27 +0000 (19:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5826'

19 months agoRemove params from url when viewing place history and map is moved
Anton Khorev [Mon, 17 Mar 2025 00:21:46 +0000 (03:21 +0300)]
Remove params from url when viewing place history and map is moved

19 months agoRename changeset loader functions
Anton Khorev [Sun, 16 Mar 2025 23:46:05 +0000 (02:46 +0300)]
Rename changeset loader functions

19 months agoScroll to first/last changeset in history list if before/after param is given
Anton Khorev [Sun, 16 Mar 2025 23:07:50 +0000 (02:07 +0300)]
Scroll to first/last changeset in history list if before/after param is given

19 months agoRewrite history page url when scrolling
Anton Khorev [Sun, 16 Mar 2025 14:59:49 +0000 (17:59 +0300)]
Rewrite history page url when scrolling

19 months agoMerge remote-tracking branch 'upstream/pull/5839'
Tom Hughes [Sun, 23 Mar 2025 16:34:53 +0000 (16:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5839'

19 months agoRemove unused options argument from user_image_url
Anton Khorev [Sun, 23 Mar 2025 16:15:06 +0000 (19:15 +0300)]
Remove unused options argument from user_image_url

19 months agoMerge remote-tracking branch 'upstream/pull/5835'
Tom Hughes [Sun, 23 Mar 2025 16:14:13 +0000 (16:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5835'

19 months agoadd dir="auto" to paragraphs of formatted text
Nitai Sasson [Fri, 21 Mar 2025 19:37:46 +0000 (21:37 +0200)]
add dir="auto" to paragraphs of formatted text

19 months agoMerge remote-tracking branch 'upstream/pull/5837'
Tom Hughes [Sun, 23 Mar 2025 10:40:40 +0000 (10:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5837'

19 months agoMerge remote-tracking branch 'upstream/pull/5836'
Tom Hughes [Sun, 23 Mar 2025 10:26:06 +0000 (10:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5836'

19 months agoPut note comments in <article> elements
Anton Khorev [Sat, 22 Mar 2025 23:21:10 +0000 (02:21 +0300)]
Put note comments in <article> elements

19 months agoPut changeset comments in <article> elements
Anton Khorev [Sat, 22 Mar 2025 23:02:50 +0000 (02:02 +0300)]
Put changeset comments in <article> elements

19 months agoBump eslint from 9.22.0 to 9.23.0
dependabot[bot] [Fri, 21 Mar 2025 23:55:59 +0000 (23:55 +0000)]
Bump eslint from 9.22.0 to 9.23.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.22.0 to 9.23.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.22.0...v9.23.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
19 months agoMerge remote-tracking branch 'upstream/pull/5834'
Tom Hughes [Fri, 21 Mar 2025 17:44:37 +0000 (17:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5834'

19 months agoMerge remote-tracking branch 'upstream/pull/5830'
Tom Hughes [Fri, 21 Mar 2025 17:32:44 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5830'

19 months agoMerge branch 'pull/5833'
Anton Khorev [Fri, 21 Mar 2025 14:27:22 +0000 (17:27 +0300)]
Merge branch 'pull/5833'

19 months agoChange heatmap color to sqrt from 0 to max changes
Holger Jeromin [Fri, 21 Mar 2025 08:41:26 +0000 (09:41 +0100)]
Change heatmap color to sqrt from 0 to max changes

19 months agoUse Date().toLocaleString() to construct month titles
Anton Khorev [Fri, 21 Mar 2025 12:59:02 +0000 (15:59 +0300)]
Use Date().toLocaleString() to construct month titles

Ensures that standalone month names are in the nominative case.

19 months agoCreate map key resource
Anton Khorev [Thu, 20 Mar 2025 23:40:31 +0000 (02:40 +0300)]
Create map key resource

19 months agoMerge remote-tracking branch 'upstream/pull/5825'
Tom Hughes [Thu, 20 Mar 2025 17:09:57 +0000 (17:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5825'

19 months agoMerge remote-tracking branch 'upstream/pull/5828'
Tom Hughes [Thu, 20 Mar 2025 16:53:11 +0000 (16:53 +0000)]
Merge remote-tracking branch 'upstream/pull/5828'

19 months agoMerge remote-tracking branch 'upstream/pull/5827'
Tom Hughes [Thu, 20 Mar 2025 16:32:21 +0000 (16:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5827'

19 months agoReuse mirrored turn icons
Anton Khorev [Thu, 20 Mar 2025 16:21:00 +0000 (19:21 +0300)]
Reuse mirrored turn icons

Co-authored-by: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
19 months agoUpdate straight routing in tests to use named directions icons
Anton Khorev [Thu, 20 Mar 2025 15:25:15 +0000 (18:25 +0300)]
Update straight routing in tests to use named directions icons

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Mar 2025 12:14:34 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

19 months agoMerge pull request #5430 from tomhughes/rails8
Andy Allan [Thu, 20 Mar 2025 11:55:11 +0000 (11:55 +0000)]
Merge pull request #5430 from tomhughes/rails8

Update to rails 8

19 months agoUse rails 8 compatible active_record_union
Tom Hughes [Fri, 20 Dec 2024 10:26:47 +0000 (10:26 +0000)]
Use rails 8 compatible active_record_union

https://github.com/brianhempel/active_record_union/issues/36

19 months agoAvoid parsing of XML requests with ; in the body
Tom Hughes [Fri, 20 Dec 2024 10:18:12 +0000 (10:18 +0000)]
Avoid parsing of XML requests with ; in the body

19 months agoReplace permit/require with expect for parameter validation
Tom Hughes [Tue, 25 Feb 2025 19:08:57 +0000 (19:08 +0000)]
Replace permit/require with expect for parameter validation

19 months agoUpdate to rails 8.0.2
Tom Hughes [Tue, 19 Nov 2024 20:25:58 +0000 (20:25 +0000)]
Update to rails 8.0.2

19 months agoUse search params without objectification
Marwin Hochfelsner [Wed, 19 Mar 2025 22:08:20 +0000 (23:08 +0100)]
Use search params without objectification

19 months agoAdd default value for parseHash
Marwin Hochfelsner [Wed, 19 Mar 2025 21:21:54 +0000 (22:21 +0100)]
Add default value for parseHash

19 months agoMerge remote-tracking branch 'upstream/pull/5824'
Tom Hughes [Wed, 19 Mar 2025 19:19:09 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5824'

19 months agoMerge remote-tracking branch 'upstream/pull/5823'
Tom Hughes [Wed, 19 Mar 2025 18:51:54 +0000 (18:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5823'

19 months agoAdd reload on iframe redirect
Marwin Hochfelsner [Wed, 19 Mar 2025 18:34:57 +0000 (19:34 +0100)]
Add reload on iframe redirect

19 months agoMerge remote-tracking branch 'upstream/pull/5823'
Tom Hughes [Wed, 19 Mar 2025 18:47:57 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5823'

19 months agoAdd reload on iframe redirect
Marwin Hochfelsner [Wed, 19 Mar 2025 18:34:57 +0000 (19:34 +0100)]
Add reload on iframe redirect

19 months agoMerge remote-tracking branch 'upstream/pull/5812'
Tom Hughes [Wed, 19 Mar 2025 17:47:53 +0000 (17:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5812'

19 months agoMerge remote-tracking branch 'upstream/pull/5818'
Tom Hughes [Wed, 19 Mar 2025 17:42:21 +0000 (17:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5818'

19 months agoGet current locale correctly in routing engines
Tom Hughes [Wed, 19 Mar 2025 17:36:59 +0000 (17:36 +0000)]
Get current locale correctly in routing engines

Fixes #5821.

19 months agoMerge pull request #5820 from tomhughes/port-zero
Andy Allan [Wed, 19 Mar 2025 16:22:40 +0000 (16:22 +0000)]
Merge pull request #5820 from tomhughes/port-zero

Switch to dynamic allocation for the Firefox bidi port

19 months agoSwitch to dynamic allocation for the Firefox bidi port
Tom Hughes [Wed, 19 Mar 2025 08:27:15 +0000 (08:27 +0000)]
Switch to dynamic allocation for the Firefox bidi port

19 months agoupdate-wiki-pages: process ChangesetKey template
Kyle Hensel [Tue, 18 Mar 2025 09:11:19 +0000 (20:11 +1100)]
update-wiki-pages: process ChangesetKey template

19 months agoMake URLs more relative
Marwin Hochfelsner [Wed, 19 Mar 2025 04:44:04 +0000 (05:44 +0100)]
Make URLs more relative

19 months agoFix new rubocop warnings
Tom Hughes [Tue, 18 Mar 2025 18:21:40 +0000 (18:21 +0000)]
Fix new rubocop warnings

19 months agoUpdate bundle
Tom Hughes [Tue, 18 Mar 2025 18:17:24 +0000 (18:17 +0000)]
Update bundle

19 months agoMerge branch 'pull/5811'
Anton Khorev [Tue, 18 Mar 2025 00:48:52 +0000 (03:48 +0300)]
Merge branch 'pull/5811'

19 months agoMerge remote-tracking branch 'upstream/pull/5817'
Tom Hughes [Mon, 17 Mar 2025 17:29:50 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5817'

19 months agoMerge remote-tracking branch 'upstream/pull/5814'
Tom Hughes [Mon, 17 Mar 2025 17:29:44 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5814'

19 months agoUpdate to i18n-js 4.x
Tom Hughes [Sun, 16 Mar 2025 16:16:22 +0000 (16:16 +0000)]
Update to i18n-js 4.x

19 months agoReplace use of I18n in javascript with OSM.i18n
Tom Hughes [Sun, 16 Mar 2025 16:16:22 +0000 (16:16 +0000)]
Replace use of I18n in javascript with OSM.i18n

19 months agoAdd OSM.i18n as an alias for I18n
Tom Hughes [Sun, 16 Mar 2025 18:44:35 +0000 (18:44 +0000)]
Add OSM.i18n as an alias for I18n

19 months agoMove directions form buttons closer to edges
Anton Khorev [Mon, 17 Mar 2025 16:34:34 +0000 (19:34 +0300)]
Move directions form buttons closer to edges

- Adds more space between Close and Reverse buttons.
- Places Close button exactly above Sidebar Close button.

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Mar 2025 12:14:31 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

19 months agoCreate heatmap links using <a> elements
Anton Khorev [Mon, 17 Mar 2025 01:49:52 +0000 (04:49 +0300)]
Create heatmap links using <a> elements

19 months agoMerge remote-tracking branch 'upstream/pull/5813'
Tom Hughes [Sun, 16 Mar 2025 22:38:09 +0000 (22:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5813'

19 months agoRemove workaround for iD 2.31
Marwin Hochfelsner [Sun, 16 Mar 2025 20:10:48 +0000 (21:10 +0100)]
Remove workaround for iD 2.31

19 months agoMerge remote-tracking branch 'upstream/pull/5809'
Tom Hughes [Sun, 16 Mar 2025 19:09:20 +0000 (19:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5809'

19 months agoPut api keys directly in js layer definitions
Marwin Hochfelsner [Sun, 16 Mar 2025 00:20:41 +0000 (01:20 +0100)]
Put api keys directly in js layer definitions

Co-authored-by: Anton Khorev <tony29@yandex.ru>
19 months agoPreserve sidebar scroll position when prepending to history
Anton Khorev [Sun, 16 Mar 2025 16:21:10 +0000 (19:21 +0300)]
Preserve sidebar scroll position when prepending to history

19 months agoAdd 'after' parameter to history pages
Anton Khorev [Sun, 16 Mar 2025 00:18:23 +0000 (03:18 +0300)]
Add 'after' parameter to history pages

19 months agoMerge remote-tracking branch 'upstream/pull/5796'
Tom Hughes [Sun, 16 Mar 2025 15:29:40 +0000 (15:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5796'

19 months agoMerge remote-tracking branch 'upstream/pull/5805'
Tom Hughes [Sun, 16 Mar 2025 14:56:55 +0000 (14:56 +0000)]
Merge remote-tracking branch 'upstream/pull/5805'

19 months agoMerge remote-tracking branch 'upstream/pull/5806'
Tom Hughes [Sun, 16 Mar 2025 14:45:16 +0000 (14:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5806'

20 months agoChange cursor to pointer on nonempty calendar cells
Anton Khorev [Sat, 15 Mar 2025 17:32:48 +0000 (20:32 +0300)]
Change cursor to pointer on nonempty calendar cells

20 months agoAdd links to days in user history from heatmap
Anton Khorev [Sat, 15 Mar 2025 22:34:36 +0000 (01:34 +0300)]
Add links to days in user history from heatmap

20 months agoAdd 'before' parameter to history pages
Anton Khorev [Sat, 15 Mar 2025 23:11:22 +0000 (02:11 +0300)]
Add 'before' parameter to history pages

20 months agoSwitch from 'max_id' to 'before' parameter in history lists
Anton Khorev [Sat, 15 Mar 2025 23:05:18 +0000 (02:05 +0300)]
Switch from 'max_id' to 'before' parameter in history lists

This is to match older/newer pagination that uses 'before' and 'after' parameters.

20 months agoFix heatmap month titles in Western Hemisphere
Anton Khorev [Sat, 15 Mar 2025 18:09:55 +0000 (21:09 +0300)]
Fix heatmap month titles in Western Hemisphere

20 months agoMerge remote-tracking branch 'upstream/pull/5801'
Tom Hughes [Fri, 14 Mar 2025 17:32:45 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5801'