]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 6 Feb 2025 17:15:55 +0000 (17:15 +0000)]
Merge remote-tracking branch 'upstream/pull/5625'
Tom Hughes [Thu, 6 Feb 2025 17:13:03 +0000 (17:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5623'
Anton Khorev [Thu, 6 Feb 2025 15:15:58 +0000 (18:15 +0300)]
Merge branch 'pull/5609'
Anton Khorev [Thu, 6 Feb 2025 13:37:07 +0000 (16:37 +0300)]
Remove spaces before colons in en.yml
Martin Raifer [Thu, 6 Feb 2025 12:52:00 +0000 (13:52 +0100)]
Update to iD v2.31.1
translatewiki.net [Thu, 6 Feb 2025 12:13:33 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Nenad Vujicic [Tue, 4 Feb 2025 16:30:10 +0000 (17:30 +0100)]
Removes dropping note's first comment
Removes dropping note's first visible comment in case of deleted note's author. After adding displaying "deleted" as note's description, first visible comment is now displayed as note's comment. Moves logic of calculating which note comments will be displayed and if note contains anonymous author / comments to the controller.
Nenad Vujicic [Tue, 4 Feb 2025 15:36:58 +0000 (16:36 +0100)]
Switches from comments to all_comments
Switches from using note's .comments to .all_comments. Fixes bug with notes of deleted users without comments, which are filtered out, but the code tries to access the first comment.
Tom Hughes [Wed, 5 Feb 2025 19:14:02 +0000 (19:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5603'
Tom Hughes [Wed, 5 Feb 2025 19:09:37 +0000 (19:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5597'
Tom Hughes [Wed, 5 Feb 2025 19:00:14 +0000 (19:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5620'
Marwin Hochfelsner [Mon, 3 Feb 2025 07:42:40 +0000 (08:42 +0100)]
Simplify initialisation of iD
Tom Hughes [Wed, 5 Feb 2025 18:50:20 +0000 (18:50 +0000)]
Merge remote-tracking branch 'upstream/pull/5604'
Tom Hughes [Wed, 5 Feb 2025 18:35:10 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5610'
Tom Hughes [Wed, 5 Feb 2025 18:26:32 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5612'
Tom Hughes [Wed, 5 Feb 2025 18:07:24 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5615'
Anton Khorev [Sat, 1 Feb 2025 14:48:49 +0000 (17:48 +0300)]
Map 'full' to api relation show action
Anton Khorev [Sat, 1 Feb 2025 13:49:08 +0000 (16:49 +0300)]
Map 'full' to api way show action
Tom Hughes [Wed, 5 Feb 2025 18:02:04 +0000 (18:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5605'
Tom Hughes [Wed, 5 Feb 2025 17:58:26 +0000 (17:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5602'
Andy Allan [Wed, 5 Feb 2025 17:51:59 +0000 (17:51 +0000)]
Merge pull request #5617 from AntonKhorev/api-element-resources--show-paths
API element resources - show/update/delete paths
Anton Khorev [Sat, 1 Feb 2025 15:29:14 +0000 (18:29 +0300)]
Test Last-Modified header of api show element responses
Anton Khorev [Sat, 1 Feb 2025 12:35:29 +0000 (15:35 +0300)]
Test if api relation show/full responses contain required elements
Anton Khorev [Sat, 1 Feb 2025 15:25:32 +0000 (18:25 +0300)]
Split api node show test
Anton Khorev [Sat, 1 Feb 2025 15:04:35 +0000 (18:04 +0300)]
Split api way show test
Anton Khorev [Sat, 1 Feb 2025 12:13:09 +0000 (15:13 +0300)]
Split api relation show/full tests
Anton Khorev [Sat, 1 Feb 2025 12:04:13 +0000 (15:04 +0300)]
Move api element show and full tests
Anton Khorev [Sat, 1 Feb 2025 11:31:03 +0000 (14:31 +0300)]
Make api show/update/destroy relation actions resourceful
Anton Khorev [Sat, 1 Feb 2025 11:20:21 +0000 (14:20 +0300)]
Make api show/update/destroy way actions resourceful
Anton Khorev [Sat, 1 Feb 2025 11:01:01 +0000 (14:01 +0300)]
Make api show/update/destroy node actions resourceful
mmd-osm [Wed, 5 Feb 2025 17:15:25 +0000 (18:15 +0100)]
Image lazy loading
Fixes #5601
Andy Allan [Wed, 5 Feb 2025 17:13:47 +0000 (17:13 +0000)]
Merge pull request #5591 from AntonKhorev/api-element-resources--index-paths
API element resources - index paths
Andy Allan [Wed, 5 Feb 2025 17:07:50 +0000 (17:07 +0000)]
Merge pull request #5559 from hlfan/eslint-plugin-erb
Add eslint-plugin-erb to provide linting of .js.erb files
Andy Allan [Wed, 5 Feb 2025 17:02:54 +0000 (17:02 +0000)]
Merge pull request #5608 from AntonKhorev/reassign-issue-name-queue
Write the new role in reassign checkbox label
Holger Jeromin [Wed, 5 Feb 2025 16:31:24 +0000 (17:31 +0100)]
Replace deprecated eslint rules
no-new-object => no-object-constructor
no-process-env => will be catched by no-undef
Andy Allan [Wed, 5 Feb 2025 16:41:19 +0000 (16:41 +0000)]
Merge pull request #5606 from AntonKhorev/no-eslint-qs
Remove Qs from eslint globals
Marwin Hochfelsner [Sun, 26 Jan 2025 21:47:11 +0000 (22:47 +0100)]
Add eslint-plugin-erb for .js.erb file linting
* Add eslint-plugin-erb to provide linting of our .js.erb files
* Lint osm.js.erb and API-ify OSM.params()
---------
Co-authored-by: Andy Allan <git@gravitystorm.co.uk>
Anton Khorev [Wed, 5 Feb 2025 15:42:21 +0000 (18:42 +0300)]
Merge branch 'pull/5557'
Holger Jeromin [Sun, 26 Jan 2025 17:29:14 +0000 (18:29 +0100)]
Move deprecated eslint rules to stylistic plugin
Martin Raifer [Wed, 5 Feb 2025 12:54:53 +0000 (13:54 +0100)]
Update to iD v2.31.0
Anton Khorev [Wed, 5 Feb 2025 10:00:04 +0000 (13:00 +0300)]
Write the new role in reassign checkbox label
Anton Khorev [Tue, 4 Feb 2025 16:49:28 +0000 (19:49 +0300)]
Remove Qs from eslint globals
Marwin Hochfelsner [Tue, 4 Feb 2025 13:39:00 +0000 (14:39 +0100)]
Reevaluate iteration methods
Anton Khorev [Tue, 4 Feb 2025 15:29:47 +0000 (18:29 +0300)]
Don't html-escape note description
The description is already html-safe after to_html.
Anton Khorev [Tue, 4 Feb 2025 13:42:00 +0000 (16:42 +0300)]
Merge branch 'pull/5579'
Anton Khorev [Wed, 21 Aug 2024 12:19:00 +0000 (15:19 +0300)]
Test if closing sidebar removes directions popup
Marwin Hochfelsner [Tue, 4 Feb 2025 06:16:05 +0000 (07:16 +0100)]
Close directions popup with sidebar
Nenad Vujicic [Thu, 30 Jan 2025 11:34:51 +0000 (12:34 +0100)]
Adds optional use of note's author and description
Adds optional use of author and description from notes (in case data-migration is done) and author and description from first visible note comment (in case data-migration is not done). Also, adds author association to Note model.
Nenad Vujicic [Thu, 23 Jan 2025 15:31:20 +0000 (16:31 +0100)]
Removes note's author from RSS
Removes writing note's author to note's RSS if author is missing or data-migration is done and note's author is deleted.
Nenad Vujicic [Thu, 23 Jan 2025 15:18:36 +0000 (16:18 +0100)]
Replaces using description with note_description
Replaces using note's description method with note_description helper routine.
Nenad Vujicic [Thu, 23 Jan 2025 15:16:51 +0000 (16:16 +0100)]
Adds helper routine note_description
Adds new helper routine note_description for retrieving note's description. Helper routine returns "deleted" if author is deleted otherwise note's description.
Anton Khorev [Tue, 4 Feb 2025 00:11:17 +0000 (03:11 +0300)]
Fix missing zoom argument of OSM.cropLocation in home location
Tom Hughes [Mon, 3 Feb 2025 18:56:08 +0000 (18:56 +0000)]
Merge remote-tracking branch 'upstream/pull/5600'
Tom Hughes [Mon, 3 Feb 2025 18:53:00 +0000 (18:53 +0000)]
Merge remote-tracking branch 'upstream/pull/5595'
Tom Hughes [Mon, 3 Feb 2025 18:50:35 +0000 (18:50 +0000)]
Merge remote-tracking branch 'upstream/pull/5593'
Tom Hughes [Mon, 3 Feb 2025 18:45:40 +0000 (18:45 +0000)]
Update bundle
Anton Khorev [Mon, 3 Feb 2025 16:20:55 +0000 (19:20 +0300)]
Refactor api changeset discussion tests
Anton Khorev [Mon, 3 Feb 2025 10:13:44 +0000 (13:13 +0300)]
Don't apply extra encodeURIComponent to lat/lon search params
Anton Khorev [Mon, 3 Feb 2025 09:12:57 +0000 (12:12 +0300)]
Merge branch 'pull/5592'
Anton Khorev [Mon, 3 Feb 2025 08:26:34 +0000 (11:26 +0300)]
Merge branch 'pull/5594'
Tom Hughes [Sun, 2 Feb 2025 11:55:43 +0000 (11:55 +0000)]
Replace qs with URLSearchParams
Tom Hughes [Sun, 2 Feb 2025 18:52:09 +0000 (18:52 +0000)]
Change "reporter users" to "reporting users"
Anton Khorev [Sun, 2 Feb 2025 15:56:19 +0000 (18:56 +0300)]
Don't check ids of new notes in create note system tests
Tom Hughes [Sun, 2 Feb 2025 12:44:27 +0000 (12:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5064'
Tom Hughes [Sun, 2 Feb 2025 11:14:04 +0000 (11:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5522'
Tom Hughes [Sun, 2 Feb 2025 10:32:48 +0000 (10:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5588'
Tom Hughes [Sun, 2 Feb 2025 10:30:04 +0000 (10:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5586'
Tom Hughes [Sun, 2 Feb 2025 10:16:43 +0000 (10:16 +0000)]
Merge remote-tracking branch 'upstream/pull/5585'
Tom Hughes [Sun, 2 Feb 2025 10:11:23 +0000 (10:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5581'
Anton Khorev [Sat, 1 Feb 2025 10:45:57 +0000 (13:45 +0300)]
Make api create relation path resourceful
Anton Khorev [Sat, 1 Feb 2025 10:25:23 +0000 (13:25 +0300)]
Make api create way path resourceful
Anton Khorev [Sat, 1 Feb 2025 10:19:07 +0000 (13:19 +0300)]
Make api create node path resourceful
Anton Khorev [Sat, 1 Feb 2025 10:02:31 +0000 (13:02 +0300)]
Move api element index tests up
Anton Khorev [Sat, 1 Feb 2025 10:00:39 +0000 (13:00 +0300)]
Make api element index paths resourceful
Marwin Hochfelsner [Sun, 19 Jan 2025 18:30:36 +0000 (19:30 +0100)]
Add layer-type switching to use dark tiles
Marwin Hochfelsner [Thu, 30 Jan 2025 05:21:07 +0000 (06:21 +0100)]
Add coordinate precision function
Anton Khorev [Sat, 1 Feb 2025 18:15:37 +0000 (21:15 +0300)]
Use URI.encode_uri_component when generating share urls
Anton Khorev [Sat, 1 Feb 2025 17:36:07 +0000 (20:36 +0300)]
Use flat_map to collect way node ids in maps controller
Tom Hughes [Sat, 1 Feb 2025 17:25:39 +0000 (17:25 +0000)]
Merge remote-tracking branch 'upstream/pull/5584'
Anton Khorev [Sat, 1 Feb 2025 17:19:00 +0000 (20:19 +0300)]
Use filter instead of loop in visible node/way collections
Anton Khorev [Sat, 1 Feb 2025 17:09:38 +0000 (20:09 +0300)]
Remove ids collected in parallel to model instances in map api
Anton Khorev [Sat, 1 Feb 2025 16:35:46 +0000 (19:35 +0300)]
Remove unused visible_nodes hashes from api element controllers
Tom Hughes [Sat, 1 Feb 2025 15:13:41 +0000 (15:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5580'
translatewiki.net [Fri, 31 Jan 2025 10:43:52 +0000 (11:43 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Fri, 31 Jan 2025 09:21:44 +0000 (10:21 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Fri, 31 Jan 2025 08:58:53 +0000 (09:58 +0100)]
Localisation updates from https://translatewiki.net.
Marwin Hochfelsner [Wed, 29 Jan 2025 00:08:27 +0000 (01:08 +0100)]
Refactor embed.js.erb with layers.yml
Tom Hughes [Wed, 29 Jan 2025 18:41:43 +0000 (18:41 +0000)]
Merge remote-tracking branch 'upstream/pull/5575'
Tom Hughes [Wed, 29 Jan 2025 18:32:22 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5578'
Tom Hughes [Wed, 29 Jan 2025 18:31:13 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5577'
Tom Hughes [Wed, 29 Jan 2025 18:30:04 +0000 (18:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5576'
Tom Hughes [Wed, 29 Jan 2025 18:26:52 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5574'
Tom Hughes [Wed, 29 Jan 2025 18:24:50 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/pull/5573'
Anton Khorev [Wed, 29 Jan 2025 16:00:55 +0000 (19:00 +0300)]
Select user ids from reports using pluck
Anton Khorev [Wed, 29 Jan 2025 15:22:21 +0000 (18:22 +0300)]
Merge branch 'pull/4990'
Anton Khorev [Wed, 29 Jan 2025 15:13:10 +0000 (18:13 +0300)]
Abort loading when note layer is removed
Anton Khorev [Wed, 29 Jan 2025 14:57:26 +0000 (17:57 +0300)]
Show only description as a marker tooltip in note layer
Anton Khorev [Wed, 29 Jan 2025 12:59:49 +0000 (15:59 +0300)]
Abort loading when data layer is removed
Anton Khorev [Wed, 29 Jan 2025 11:55:59 +0000 (14:55 +0300)]
Remove unnecessary wrapper divs from data layer error message
Anton Khorev [Wed, 29 Jan 2025 10:35:01 +0000 (13:35 +0300)]
Don't remove-readd standard layer when layerParam is not empty in map.updateLayers