]>
git.openstreetmap.org Git - rails.git/log
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
Tom Hughes [Fri, 20 Dec 2024 10:18:12 +0000 (10:18 +0000)]
Avoid parsing of XML requests with ; in the body
Tom Hughes [Tue, 25 Feb 2025 19:08:57 +0000 (19:08 +0000)]
Replace permit/require with expect for parameter validation
Tom Hughes [Tue, 19 Nov 2024 20:25:58 +0000 (20:25 +0000)]
Update to rails 8.0.2
Tom Hughes [Wed, 19 Mar 2025 19:19:09 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5824'
Tom Hughes [Wed, 19 Mar 2025 18:51:54 +0000 (18:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5823'
Marwin Hochfelsner [Wed, 19 Mar 2025 18:34:57 +0000 (19:34 +0100)]
Add reload on iframe redirect
Tom Hughes [Wed, 19 Mar 2025 18:47:57 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5823'
Marwin Hochfelsner [Wed, 19 Mar 2025 18:34:57 +0000 (19:34 +0100)]
Add reload on iframe redirect
Tom Hughes [Wed, 19 Mar 2025 17:47:53 +0000 (17:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5812'
Tom Hughes [Wed, 19 Mar 2025 17:42:21 +0000 (17:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5818'
Tom Hughes [Wed, 19 Mar 2025 17:36:59 +0000 (17:36 +0000)]
Get current locale correctly in routing engines
Fixes #5821.
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
Tom Hughes [Wed, 19 Mar 2025 08:27:15 +0000 (08:27 +0000)]
Switch to dynamic allocation for the Firefox bidi port
Kyle Hensel [Tue, 18 Mar 2025 09:11:19 +0000 (20:11 +1100)]
update-wiki-pages: process ChangesetKey template
Marwin Hochfelsner [Wed, 19 Mar 2025 04:44:04 +0000 (05:44 +0100)]
Make URLs more relative
Tom Hughes [Tue, 18 Mar 2025 18:21:40 +0000 (18:21 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 18 Mar 2025 18:17:24 +0000 (18:17 +0000)]
Update bundle
Anton Khorev [Tue, 18 Mar 2025 00:48:52 +0000 (03:48 +0300)]
Merge branch 'pull/5811'
Tom Hughes [Mon, 17 Mar 2025 17:29:50 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5817'
Tom Hughes [Mon, 17 Mar 2025 17:29:44 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5814'
Tom Hughes [Sun, 16 Mar 2025 16:16:22 +0000 (16:16 +0000)]
Update to i18n-js 4.x
Tom Hughes [Sun, 16 Mar 2025 16:16:22 +0000 (16:16 +0000)]
Replace use of I18n in javascript with OSM.i18n
Tom Hughes [Sun, 16 Mar 2025 18:44:35 +0000 (18:44 +0000)]
Add OSM.i18n as an alias for I18n
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.
translatewiki.net [Mon, 17 Mar 2025 12:14:31 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Mon, 17 Mar 2025 01:49:52 +0000 (04:49 +0300)]
Create heatmap links using <a> elements
Tom Hughes [Sun, 16 Mar 2025 22:38:09 +0000 (22:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5813'
Marwin Hochfelsner [Sun, 16 Mar 2025 20:10:48 +0000 (21:10 +0100)]
Remove workaround for iD 2.31
Tom Hughes [Sun, 16 Mar 2025 19:09:20 +0000 (19:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5809'
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>
Anton Khorev [Sun, 16 Mar 2025 16:21:10 +0000 (19:21 +0300)]
Preserve sidebar scroll position when prepending to history
Anton Khorev [Sun, 16 Mar 2025 00:18:23 +0000 (03:18 +0300)]
Add 'after' parameter to history pages
Tom Hughes [Sun, 16 Mar 2025 15:29:40 +0000 (15:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5796'
Tom Hughes [Sun, 16 Mar 2025 14:56:55 +0000 (14:56 +0000)]
Merge remote-tracking branch 'upstream/pull/5805'
Tom Hughes [Sun, 16 Mar 2025 14:45:16 +0000 (14:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5806'
Anton Khorev [Sat, 15 Mar 2025 17:32:48 +0000 (20:32 +0300)]
Change cursor to pointer on nonempty calendar cells
Anton Khorev [Sat, 15 Mar 2025 22:34:36 +0000 (01:34 +0300)]
Add links to days in user history from heatmap
Anton Khorev [Sat, 15 Mar 2025 23:11:22 +0000 (02:11 +0300)]
Add 'before' parameter to history pages
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.
Anton Khorev [Sat, 15 Mar 2025 18:09:55 +0000 (21:09 +0300)]
Fix heatmap month titles in Western Hemisphere
Tom Hughes [Fri, 14 Mar 2025 17:32:45 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5801'
Anton Khorev [Fri, 14 Mar 2025 17:13:05 +0000 (20:13 +0300)]
Test end states of api changeset subscriptions
Anton Khorev [Thu, 13 Mar 2025 14:25:36 +0000 (17:25 +0300)]
Test legacy api changeset subscribe/unsubscribe paths
Anton Khorev [Thu, 13 Mar 2025 14:41:38 +0000 (17:41 +0300)]
Split api changeset subscription tests
Anton Khorev [Sun, 23 Feb 2025 04:36:03 +0000 (07:36 +0300)]
Create api changeset subscription resource
Tom Hughes [Fri, 14 Mar 2025 16:54:01 +0000 (16:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5765'
Tom Hughes [Fri, 14 Mar 2025 16:47:14 +0000 (16:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5800'
Tom Hughes [Fri, 14 Mar 2025 16:43:50 +0000 (16:43 +0000)]
Merge remote-tracking branch 'upstream/pull/5799'
Anton Khorev [Fri, 14 Mar 2025 15:11:49 +0000 (18:11 +0300)]
Align bottoms of date-username-changeset_id and counters in history
Anton Khorev [Fri, 14 Mar 2025 11:42:00 +0000 (14:42 +0300)]
Test map centering on a node
Anton Khorev [Fri, 14 Mar 2025 11:06:03 +0000 (14:06 +0300)]
Disable asynchronous object layer loading
Tom Hughes [Thu, 13 Mar 2025 19:40:45 +0000 (19:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5797'
Tom Hughes [Thu, 13 Mar 2025 19:14:49 +0000 (19:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5009'
Tom Hughes [Wed, 12 Mar 2025 18:45:27 +0000 (18:45 +0000)]
Monkey patch Selenium to allocate unique bidi ports
https://github.com/mozilla/geckodriver/issues/2218
Tom Hughes [Thu, 13 Mar 2025 17:15:37 +0000 (17:15 +0000)]
Merge remote-tracking branch 'upstream/pull/5794'
Tom Hughes [Thu, 13 Mar 2025 17:13:20 +0000 (17:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5795'
Anton Khorev [Thu, 13 Mar 2025 16:32:38 +0000 (19:32 +0300)]
Remove subscription methods from changeset model
Undoes
8e21e4e80156a1fc29d7b283b254ff623ca844b6 , but these methods weren't used consistently.
Anton Khorev [Thu, 13 Mar 2025 15:49:27 +0000 (18:49 +0300)]
Create changeset subscription model
translatewiki.net [Thu, 13 Mar 2025 12:15:51 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Wed, 12 Mar 2025 15:37:39 +0000 (15:37 +0000)]
Bump json from 2.10.1 to 2.10.2
Bumps [json](https://github.com/ruby/json) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/ruby/json/releases)
- [Changelog](https://github.com/ruby/json/blob/master/CHANGES.md)
- [Commits](https://github.com/ruby/json/compare/v2.10.1...v2.10.2)
---
updated-dependencies:
- dependency-name: json
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Anton Khorev [Wed, 12 Mar 2025 13:58:11 +0000 (16:58 +0300)]
Merge branch 'pull/5793'
nertc [Wed, 12 Mar 2025 08:39:13 +0000 (12:39 +0400)]
Map Data asynchronous checkbox
Tom Hughes [Tue, 11 Mar 2025 23:02:03 +0000 (23:02 +0000)]
Drop redundant parameters from user list form
Tom Hughes [Tue, 11 Mar 2025 22:45:08 +0000 (22:45 +0000)]
Preserve username and edit filters over bulk user updates
Tom Hughes [Tue, 11 Mar 2025 22:44:54 +0000 (22:44 +0000)]
Fix error if no users are selected for a bulk update
Anton Khorev [Wed, 12 Mar 2025 00:11:25 +0000 (03:11 +0300)]
Don't crop coordinates when replacing directions url
Tom Hughes [Tue, 11 Mar 2025 18:47:18 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/5402'
Tom Hughes [Tue, 11 Mar 2025 18:31:39 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5792'
Tom Hughes [Tue, 11 Mar 2025 18:30:44 +0000 (18:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5791'
Tom Hughes [Tue, 11 Mar 2025 18:25:07 +0000 (18:25 +0000)]
Merge remote-tracking branch 'upstream/pull/5790'
Tom Hughes [Tue, 11 Mar 2025 18:10:56 +0000 (18:10 +0000)]
Move remaining rubocop plugins to new plugins clause
Tom Hughes [Tue, 11 Mar 2025 18:09:25 +0000 (18:09 +0000)]
Update bundle
Tom Hughes [Tue, 11 Mar 2025 18:08:37 +0000 (18:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5788'
Jimmykhangnguyen [Tue, 11 Mar 2025 13:53:49 +0000 (09:53 -0400)]
Fixed the grammatical mistake regarding the hyphen in sign-up and log-in mentioned in Issue #5772
Anton Khorev [Tue, 11 Mar 2025 10:49:21 +0000 (13:49 +0300)]
Convert reportable_dates helper into heading helper
Anton Khorev [Tue, 11 Mar 2025 08:42:39 +0000 (11:42 +0300)]
Fix overlap between left sidebar heading and close button
Anton Khorev [Tue, 11 Mar 2025 08:00:45 +0000 (11:00 +0300)]
Merge branch 'pull/5783'
dependabot[bot] [Tue, 11 Mar 2025 02:43:45 +0000 (02:43 +0000)]
Bump rack from 2.2.12 to 2.2.13
Bumps [rack](https://github.com/rack/rack) from 2.2.12 to 2.2.13.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.12...v2.2.13)
---
updated-dependencies:
- dependency-name: rack
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Emin Kocan [Mon, 16 Dec 2024 15:31:42 +0000 (16:31 +0100)]
Add tests for heatmap data in UsersController
Emin Kocan [Mon, 16 Dec 2024 15:24:03 +0000 (16:24 +0100)]
Add heatmap data caching and query for user contributions
Tom Hughes [Mon, 10 Mar 2025 17:19:09 +0000 (17:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5787'
Tom Hughes [Mon, 10 Mar 2025 17:16:49 +0000 (17:16 +0000)]
Merge remote-tracking branch 'upstream/pull/5786'
Tom Hughes [Sun, 9 Mar 2025 19:42:48 +0000 (19:42 +0000)]
Allow user list to be filtered for the presence of edits
Anton Khorev [Mon, 10 Mar 2025 16:17:37 +0000 (19:17 +0300)]
Show dates of reported items on issue pages
Anton Khorev [Mon, 10 Mar 2025 14:49:17 +0000 (17:49 +0300)]
Order issue reports by id
translatewiki.net [Mon, 10 Mar 2025 12:12:37 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Sun, 9 Mar 2025 15:09:41 +0000 (18:09 +0300)]
Merge branch 'pull/5745'
Tom Hughes [Sun, 9 Mar 2025 14:57:32 +0000 (14:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5781'
Anton Khorev [Sun, 9 Mar 2025 13:39:01 +0000 (16:39 +0300)]
Translate step distance units
Anton Khorev [Sun, 9 Mar 2025 13:30:49 +0000 (16:30 +0300)]
Rename distance formatting functions
Anton Khorev [Sun, 9 Mar 2025 13:29:22 +0000 (16:29 +0300)]
Return to a previous structure of getDistText
Undoes part of
a3c45f6ed66862ee394e2a207dedf400acef9b07 to make getDistText similar to formatDistance.
Anton Khorev [Sun, 9 Mar 2025 13:13:51 +0000 (16:13 +0300)]
Move getDistText next to other formatting functions
Anton Khorev [Sun, 9 Mar 2025 13:04:42 +0000 (16:04 +0300)]
Remove unitTemplate from formatDistance
Undoes part of
a3c45f6ed66862ee394e2a207dedf400acef9b07 to make I18n string references searchable again.
Anton Khorev [Sun, 9 Mar 2025 14:12:48 +0000 (17:12 +0300)]
Disable no-else-return eslint rule
Tom Hughes [Mon, 3 Mar 2025 22:48:56 +0000 (22:48 +0000)]
Drop locale fallback from no to nb
It hasn't worked for some time, probably since
4028f4cdb9 at least
as we don't consider the fallback during locale selection.
Tom Hughes [Sat, 8 Mar 2025 17:35:49 +0000 (17:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5778'
Anton Khorev [Sat, 8 Mar 2025 15:26:07 +0000 (18:26 +0300)]
Make close buttons stick to the top of scrolled areas
Anton Khorev [Sat, 8 Mar 2025 15:21:25 +0000 (18:21 +0300)]
Create template for sidebar close controls
Anton Khorev [Sat, 8 Mar 2025 15:15:17 +0000 (18:15 +0300)]
Move close button out of right sidebar content