]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Sun, 16 Feb 2025 14:19:45 +0000 (14:19 +0000)]
Merge pull request #5688 from tomhughes/spam-check-report
Make reports trigger a spam check on the reported user
Andy Allan [Sun, 16 Feb 2025 14:17:44 +0000 (14:17 +0000)]
Merge pull request #5689 from tomhughes/settings-fixes
User settings fixes
Tom Hughes [Sun, 16 Feb 2025 13:34:12 +0000 (13:34 +0000)]
Make reports trigger a spam check on the reported user
Tom Hughes [Sun, 16 Feb 2025 14:06:46 +0000 (14:06 +0000)]
Only count reports from distinct users in spam checks
Tom Hughes [Wed, 1 Jan 2025 12:27:05 +0000 (12:27 +0000)]
Move errors from email to new_email properly
Tom Hughes [Wed, 1 Jan 2025 12:11:22 +0000 (12:11 +0000)]
Replace count.zero? with empty?
Tom Hughes [Sun, 16 Feb 2025 13:18:14 +0000 (13:18 +0000)]
Merge remote-tracking branch 'upstream/pull/5685'
Tom Hughes [Sun, 16 Feb 2025 13:11:45 +0000 (13:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5278'
Andy Allan [Sun, 16 Feb 2025 11:51:52 +0000 (11:51 +0000)]
Merge pull request #5676 from tomhughes/spam-score-reports
Include spam reports on unresolved issues in the spam score
Andy Allan [Sun, 16 Feb 2025 11:48:17 +0000 (11:48 +0000)]
Merge pull request #5558 from tomhughes/var-let-const
Replace var in javascript with let/const
Tom Hughes [Sun, 26 Jan 2025 19:06:27 +0000 (19:06 +0000)]
Replace uses of var with let or const as appropriate
Tom Hughes [Sun, 26 Jan 2025 19:05:56 +0000 (19:05 +0000)]
Update eslint to prefer let/const over var
Tom Hughes [Sun, 16 Feb 2025 11:12:47 +0000 (11:12 +0000)]
Merge remote-tracking branch 'upstream/pull/5686'
Martin Raifer [Sun, 16 Feb 2025 09:55:54 +0000 (10:55 +0100)]
don't pan map wen closing/reopening/commenting a note, fixes #648
Martin Raifer [Sun, 16 Feb 2025 09:36:00 +0000 (10:36 +0100)]
don't re-pan the map when selecting another note that is already on the screen
fixes a regression in #5679
Tom Hughes [Sun, 16 Feb 2025 09:04:17 +0000 (09:04 +0000)]
Merge remote-tracking branch 'upstream/pull/4359'
Tom Hughes [Sun, 16 Feb 2025 08:34:14 +0000 (08:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5684'
Marwin Hochfelsner [Sat, 15 Feb 2025 22:21:39 +0000 (23:21 +0100)]
Move OAuth requests to fetch
Anton Khorev [Fri, 14 Feb 2025 17:02:22 +0000 (20:02 +0300)]
Add option to use headless Firefox in system tests
Andy Allan [Sat, 15 Feb 2025 17:37:48 +0000 (17:37 +0000)]
Merge pull request #5677 from tomhughes/user-list-enhancements
User list enhancements
Tom Hughes [Sat, 15 Feb 2025 17:36:29 +0000 (17:36 +0000)]
Merge remote-tracking branch 'upstream/pull/5681'
Tom Hughes [Sat, 15 Feb 2025 17:35:49 +0000 (17:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5680'
Andy Allan [Sat, 15 Feb 2025 16:48:04 +0000 (16:48 +0000)]
Use title case consistently for nav tab labels
Tom Hughes [Sat, 15 Feb 2025 17:07:59 +0000 (17:07 +0000)]
Merge remote-tracking branch 'upstream/pull/4926'
Andy Allan [Sat, 15 Feb 2025 14:57:16 +0000 (14:57 +0000)]
Use 'My Account' for account pages
It's hard to make a distinction between 'Preferences' and 'Settings' in some languages,
and many other sites use the term 'Account' for things like changing email.
Anton Khorev [Sat, 15 Feb 2025 17:03:42 +0000 (20:03 +0300)]
Merge branch 'pull/5678'
Tom Hughes [Sat, 15 Feb 2025 16:42:53 +0000 (16:42 +0000)]
Merge remote-tracking branch 'upstream/pull/4301'
Anton Khorev [Tue, 21 Nov 2023 15:56:41 +0000 (18:56 +0300)]
Add changeset comment search api json format
Anton Khorev [Thu, 16 Nov 2023 07:03:26 +0000 (10:03 +0300)]
Add changeset comment search api with filtering by author and time
Tom Hughes [Sat, 15 Feb 2025 16:31:12 +0000 (16:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5131'
Anton Khorev [Fri, 20 Oct 2023 10:07:42 +0000 (13:07 +0300)]
Add user block api call
Tom Hughes [Sat, 15 Feb 2025 16:16:37 +0000 (16:16 +0000)]
Merge remote-tracking branch 'upstream/pull/5679'
Anton Khorev [Thu, 19 Oct 2023 17:04:08 +0000 (20:04 +0300)]
Test more block attributes in show call
Anton Khorev [Tue, 21 Nov 2023 10:08:50 +0000 (13:08 +0300)]
Move query notes by user value to mixin
Anton Khorev [Tue, 21 Nov 2023 09:34:10 +0000 (12:34 +0300)]
Move common query time condition to mixin
Anton Khorev [Mon, 20 Nov 2023 09:44:02 +0000 (12:44 +0300)]
Add changeset comment query limit settings; use common query limit in changeset comment feeds
Anton Khorev [Wed, 15 Nov 2023 13:30:24 +0000 (16:30 +0300)]
Move common query limit method of changesets and notes to mixin
Anton Khorev [Thu, 27 Jun 2024 01:02:38 +0000 (04:02 +0300)]
Show alert on account home page if home location is not set
Anton Khorev [Thu, 27 Jun 2024 00:37:13 +0000 (03:37 +0300)]
Add "Go to Home Location" to every page, link it to account home page
Anton Khorev [Thu, 27 Jun 2024 00:26:35 +0000 (03:26 +0300)]
Show/hide marker in account home js controller
Anton Khorev [Thu, 27 Jun 2024 00:01:39 +0000 (03:01 +0300)]
Add empty account home page
Anton Khorev [Fri, 30 Aug 2024 02:45:46 +0000 (05:45 +0300)]
Add lang/dir html attributes to error pages
Anton Khorev [Fri, 30 Aug 2024 02:10:11 +0000 (05:10 +0300)]
Use flex layout on error pages
Anton Khorev [Fri, 30 Aug 2024 02:20:34 +0000 (05:20 +0300)]
Adjust logo css on error pages
Anton Khorev [Fri, 30 Aug 2024 02:13:49 +0000 (05:13 +0300)]
Use system font on error pages
Anton Khorev [Fri, 30 Aug 2024 02:09:24 +0000 (05:09 +0300)]
Move http-equiv and viewport meta tags to meta template
Martin Raifer [Sat, 15 Feb 2025 15:54:24 +0000 (16:54 +0100)]
fix map panning to objects when url hash is not empty but has no map location, fixes #865
Tom Hughes [Sat, 15 Feb 2025 15:48:46 +0000 (15:48 +0000)]
Merge remote-tracking branch 'upstream/pull/5672'
Anton Khorev [Fri, 14 Feb 2025 17:09:05 +0000 (20:09 +0300)]
Add option to override Firefox binary used in system tests
Tom Hughes [Sat, 15 Feb 2025 15:22:36 +0000 (15:22 +0000)]
Merge remote-tracking branch 'upstream/pull/5233'
Tom Hughes [Sat, 15 Feb 2025 15:05:00 +0000 (15:05 +0000)]
Prevent caching a partial XHR response as a full page URL
Fixes #5663
Tom Hughes [Sat, 15 Feb 2025 14:44:58 +0000 (14:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5521'
Andy Allan [Sat, 15 Feb 2025 14:38:51 +0000 (14:38 +0000)]
Merge pull request #5363 from AntonKhorev/no-compact-nav-2
Dynamic "more" dropdown
Tom Hughes [Sat, 15 Feb 2025 14:36:02 +0000 (14:36 +0000)]
Allow searching users by IP subnet
Tom Hughes [Sat, 15 Feb 2025 14:21:35 +0000 (14:21 +0000)]
Add search form to the top of the user list view
Tom Hughes [Sat, 15 Feb 2025 14:12:31 +0000 (14:12 +0000)]
Preserve status parameter in IP links in user lists
Andy Allan [Sat, 15 Feb 2025 14:03:55 +0000 (14:03 +0000)]
Merge pull request #5514 from AntonKhorev/pd-declaration
Remove public domain checkbox from signup and terms pages
Roman Deev [Sun, 19 Jan 2025 11:31:52 +0000 (14:31 +0300)]
Fix left/right sidebar resizing on mobile devices
Tom Hughes [Sat, 15 Feb 2025 13:54:04 +0000 (13:54 +0000)]
Include spam reports on unresolved issues in the spam score
Tom Hughes [Sat, 15 Feb 2025 11:15:25 +0000 (11:15 +0000)]
Merge remote-tracking branch 'upstream/pull/5452'
Tom Hughes [Sat, 15 Feb 2025 09:11:03 +0000 (09:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5669'
Tom Hughes [Sat, 15 Feb 2025 08:52:19 +0000 (08:52 +0000)]
Update bundle
Tom Hughes [Sat, 15 Feb 2025 08:51:36 +0000 (08:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5673'
Tom Hughes [Sat, 15 Feb 2025 08:50:34 +0000 (08:50 +0000)]
Merge remote-tracking branch 'upstream/pull/5674'
Tom Hughes [Sat, 15 Feb 2025 08:44:47 +0000 (08:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5675'
Anton Khorev [Sat, 15 Feb 2025 02:49:15 +0000 (05:49 +0300)]
Use changeset tag factory in api changeset json test
Anton Khorev [Sat, 15 Feb 2025 00:34:53 +0000 (03:34 +0300)]
Check user instead of scope when getting note author info
Previously it was possible to create a note while authorized but having no write_notes scope. Currently it's not possible.
Anton Khorev [Fri, 14 Feb 2025 22:20:06 +0000 (01:20 +0300)]
Remove current_user branch from ApiController#deny_access
Unreachable because if there's no doorkeeper_token, there's also no current_user.
Anton Khorev [Wed, 1 Jan 2025 03:13:54 +0000 (06:13 +0300)]
Output active blocks list
Anton Khorev [Wed, 1 Jan 2025 02:31:05 +0000 (05:31 +0300)]
Skip blocks check when getting active blocks list
Anton Khorev [Wed, 1 Jan 2025 01:40:34 +0000 (04:40 +0300)]
Add active blocks list api endpoint with empty response
Marwin Hochfelsner [Thu, 13 Feb 2025 15:50:18 +0000 (16:50 +0100)]
Transition more requests to fetch
Tom Hughes [Thu, 13 Feb 2025 22:03:28 +0000 (22:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5666'
Anton Khorev [Thu, 13 Feb 2025 01:31:23 +0000 (04:31 +0300)]
Test commenting changesets with different scopes
Anton Khorev [Wed, 12 Feb 2025 16:32:14 +0000 (19:32 +0300)]
Add write_changeset_comments scope
Anton Khorev [Wed, 12 Feb 2025 15:13:56 +0000 (18:13 +0300)]
Pass scopes instead of token to ApiAbility
Anton Khorev [Wed, 12 Feb 2025 14:14:21 +0000 (17:14 +0300)]
Pass user to ApiAbility
Anton Khorev [Thu, 13 Feb 2025 00:03:36 +0000 (03:03 +0300)]
Split api changeset comment unhide fail tests
Anton Khorev [Wed, 12 Feb 2025 23:49:54 +0000 (02:49 +0300)]
Split api changeset comment hide fail tests
Anton Khorev [Thu, 13 Feb 2025 01:05:56 +0000 (04:05 +0300)]
Split changeset comment subscription emails test
Anton Khorev [Thu, 13 Feb 2025 00:33:48 +0000 (03:33 +0300)]
Test state of created comment
Anton Khorev [Wed, 12 Feb 2025 16:03:42 +0000 (19:03 +0300)]
Split api changeset comment create scope and terms tests
Anton Khorev [Wed, 12 Feb 2025 15:56:09 +0000 (18:56 +0300)]
Split api changeset comment create fail tests
Anton Khorev [Wed, 12 Feb 2025 15:42:27 +0000 (18:42 +0300)]
Rename api changeset comment tests
Tom Hughes [Thu, 13 Feb 2025 18:08:02 +0000 (18:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5668'
Tom Hughes [Thu, 13 Feb 2025 17:49:59 +0000 (17:49 +0000)]
Merge remote-tracking branch 'upstream/pull/5665'
Mateusz Konieczny [Thu, 13 Feb 2025 13:52:48 +0000 (14:52 +0100)]
rerun script/misc/update-wiki-pages
translatewiki.net [Thu, 13 Feb 2025 12:15:54 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Wed, 12 Feb 2025 23:46:31 +0000 (23:46 +0000)]
Bump rack from 2.2.10 to 2.2.11
Bumps [rack](https://github.com/rack/rack) from 2.2.10 to 2.2.11.
- [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.10...v2.2.11)
---
updated-dependencies:
- dependency-name: rack
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 12 Feb 2025 18:21:02 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5632'
Tom Hughes [Wed, 12 Feb 2025 18:11:38 +0000 (18:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5661'
Tom Hughes [Wed, 12 Feb 2025 17:59:25 +0000 (17:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5622'
Tom Hughes [Wed, 12 Feb 2025 17:58:06 +0000 (17:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5642'
Tom Hughes [Wed, 12 Feb 2025 17:55:26 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5650'
Nenad Vujicic [Fri, 17 Jan 2025 17:53:05 +0000 (18:53 +0100)]
Updates notes filtering to search description too
Updates notes filtering to search for query text in both note comments and note's description.
Nenad Vujicic [Thu, 6 Feb 2025 21:01:21 +0000 (22:01 +0100)]
Adds index to notes on description column
Adds text index to description column to table notes.
Martin Raifer [Wed, 12 Feb 2025 15:23:31 +0000 (16:23 +0100)]
replace all occurrences of `+`
Martin Raifer [Wed, 12 Feb 2025 13:10:25 +0000 (14:10 +0100)]
lint
Martin Raifer [Wed, 12 Feb 2025 13:08:19 +0000 (14:08 +0100)]
workaround for iD bug #10761
the current version of iD (v2.31, before the fix for https://github.com/openstreetmap/iD/issue/10761: https://github.com/openstreetmap/iD/pull/10766), does not fully support `x-www-form-urlencoded` "query-style" strings in the hash: Specifically, spaces encoded as `+` will not be decoded back to ` `.
This workaround essentially temporarily reverts the behaviour of the website to the state before #5592, and can be dropped again with the next minor version upgrade of iD (`v2.32`).
Anton Khorev [Tue, 3 Dec 2024 05:48:50 +0000 (08:48 +0300)]
Mark secondary nav as permanent between Turbo morphs