]> git.openstreetmap.org Git - rails.git/log
rails.git
2 months agoCompacted repeated "Results" into one sentence
Nenad Vujicic [Fri, 23 Aug 2024 12:59:04 +0000 (14:59 +0200)]
Compacted repeated "Results" into one sentence

Fixes #5065. Removed "Results from" from search results.

2 months agoMerge branch 'pull/5129'
Anton Khorev [Thu, 29 Aug 2024 15:58:45 +0000 (18:58 +0300)]
Merge branch 'pull/5129'

2 months agoDecrease number of issues in pagination test
Anton Khorev [Thu, 29 Aug 2024 15:57:27 +0000 (18:57 +0300)]
Decrease number of issues in pagination test

2 months agoTest failures on issues pagination
nertc [Thu, 29 Aug 2024 13:07:05 +0000 (17:07 +0400)]
Test failures on issues pagination

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Aug 2024 12:13:43 +0000 (14:13 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoMerge remote-tracking branch 'upstream/pull/5126'
Tom Hughes [Wed, 28 Aug 2024 18:03:53 +0000 (19:03 +0100)]
Merge remote-tracking branch 'upstream/pull/5126'

2 months agoMerge remote-tracking branch 'upstream/pull/4565'
Tom Hughes [Wed, 28 Aug 2024 17:59:09 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/4565'

2 months agoMerge pull request #5124 from tomhughes/turbo-issue-search
Andy Allan [Wed, 28 Aug 2024 17:52:10 +0000 (18:52 +0100)]
Merge pull request #5124 from tomhughes/turbo-issue-search

Use turbo to update issue search results

2 months agoMerge remote-tracking branch 'upstream/pull/5120'
Tom Hughes [Wed, 28 Aug 2024 17:38:34 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5120'

2 months agoRename Feeds::ChangesetCommentsController to ChangesetComments::FeedsController
Andy Allan [Wed, 28 Aug 2024 17:18:26 +0000 (18:18 +0100)]
Rename Feeds::ChangesetCommentsController to ChangesetComments::FeedsController

We usually create nested controllers with the main controller as the module,
and the nested controller as the specialization, e.g. Users::DeletionsController
or Traces::IconsController.

This then leaves the topic of whether the feed resource is plural, and whether we
are then showing a singular feed or showing a list (index) of objects.

The routes are carefully named so that we have `changesets_comments_feed_path` (the
comments feed for all changesets) vs `changeset_comment_feed_path(changeset)` (the
comments for a singular changeset).

2 months agoMerge pull request #4587 from AntonKhorev/changeset-comment-routes
Andy Allan [Wed, 28 Aug 2024 17:30:11 +0000 (18:30 +0100)]
Merge pull request #4587 from AntonKhorev/changeset-comment-routes

Move changeset comments feed to resourceful routes

2 months agoMerge pull request #5093 from AntonKhorev/diary-comments-shallow-paths
Andy Allan [Wed, 28 Aug 2024 13:58:53 +0000 (14:58 +0100)]
Merge pull request #5093 from AntonKhorev/diary-comments-shallow-paths

Use shallow routes for diary comments

2 months agoMerge pull request #5034 from grischard/patch-4
Andy Allan [Wed, 28 Aug 2024 13:55:36 +0000 (14:55 +0100)]
Merge pull request #5034 from grischard/patch-4

Add planet link and explanation to robots.txt

2 months agoMerge pull request #5060 from tomhughes/rake-expiry
Andy Allan [Wed, 28 Aug 2024 13:54:31 +0000 (14:54 +0100)]
Merge pull request #5060 from tomhughes/rake-expiry

Move token expiry to a rake task

2 months agoAllowed sending follow-ups for sent messages
Nenad Vujicic [Thu, 22 Aug 2024 21:37:39 +0000 (23:37 +0200)]
Allowed sending follow-ups for sent messages

Fixes #3497. Adds Reply button when displaying sent messages (app/views/messages/show.html.erb) and allows replying to messages for which sender is current user (app/controllers/messages_controller.rb). Improved tests for testing added functionality.

2 months agoUse turbo to update issue search results
Tom Hughes [Tue, 27 Aug 2024 18:19:49 +0000 (19:19 +0100)]
Use turbo to update issue search results

2 months agoMerge remote-tracking branch 'upstream/pull/5057'
Tom Hughes [Tue, 27 Aug 2024 18:07:47 +0000 (19:07 +0100)]
Merge remote-tracking branch 'upstream/pull/5057'

2 months agoUpdate rubocop todo
Tom Hughes [Tue, 27 Aug 2024 18:03:43 +0000 (19:03 +0100)]
Update rubocop todo

2 months agoUpdate bundle
Tom Hughes [Tue, 27 Aug 2024 16:47:47 +0000 (17:47 +0100)]
Update bundle

2 months agoAdd turbo to Issues page
nertc [Tue, 27 Aug 2024 07:50:43 +0000 (11:50 +0400)]
Add turbo to Issues page

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Aug 2024 12:15:06 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoAdd pagination to Issues page
nertc [Mon, 19 Aug 2024 18:09:06 +0000 (22:09 +0400)]
Add pagination to Issues page

2 months agoMerge remote-tracking branch 'upstream/pull/5113'
Tom Hughes [Sun, 25 Aug 2024 16:27:37 +0000 (17:27 +0100)]
Merge remote-tracking branch 'upstream/pull/5113'

3 months agoBump eslint from 9.9.0 to 9.9.1
dependabot[bot] [Fri, 23 Aug 2024 23:46:41 +0000 (23:46 +0000)]
Bump eslint from 9.9.0 to 9.9.1

Bumps [eslint](https://github.com/eslint/eslint) from 9.9.0 to 9.9.1.
- [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.9.0...v9.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 months agoMerge remote-tracking branch 'upstream/pull/5106'
Tom Hughes [Fri, 23 Aug 2024 17:27:10 +0000 (18:27 +0100)]
Merge remote-tracking branch 'upstream/pull/5106'

3 months agoBackfill block deactivates_at
Anton Khorev [Thu, 22 Aug 2024 12:45:59 +0000 (15:45 +0300)]
Backfill block deactivates_at

3 months agoMerge remote-tracking branch 'upstream/pull/5110'
Tom Hughes [Fri, 23 Aug 2024 17:09:21 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/pull/5110'

3 months agoMerge remote-tracking branch 'upstream/pull/5111'
Tom Hughes [Fri, 23 Aug 2024 17:01:27 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5111'

3 months agoMerge remote-tracking branch 'upstream/pull/5107'
Tom Hughes [Fri, 23 Aug 2024 16:48:48 +0000 (17:48 +0100)]
Merge remote-tracking branch 'upstream/pull/5107'

3 months agoMove changeset comment feeds to resourceful routes
Anton Khorev [Fri, 23 Aug 2024 15:14:19 +0000 (18:14 +0300)]
Move changeset comment feeds to resourceful routes

3 months agoMove changeset comments controller to feeds module
Anton Khorev [Fri, 23 Aug 2024 14:40:26 +0000 (17:40 +0300)]
Move changeset comments controller to feeds module

3 months agoDisable turbo on all links inside pagination frames except older/newer
Anton Khorev [Fri, 23 Aug 2024 12:00:55 +0000 (15:00 +0300)]
Disable turbo on all links inside pagination frames except older/newer

3 months agoRemove revoke block action
Anton Khorev [Fri, 23 Aug 2024 10:34:08 +0000 (13:34 +0300)]
Remove revoke block action

3 months agoRemove revoke block pages
Anton Khorev [Fri, 23 Aug 2024 10:23:29 +0000 (13:23 +0300)]
Remove revoke block pages

3 months agoUpdate block-api integration test to revoke block by editing
Anton Khorev [Fri, 23 Aug 2024 10:11:32 +0000 (13:11 +0300)]
Update block-api integration test to revoke block by editing

3 months agoRemove revoke buttons from block show pages
Anton Khorev [Fri, 23 Aug 2024 10:01:20 +0000 (13:01 +0300)]
Remove revoke buttons from block show pages

3 months agoRemove revoke buttons from block lists
Anton Khorev [Fri, 23 Aug 2024 09:55:53 +0000 (12:55 +0300)]
Remove revoke buttons from block lists

3 months agoStop testing revoke block buttons
Anton Khorev [Fri, 23 Aug 2024 09:55:20 +0000 (12:55 +0300)]
Stop testing revoke block buttons

3 months agoUpdate bundle
Tom Hughes [Thu, 22 Aug 2024 21:18:32 +0000 (22:18 +0100)]
Update bundle

3 months agoMerge remote-tracking branch 'upstream/pull/5104'
Tom Hughes [Thu, 22 Aug 2024 17:06:09 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5104'

3 months agoConvert dashboard test into a system test
Anton Khorev [Thu, 22 Aug 2024 14:47:26 +0000 (17:47 +0300)]
Convert dashboard test into a system test

Allows to remove an id used only for testing.

3 months agoChange dashboard heading levels
Anton Khorev [Thu, 22 Aug 2024 14:42:24 +0000 (17:42 +0300)]
Change dashboard heading levels

3 months agoRemove outdated test for friends in users controller
Anton Khorev [Thu, 22 Aug 2024 14:41:50 +0000 (17:41 +0300)]
Remove outdated test for friends in users controller

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Aug 2024 12:19:11 +0000 (14:19 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoChange submit button on block edit page when can only revoke
Anton Khorev [Wed, 21 Aug 2024 14:07:40 +0000 (17:07 +0300)]
Change submit button on block edit page when can only revoke

3 months agoRemove duration controls for blocks that can only be revoked by editing
Anton Khorev [Wed, 21 Aug 2024 13:58:34 +0000 (16:58 +0300)]
Remove duration controls for blocks that can only be revoked by editing

3 months agoLet all moderators revoke blocks by editing
Anton Khorev [Wed, 21 Aug 2024 13:51:19 +0000 (16:51 +0300)]
Let all moderators revoke blocks by editing

3 months agoShow edit buttons on active blocks to all moderators
Anton Khorev [Thu, 22 Aug 2024 09:56:15 +0000 (12:56 +0300)]
Show edit buttons on active blocks to all moderators

3 months agoAdd update block ability with conditions
Anton Khorev [Thu, 22 Aug 2024 09:53:08 +0000 (12:53 +0300)]
Add update block ability with conditions

3 months agoMerge pull request #4646 from tomhughes/turbo-pagination
Andy Allan [Wed, 21 Aug 2024 18:12:31 +0000 (19:12 +0100)]
Merge pull request #4646 from tomhughes/turbo-pagination

Use turbo for pagination

3 months agoMerge remote-tracking branch 'upstream/pull/5069'
Tom Hughes [Wed, 21 Aug 2024 18:04:06 +0000 (19:04 +0100)]
Merge remote-tracking branch 'upstream/pull/5069'

3 months agoMerge remote-tracking branch 'upstream/pull/5101'
Tom Hughes [Wed, 21 Aug 2024 17:32:39 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/5101'

3 months agoMerge remote-tracking branch 'upstream/pull/5102'
Tom Hughes [Wed, 21 Aug 2024 17:22:02 +0000 (18:22 +0100)]
Merge remote-tracking branch 'upstream/pull/5102'

3 months agoMerge pull request #5100 from tomhughes/overcommit
Andy Allan [Wed, 21 Aug 2024 16:09:17 +0000 (17:09 +0100)]
Merge pull request #5100 from tomhughes/overcommit

Add overcommit to manage git hooks

3 months agoupgrade to iD-2.30.2 (rotated Mapbox API tokens)
Martin Raifer [Wed, 21 Aug 2024 15:35:19 +0000 (17:35 +0200)]
upgrade to iD-2.30.2 (rotated Mapbox API tokens)

3 months agoUpdate to iD v2.30.1
Martin Raifer [Wed, 21 Aug 2024 09:26:40 +0000 (11:26 +0200)]
Update to iD v2.30.1

3 months agoRemove endpoint/input values on disable
Anton Khorev [Mon, 12 Aug 2024 04:29:27 +0000 (07:29 +0300)]
Remove endpoint/input values on disable

3 months agoAdd overcommit to manage git hooks
Tom Hughes [Tue, 20 Aug 2024 17:29:24 +0000 (18:29 +0100)]
Add overcommit to manage git hooks

3 months agoMerge remote-tracking branch 'upstream/pull/5099'
Tom Hughes [Tue, 20 Aug 2024 18:12:13 +0000 (19:12 +0100)]
Merge remote-tracking branch 'upstream/pull/5099'

3 months agoUpdate bundle
Tom Hughes [Tue, 20 Aug 2024 17:09:58 +0000 (18:09 +0100)]
Update bundle

3 months agoUse turbo for pagination
Tom Hughes [Mon, 12 Aug 2024 21:38:05 +0000 (22:38 +0100)]
Use turbo for pagination

3 months agoRead lat/lon attributes when generating context menu directions urls
Anton Khorev [Mon, 12 Aug 2024 02:41:30 +0000 (05:41 +0300)]
Read lat/lon attributes when generating context menu directions urls

3 months agoSave lat/lon to input data attributes
Anton Khorev [Mon, 12 Aug 2024 02:39:58 +0000 (05:39 +0300)]
Save lat/lon to input data attributes

3 months agoLimit coordinate precision in drag listener
Anton Khorev [Mon, 12 Aug 2024 02:19:22 +0000 (05:19 +0300)]
Limit coordinate precision in drag listener

3 months agoMerge remote-tracking branch 'upstream/pull/5095'
Tom Hughes [Tue, 20 Aug 2024 11:18:47 +0000 (12:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5095'

3 months agoMerge remote-tracking branch 'upstream/pull/5095'
Tom Hughes [Mon, 19 Aug 2024 18:05:44 +0000 (19:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5095'

3 months agoMerge remote-tracking branch 'upstream/pull/5090'
Tom Hughes [Mon, 19 Aug 2024 18:01:17 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5090'

3 months agoReplace geocode request boolean property with request object
Anton Khorev [Mon, 12 Aug 2024 01:12:05 +0000 (04:12 +0300)]
Replace geocode request boolean property with request object

3 months agoRemove endpoint markers in disable method
Anton Khorev [Mon, 19 Aug 2024 15:54:50 +0000 (18:54 +0300)]
Remove endpoint markers in disable method

3 months agoInstall endpoint listeners using enable/disable methods
Anton Khorev [Mon, 19 Aug 2024 15:50:27 +0000 (18:50 +0300)]
Install endpoint listeners using enable/disable methods

3 months agoMerge remote-tracking branch 'upstream/pull/5096'
Tom Hughes [Mon, 19 Aug 2024 17:18:26 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5096'

3 months agoMerge remote-tracking branch 'upstream/pull/5094'
Tom Hughes [Mon, 19 Aug 2024 17:16:51 +0000 (18:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5094'

3 months agoShow/hide "Where is this?" when setting search value from directions
Anton Khorev [Mon, 19 Aug 2024 17:05:48 +0000 (20:05 +0300)]
Show/hide "Where is this?" when setting search value from directions

3 months agoReplace geocode request boolean property with request object
Anton Khorev [Mon, 12 Aug 2024 01:12:05 +0000 (04:12 +0300)]
Replace geocode request boolean property with request object

3 months agoRemove endpoint markers in disable method
Anton Khorev [Mon, 19 Aug 2024 15:54:50 +0000 (18:54 +0300)]
Remove endpoint markers in disable method

3 months agoInstall endpoint listeners using enable/disable methods
Anton Khorev [Mon, 19 Aug 2024 15:50:27 +0000 (18:50 +0300)]
Install endpoint listeners using enable/disable methods

3 months agoRecord revokers when deactivating blocks by editing
Anton Khorev [Mon, 19 Aug 2024 12:21:59 +0000 (15:21 +0300)]
Record revokers when deactivating blocks by editing

3 months agoAdd deactivates_at date to user blocks
Anton Khorev [Tue, 13 Aug 2024 10:57:31 +0000 (13:57 +0300)]
Add deactivates_at date to user blocks

Block deactivation dates that take needs_view-block views into account were derived using updated_at. This was possible because inactive blocks couldn't be edited and their updated_at date wouldn't change. With editing of inactive blocks enabled deactivation date needs to be saved explicitly.

3 months agoAdd navigation tabs to new block pages
Anton Khorev [Sat, 17 Aug 2024 10:41:30 +0000 (13:41 +0300)]
Add navigation tabs to new block pages

3 months agoMerge remote-tracking branch 'upstream/pull/5083'
Tom Hughes [Sun, 18 Aug 2024 11:16:22 +0000 (12:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5083'

3 months agoMerge remote-tracking branch 'upstream/pull/5092'
Tom Hughes [Sun, 18 Aug 2024 11:01:17 +0000 (12:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5092'

3 months agoMerge remote-tracking branch 'upstream/pull/5091'
Tom Hughes [Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)]
Merge remote-tracking branch 'upstream/pull/5091'

3 months agoMerge remote-tracking branch 'upstream/pull/5089'
Tom Hughes [Sun, 18 Aug 2024 10:54:48 +0000 (11:54 +0100)]
Merge remote-tracking branch 'upstream/pull/5089'

3 months agoMerge remote-tracking branch 'upstream/pull/5084'
Tom Hughes [Sun, 18 Aug 2024 10:51:06 +0000 (11:51 +0100)]
Merge remote-tracking branch 'upstream/pull/5084'

3 months agoUse shallow routes for diary comments
Anton Khorev [Sat, 17 Aug 2024 12:12:52 +0000 (15:12 +0300)]
Use shallow routes for diary comments

3 months agoDefine diary entry hide/unhide routes using post on members
Anton Khorev [Sat, 17 Aug 2024 11:28:55 +0000 (14:28 +0300)]
Define diary entry hide/unhide routes using post on members

3 months agoRemove /user_blocks/new route
Anton Khorev [Sat, 17 Aug 2024 11:03:27 +0000 (14:03 +0300)]
Remove /user_blocks/new route

3 months agoDon't update ends_at when editing inactive blocks
Anton Khorev [Sat, 17 Aug 2024 10:02:20 +0000 (13:02 +0300)]
Don't update ends_at when editing inactive blocks

3 months agoChange zoom precision function
Anton Khorev [Fri, 16 Aug 2024 07:45:54 +0000 (10:45 +0300)]
Change zoom precision function

This changes the number of fractional digits to log10(pixels / degrees) with pixels = 2**(8 + zoom) and degrees = 180.

3 months agoMerge remote-tracking branch 'upstream/pull/5088'
Tom Hughes [Fri, 16 Aug 2024 16:24:50 +0000 (17:24 +0100)]
Merge remote-tracking branch 'upstream/pull/5088'

3 months agoMerge remote-tracking branch 'upstream/pull/5086'
Tom Hughes [Fri, 16 Aug 2024 16:22:59 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/5086'

3 months agoMerge remote-tracking branch 'upstream/pull/5087'
Tom Hughes [Fri, 16 Aug 2024 16:20:33 +0000 (17:20 +0100)]
Merge remote-tracking branch 'upstream/pull/5087'

3 months agoMerge remote-tracking branch 'upstream/pull/5085'
Tom Hughes [Fri, 16 Aug 2024 16:19:23 +0000 (17:19 +0100)]
Merge remote-tracking branch 'upstream/pull/5085'

3 months agoCopy "From" endpoint value to search input when closing directions
Anton Khorev [Fri, 16 Aug 2024 15:48:05 +0000 (18:48 +0300)]
Copy "From" endpoint value to search input when closing directions

3 months agoTruncate long usernames in blocks tables
Anton Khorev [Fri, 16 Aug 2024 11:41:02 +0000 (14:41 +0300)]
Truncate long usernames in blocks tables

3 months agoAdd navigation tabs to edit block pages
Anton Khorev [Fri, 16 Aug 2024 10:27:10 +0000 (13:27 +0300)]
Add navigation tabs to edit block pages

3 months agoRemove duration and needs_view inputs from inactive block edit form
Anton Khorev [Fri, 16 Aug 2024 10:00:19 +0000 (13:00 +0300)]
Remove duration and needs_view inputs from inactive block edit form

3 months agoMake getGeocode a private function
Anton Khorev [Sun, 11 Aug 2024 04:04:37 +0000 (07:04 +0300)]
Make getGeocode a private function

3 months agoMove empty value check out of endpoint.getGeocode
Anton Khorev [Sun, 11 Aug 2024 04:03:01 +0000 (07:03 +0300)]
Move empty value check out of endpoint.getGeocode

3 months agoRemove endpoint.hasGeocode state and related getRoute code
Anton Khorev [Sun, 11 Aug 2024 03:58:14 +0000 (06:58 +0300)]
Remove endpoint.hasGeocode state and related getRoute code

hasGeocode didn't actually indicated if an endpoint has a value acquired from a geocoder. It was set to true when at least one call to a geocoder finished successfully, including getting an empty result. getRoute doesn't need to know what calls were made, it only needs coordinates. It also doesn't get to decide when to fetch coordinates, this is done in drag/change callbacks.