]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 5 Mar 2025 19:09:11 +0000 (19:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5751'
Tom Hughes [Wed, 5 Mar 2025 19:03:33 +0000 (19:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5744'
Nenad Vujicic [Tue, 4 Mar 2025 15:12:14 +0000 (16:12 +0100)]
Removes first comment body from notes tests
Improves notes unit tests by replacing checking with first comment's body with checking with default / user-specified descriptions. Also, removes test_author unit test, adds setting note's author when checking notification's success and sets first comment type to "opened" in tests with tooltips which require first comment to be "opened".
Tom Hughes [Wed, 5 Mar 2025 18:24:23 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/pull/5750'
Tom Hughes [Wed, 5 Mar 2025 18:22:59 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/5749'
Tom Hughes [Wed, 5 Mar 2025 18:17:27 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/4789'
Anton Khorev [Wed, 5 Mar 2025 17:12:39 +0000 (20:12 +0300)]
Rename browse controller to feature queries controller
Anton Khorev [Wed, 5 Mar 2025 15:09:29 +0000 (18:09 +0300)]
Prevent changeset comment links from reloading the page
Martin Raifer [Wed, 5 Mar 2025 12:37:12 +0000 (13:37 +0100)]
Update to iD v2.32.0
Anton Khorev [Wed, 5 Mar 2025 10:39:39 +0000 (13:39 +0300)]
Add title texts to changeset list comments/changes
Anton Khorev [Wed, 5 Mar 2025 10:15:14 +0000 (13:15 +0300)]
Add comments icon
https://icons.getbootstrap.com/icons/pencil/
Anton Khorev [Wed, 5 Mar 2025 10:14:31 +0000 (13:14 +0300)]
Update comments icon
https://icons.getbootstrap.com/icons/chat/
Máté Gyöngyösi [Mon, 3 Mar 2025 01:22:35 +0000 (02:22 +0100)]
Add permalink button to changeset comments
Add a chain symbol button to the end of the line
(instead of formatting time_ago as a link
and losing the visibility of the exact timestamp
on hover).
As suggested at
https://github.com/openstreetmap/openstreetmap-website/pull/4789#discussion_r1980994254.
This is an improvement of
https://github.com/openstreetmap/openstreetmap-website/pull/4134/commits/
d495d6799fc3e8521ebc25dce9eb062cff94e117 .
Tom Hughes [Tue, 4 Mar 2025 18:22:15 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/5654'
Tom Hughes [Tue, 4 Mar 2025 18:09:53 +0000 (18:09 +0000)]
Update bundle
Tom Hughes [Tue, 4 Mar 2025 18:06:35 +0000 (18:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5746'
Anton Khorev [Tue, 11 Feb 2025 15:25:16 +0000 (18:25 +0300)]
Load pluralizers
Nenad Vujicic [Tue, 4 Mar 2025 15:04:45 +0000 (16:04 +0100)]
Updates note_comments and notes factories
Updates note_comments factory to create "commented" note comments by default. Improves notes factory to set note's description to "Default note's description" by default and to set first note's comment type to "opened" when used note_with_comments.
dependabot[bot] [Mon, 3 Mar 2025 23:54:13 +0000 (23:54 +0000)]
Bump @stylistic/eslint-plugin-js from 4.1.0 to 4.2.0
Bumps [@stylistic/eslint-plugin-js](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin-js) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v4.2.0/packages/eslint-plugin-js)
---
updated-dependencies:
- dependency-name: "@stylistic/eslint-plugin-js"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Nenad Vujicic [Wed, 29 Jan 2025 12:31:19 +0000 (13:31 +0100)]
Removes optional using first comments records
Removes optional using of note's first comments records for retrieving note's description and author in Note model file.
Tom Hughes [Mon, 3 Mar 2025 17:49:00 +0000 (17:49 +0000)]
Merge remote-tracking branch 'upstream/pull/5743'
translatewiki.net [Mon, 3 Mar 2025 12:14:08 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Máté Gyöngyösi [Mon, 3 Mar 2025 00:31:34 +0000 (01:31 +0100)]
Remove obsolete element from docker-compose.yml
The 'version' top-level element is deprecated since April 2024: https://github.com/docker/docs/commit/
007ac90154c05f34045f607631b93a95c81d4807 #diff-948ba582fe1c0dd6e8a5446ed8d8831e8ff65d0df7552f0eaa22b9ff7945b3e3R7
Tom Hughes [Sun, 2 Mar 2025 10:54:39 +0000 (10:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5667'
Tom Hughes [Sat, 1 Mar 2025 15:07:58 +0000 (15:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5742'
Anton Khorev [Sat, 1 Mar 2025 13:20:48 +0000 (16:20 +0300)]
Replace $(document).ready(...) with $(...)
Tom Hughes [Sat, 1 Mar 2025 12:30:01 +0000 (12:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5740'
Tom Hughes [Sat, 1 Mar 2025 12:29:12 +0000 (12:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5731'
Tom Hughes [Sat, 1 Mar 2025 12:28:02 +0000 (12:28 +0000)]
Merge remote-tracking branch 'upstream/pull/5741'
Tom Hughes [Sat, 1 Mar 2025 12:27:36 +0000 (12:27 +0000)]
Merge remote-tracking branch 'upstream/pull/5739'
Tom Hughes [Sat, 1 Mar 2025 12:27:30 +0000 (12:27 +0000)]
Merge remote-tracking branch 'upstream/pull/5737'
Tom Hughes [Sat, 1 Mar 2025 12:27:12 +0000 (12:27 +0000)]
Merge remote-tracking branch 'upstream/pull/5735'
Marwin Hochfelsner [Thu, 27 Feb 2025 23:28:29 +0000 (00:28 +0100)]
Move jquery .load() to fetch
Marwin Hochfelsner [Fri, 28 Feb 2025 21:01:23 +0000 (22:01 +0100)]
Cache csrf properties
mmd-osm [Sat, 1 Mar 2025 09:28:24 +0000 (10:28 +0100)]
Added WebP as new output format for map download
Anton Khorev [Sat, 1 Mar 2025 09:20:14 +0000 (12:20 +0300)]
Set the environment variable in teaspoon example
Anton Khorev [Sat, 1 Mar 2025 09:01:31 +0000 (12:01 +0300)]
Use location instead of window.location and document.location
Anton Khorev [Sat, 1 Mar 2025 07:51:46 +0000 (10:51 +0300)]
Register startinglocation listener as a named function
The listener is not going to be run once if it's constructed inside the locateactivate listener. It's going to be run however many times locateactivate happens.
Anton Khorev [Sat, 1 Mar 2025 06:08:26 +0000 (09:08 +0300)]
Merge branch 'pull/5734'
Anton Khorev [Sat, 1 Mar 2025 06:00:22 +0000 (09:00 +0300)]
Merge branch 'pull/5716'
Marwin Hochfelsner [Fri, 28 Feb 2025 21:23:36 +0000 (22:23 +0100)]
Fix icon list
Tom Hughes [Fri, 28 Feb 2025 19:53:37 +0000 (19:53 +0000)]
Delete mismatched ul close tag
Tom Hughes [Sat, 22 Feb 2025 11:09:27 +0000 (11:09 +0000)]
Drop explicit lengths from bigint columns
Tom Hughes [Fri, 21 Feb 2025 23:08:45 +0000 (23:08 +0000)]
Update model annotations
Tom Hughes [Fri, 21 Feb 2025 23:08:25 +0000 (23:08 +0000)]
Switch to using annotaterb for annotations
Tom Hughes [Fri, 28 Feb 2025 17:14:09 +0000 (17:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5732'
Marwin Hochfelsner [Fri, 28 Feb 2025 11:33:41 +0000 (12:33 +0100)]
Add colors and abbreviation to web manifest
Marwin Hochfelsner [Fri, 28 Feb 2025 11:27:18 +0000 (12:27 +0100)]
Generate icon entries dynamically
Tom Hughes [Thu, 27 Feb 2025 22:03:56 +0000 (22:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5730'
Tom Hughes [Thu, 27 Feb 2025 22:03:21 +0000 (22:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5729'
Marwin Hochfelsner [Thu, 27 Feb 2025 21:40:18 +0000 (22:40 +0100)]
Replace jquery's getJSON with fetch
Marwin Hochfelsner [Fri, 21 Feb 2025 11:12:04 +0000 (12:12 +0100)]
Clean up new direction form
Tom Hughes [Thu, 27 Feb 2025 20:31:19 +0000 (20:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5727'
Tom Hughes [Thu, 27 Feb 2025 20:28:47 +0000 (20:28 +0000)]
Merge remote-tracking branch 'upstream/pull/5652'
Marwin Hochfelsner [Wed, 26 Feb 2025 13:33:51 +0000 (14:33 +0100)]
Set directions departure to location
Marwin Hochfelsner [Fri, 21 Feb 2025 11:12:04 +0000 (12:12 +0100)]
Split directions engine select into modes and providers
Tom Hughes [Thu, 27 Feb 2025 18:14:46 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5728'
translatewiki.net [Thu, 27 Feb 2025 12:14:46 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Wed, 26 Feb 2025 23:57:06 +0000 (23:57 +0000)]
Bump @stylistic/eslint-plugin-js from 4.0.1 to 4.1.0
Bumps [@stylistic/eslint-plugin-js](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin-js) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v4.1.0/packages/eslint-plugin-js)
---
updated-dependencies:
- dependency-name: "@stylistic/eslint-plugin-js"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 25 Feb 2025 18:13:20 +0000 (18:13 +0000)]
Update bundle
Tom Hughes [Mon, 24 Feb 2025 17:11:58 +0000 (17:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5726'
translatewiki.net [Mon, 24 Feb 2025 12:15:17 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Sun, 23 Feb 2025 23:15:24 +0000 (02:15 +0300)]
Merge branch 'pull/5715'
Anton Khorev [Sun, 23 Feb 2025 02:34:48 +0000 (05:34 +0300)]
Remove unnecessary RuboCop exclusion
Anton Khorev [Sun, 23 Feb 2025 03:45:52 +0000 (06:45 +0300)]
Test api changeset comment hide/unhide at legacy routes
Anton Khorev [Sun, 23 Feb 2025 03:38:43 +0000 (06:38 +0300)]
Refactor api changeset comment visibility json tests
Anton Khorev [Sun, 23 Feb 2025 03:04:20 +0000 (06:04 +0300)]
Refactor api changeset comment visibility xml tests
Anton Khorev [Sun, 23 Feb 2025 01:59:26 +0000 (04:59 +0300)]
Create api changeset comment visibility resource
Anton Khorev [Sun, 23 Feb 2025 01:54:39 +0000 (04:54 +0300)]
Test response body of changeset comment hide/unhide
Tom Hughes [Sun, 23 Feb 2025 20:34:42 +0000 (20:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5725'
Tom Hughes [Sun, 23 Feb 2025 19:48:04 +0000 (19:48 +0000)]
Allow cross-origin access to active storage endpoints
Fixes #5639
Anton Khorev [Sat, 22 Feb 2025 23:46:38 +0000 (02:46 +0300)]
Make changeset comment create action resourceful
Tom Hughes [Sun, 23 Feb 2025 18:59:18 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5724'
Anton Khorev [Sat, 22 Feb 2025 19:08:45 +0000 (22:08 +0300)]
Add show_redactions param to changeset downloads
Tom Hughes [Sun, 23 Feb 2025 11:12:43 +0000 (11:12 +0000)]
Merge remote-tracking branch 'upstream/pull/5721'
Anton Khorev [Thu, 20 Feb 2025 03:29:24 +0000 (06:29 +0300)]
Rewrite changeset download show test
Anton Khorev [Thu, 20 Feb 2025 00:41:04 +0000 (03:41 +0300)]
Create api changeset download resource
Anton Khorev [Sat, 22 Feb 2025 17:33:48 +0000 (20:33 +0300)]
Merge branch 'pull/5719'
Tom Hughes [Sat, 22 Feb 2025 11:40:58 +0000 (11:40 +0000)]
Extend user list to allow searching by name or email
Tom Hughes [Sat, 22 Feb 2025 11:36:37 +0000 (11:36 +0000)]
Check user searches find the right users
Tom Hughes [Sat, 22 Feb 2025 11:11:36 +0000 (11:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5717'
Tom Hughes [Sat, 22 Feb 2025 11:10:25 +0000 (11:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5718'
dependabot[bot] [Fri, 21 Feb 2025 23:41:15 +0000 (23:41 +0000)]
Bump eslint from 9.20.1 to 9.21.0
Bumps [eslint](https://github.com/eslint/eslint) from 9.20.1 to 9.21.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.20.1...v9.21.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Anton Khorev [Wed, 19 Feb 2025 23:34:51 +0000 (02:34 +0300)]
Make api changeset show path resourceful
Tom Hughes [Fri, 21 Feb 2025 19:22:43 +0000 (19:22 +0000)]
Update minimum ruby version to 3.2
Tom Hughes [Fri, 21 Feb 2025 18:00:06 +0000 (18:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5712'
Nenad Vujicic [Fri, 21 Feb 2025 12:06:17 +0000 (13:06 +0100)]
Improves note's unit test with the latest dropping
Improves note's unit test test_read_note_suspended_opener_and_comment by specifying "commented" type to second note comment (by default "opened") to support the latest dropping displaying notes comments.
Nenad Vujicic [Wed, 19 Feb 2025 15:07:45 +0000 (16:07 +0100)]
Improves notes_description helper routine
Improves notes_description helper routine to return "unknown" for cases when first note's comment doesn't have event set to "opened" or note doesn't have comments. Added new argument (note's first comment), also updated helper routines usages.
Marwin Hochfelsner [Thu, 20 Feb 2025 11:47:06 +0000 (12:47 +0100)]
Split engine translations
Marwin Hochfelsner [Mon, 17 Feb 2025 14:57:56 +0000 (15:57 +0100)]
Split engine id into mode and provider
Nenad Vujicic [Wed, 19 Feb 2025 15:10:10 +0000 (16:10 +0100)]
Improves dropping of first note's comment
Improves calculating comments to be displayed by dropping first comment only if it is opening.
Nenad Vujicic [Wed, 19 Feb 2025 14:59:09 +0000 (15:59 +0100)]
Improves behavior if note lacks opening comment
Adds checking if note lacks opening comment and if positive, returns nil for both note's author and description.
Tom Hughes [Thu, 20 Feb 2025 22:08:02 +0000 (22:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5694'
Marwin Hochfelsner [Thu, 20 Feb 2025 20:17:50 +0000 (21:17 +0100)]
Improve download link translation
Can be squashed with main commit
Tom Hughes [Thu, 20 Feb 2025 17:10:00 +0000 (17:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5713'
Tom Hughes [Thu, 20 Feb 2025 16:56:49 +0000 (16:56 +0000)]
Merge remote-tracking branch 'upstream/pull/5711'
translatewiki.net [Thu, 20 Feb 2025 12:18:06 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Wed, 12 Feb 2025 00:10:54 +0000 (03:10 +0300)]
Make api changeset index path resourceful
Anton Khorev [Wed, 12 Feb 2025 00:04:12 +0000 (03:04 +0300)]
Move api changeset index tests up
Anton Khorev [Tue, 11 Feb 2025 23:59:46 +0000 (02:59 +0300)]
Make api create changeset path resourceful