]> git.openstreetmap.org Git - rails.git/log
rails.git
10 months agoMerge remote-tracking branch 'upstream/pull/5443'
Tom Hughes [Wed, 1 Jan 2025 11:37:53 +0000 (11:37 +0000)]
Merge remote-tracking branch 'upstream/pull/5443'

10 months agoMove new note marker to click location
Anton Khorev [Wed, 25 Dec 2024 22:57:27 +0000 (01:57 +0300)]
Move new note marker to click location

If not done, it's possible to lose the marker when starting from low zooms.

10 months agoDecrease new note marker opacity when zoomed out
Anton Khorev [Wed, 25 Dec 2024 22:11:39 +0000 (01:11 +0300)]
Decrease new note marker opacity when zoomed out

10 months agoLet page.load proceed when zoomed out, disabling submit
Anton Khorev [Wed, 25 Dec 2024 21:43:40 +0000 (00:43 +0300)]
Let page.load proceed when zoomed out, disabling submit

Note that addNoteButton.hasClass("active") check in page.load is useless because page.unload removes this class.

10 months agoRemove active class from addNoteButton only in page.unload()
Anton Khorev [Wed, 25 Dec 2024 02:08:44 +0000 (05:08 +0300)]
Remove active class from addNoteButton only in page.unload()

Same reasons as in the previous commit.

10 months agoCall removeNewNoteMarker() only from page.unload()
Anton Khorev [Wed, 25 Dec 2024 02:04:43 +0000 (05:04 +0300)]
Call removeNewNoteMarker() only from page.unload()

It was also called from noteCreated() but that triggered page.unload() via OSM.router.route().

10 months agoAdd addNewNoteMarker() and removeNewNoteMarker() functions
Anton Khorev [Wed, 25 Dec 2024 01:56:59 +0000 (04:56 +0300)]
Add addNewNoteMarker() and removeNewNoteMarker() functions

This ensures that marker is always added/removed together with its halo.

10 months agoConvert newHalo() to addHalo() and removeHalo()
Anton Khorev [Wed, 25 Dec 2024 01:38:23 +0000 (04:38 +0300)]
Convert newHalo() to addHalo() and removeHalo()

newHalo() wasn't always creating new halos. It had an event type argument that was checked against drag event. Depending on this check, newHalo() could remove the halo.

10 months agoMove new note page.pushstate/popstate next to page.load
Anton Khorev [Wed, 25 Dec 2024 01:19:19 +0000 (04:19 +0300)]
Move new note page.pushstate/popstate next to page.load

10 months agoAdd new note marker to root map layer instead of noteLayer
Anton Khorev [Wed, 25 Dec 2024 01:15:34 +0000 (04:15 +0300)]
Add new note marker to root map layer instead of noteLayer

We want the new note marker in the same layer with its halo. Also we don't want to put anything in noteLayer because it clears its contents on certain zoom levels.

10 months agoRemove unused return value of addCreatedNoteMarker()
Anton Khorev [Wed, 25 Dec 2024 00:43:54 +0000 (03:43 +0300)]
Remove unused return value of addCreatedNoteMarker()

This function adds a marker to notes layer. This controller doesn't need to do anything with markers of existing notes.

10 months agoRename updateMarker() to addCreatedNoteMarker()
Anton Khorev [Wed, 25 Dec 2024 00:38:30 +0000 (03:38 +0300)]
Rename updateMarker() to addCreatedNoteMarker()

This function doesn't update any existing marker.

10 months agoPass location instead of marker to createNote()
Anton Khorev [Tue, 31 Dec 2024 20:42:40 +0000 (23:42 +0300)]
Pass location instead of marker to createNote()

10 months agoMove create note callback to button click handler
Anton Khorev [Tue, 31 Dec 2024 20:37:34 +0000 (23:37 +0300)]
Move create note callback to button click handler

10 months agoDon't pass url to createNote()
Anton Khorev [Tue, 31 Dec 2024 20:25:11 +0000 (23:25 +0300)]
Don't pass url to createNote()

10 months agoPass text instead of form to createNote()
Anton Khorev [Tue, 31 Dec 2024 20:07:49 +0000 (23:07 +0300)]
Pass text instead of form to createNote()

10 months agoDisable new note submit button in click handler
Anton Khorev [Tue, 31 Dec 2024 20:02:47 +0000 (23:02 +0300)]
Disable new note submit button in click handler

10 months agoRename newNote to newNoteMarker
Anton Khorev [Wed, 25 Dec 2024 00:17:51 +0000 (03:17 +0300)]
Rename newNote to newNoteMarker

10 months agoUpdate bundle
Tom Hughes [Tue, 31 Dec 2024 17:12:12 +0000 (17:12 +0000)]
Update bundle

10 months agoBump leaflet.locatecontrol from 0.82.0 to 0.83.0
dependabot[bot] [Mon, 30 Dec 2024 23:11:07 +0000 (23:11 +0000)]
Bump leaflet.locatecontrol from 0.82.0 to 0.83.0

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.82.0 to 0.83.0.
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.82.0...v0.83.0)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
11 months agoMerge remote-tracking branch 'upstream/pull/5440'
Tom Hughes [Mon, 30 Dec 2024 12:40:11 +0000 (12:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5440'

11 months agoUpdate leaflet-osm to latest upstream version
Tom Hughes [Mon, 30 Dec 2024 12:19:34 +0000 (12:19 +0000)]
Update leaflet-osm to latest upstream version

11 months agoMerge remote-tracking branch 'upstream/pull/5448'
Tom Hughes [Sun, 29 Dec 2024 19:11:13 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5448'

11 months agoMerge remote-tracking branch 'upstream/pull/5447'
Tom Hughes [Sun, 29 Dec 2024 19:00:23 +0000 (19:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5447'

11 months agoMerge remote-tracking branch 'upstream/pull/5446'
Tom Hughes [Sun, 29 Dec 2024 18:55:54 +0000 (18:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5446'

11 months agoMerge remote-tracking branch 'upstream/pull/5442'
Tom Hughes [Sun, 29 Dec 2024 18:43:29 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/5442'

11 months agoMake preferences page editable without clicking 'Edit Preferences'
Anton Khorev [Sun, 29 Dec 2024 17:08:17 +0000 (20:08 +0300)]
Make preferences page editable without clicking 'Edit Preferences'

11 months agoUse resourceful routes for web mailboxes
Anton Khorev [Sun, 29 Dec 2024 05:27:09 +0000 (08:27 +0300)]
Use resourceful routes for web mailboxes

11 months agoReplace resent confirmation link with button
Anton Khorev [Sun, 29 Dec 2024 03:10:07 +0000 (06:10 +0300)]
Replace resent confirmation link with button

11 months agoMove code that runs after user save from save_new_user to create method
Anton Khorev [Sun, 29 Dec 2024 01:43:18 +0000 (04:43 +0300)]
Move code that runs after user save from save_new_user to create method

11 months agoTest signup with confirmation email
Anton Khorev [Sun, 29 Dec 2024 01:09:42 +0000 (04:09 +0300)]
Test signup with confirmation email

11 months agoAdd within_content_body system test helper
Anton Khorev [Sun, 29 Dec 2024 00:25:44 +0000 (03:25 +0300)]
Add within_content_body system test helper

11 months agoTest api user traces failing without necessary scope
Anton Khorev [Sat, 21 Dec 2024 02:19:12 +0000 (05:19 +0300)]
Test api user traces failing without necessary scope

11 months agoCreate user traces resource in api namespace
Anton Khorev [Sat, 21 Dec 2024 02:11:13 +0000 (05:11 +0300)]
Create user traces resource in api namespace

11 months agoMove user details route to api namespace
Anton Khorev [Fri, 27 Dec 2024 02:34:19 +0000 (05:34 +0300)]
Move user details route to api namespace

11 months agoMove user show route to api namespace
Anton Khorev [Fri, 20 Dec 2024 23:28:06 +0000 (02:28 +0300)]
Move user show route to api namespace

11 months agoMove users index route to api namespace
Anton Khorev [Fri, 20 Dec 2024 23:24:17 +0000 (02:24 +0300)]
Move users index route to api namespace

11 months agoWrap diary entry location coordinates
Anton Khorev [Tue, 24 Dec 2024 21:55:36 +0000 (00:55 +0300)]
Wrap diary entry location coordinates

11 months agoAdd revoke all actions to received blocks resource
Anton Khorev [Tue, 24 Dec 2024 04:50:29 +0000 (07:50 +0300)]
Add revoke all actions to received blocks resource

11 months agoCreate received blocks resource
Anton Khorev [Tue, 24 Dec 2024 03:07:59 +0000 (06:07 +0300)]
Create received blocks resource

11 months agoCreate issued blocks resource
Anton Khorev [Mon, 23 Dec 2024 23:51:45 +0000 (02:51 +0300)]
Create issued blocks resource

11 months agoCreate blocks table test helper module
Anton Khorev [Mon, 23 Dec 2024 23:47:19 +0000 (02:47 +0300)]
Create blocks table test helper module

11 months agoDeclare new block path on resources
Anton Khorev [Mon, 23 Dec 2024 21:58:57 +0000 (00:58 +0300)]
Declare new block path on resources

11 months agoTest active nav tabs on blocks_on/by pages
Anton Khorev [Tue, 24 Dec 2024 03:44:00 +0000 (06:44 +0300)]
Test active nav tabs on blocks_on/by pages

11 months agoMerge remote-tracking branch 'upstream/pull/5435'
Tom Hughes [Mon, 23 Dec 2024 10:26:39 +0000 (10:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5435'

11 months agoRemove check_api_readable from api messages controller
Anton Khorev [Mon, 23 Dec 2024 01:10:05 +0000 (04:10 +0300)]
Remove check_api_readable from api messages controller

11 months agoMerge remote-tracking branch 'upstream/pull/5434'
Tom Hughes [Sun, 22 Dec 2024 11:13:17 +0000 (11:13 +0000)]
Merge remote-tracking branch 'upstream/pull/5434'

11 months agoUse resourceful routes for api messages in/outbox
Anton Khorev [Sun, 22 Dec 2024 03:57:39 +0000 (06:57 +0300)]
Use resourceful routes for api messages in/outbox

11 months agoMerge branch 'pull/5428'
Anton Khorev [Fri, 20 Dec 2024 16:06:16 +0000 (19:06 +0300)]
Merge branch 'pull/5428'

11 months agoMerge remote-tracking branch 'upstream/pull/5429'
Tom Hughes [Fri, 20 Dec 2024 15:51:04 +0000 (15:51 +0000)]
Merge remote-tracking branch 'upstream/pull/5429'

11 months agoMerge ApiCapability class into ApiAbility
Anton Khorev [Fri, 20 Dec 2024 14:46:45 +0000 (17:46 +0300)]
Merge ApiCapability class into ApiAbility

11 months agoDon't map multiple paths in a single route
Tom Hughes [Fri, 20 Dec 2024 09:27:48 +0000 (09:27 +0000)]
Don't map multiple paths in a single route

This is deprecated in rails 8.0 and 8.1 will remove it.

11 months agoMerge remote-tracking branch 'upstream/pull/5427'
Tom Hughes [Fri, 20 Dec 2024 13:45:23 +0000 (13:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5427'

11 months agoUpdate stringio
Tom Hughes [Fri, 20 Dec 2024 13:43:30 +0000 (13:43 +0000)]
Update stringio

11 months agoRemove code that added now-unused field_with_errors css class
Anton Khorev [Fri, 20 Dec 2024 13:10:40 +0000 (16:10 +0300)]
Remove code that added now-unused field_with_errors css class

11 months agoUpdate bundle
Tom Hughes [Fri, 20 Dec 2024 08:58:26 +0000 (08:58 +0000)]
Update bundle

11 months agoMerge remote-tracking branch 'upstream/pull/5425'
Tom Hughes [Fri, 20 Dec 2024 08:39:16 +0000 (08:39 +0000)]
Merge remote-tracking branch 'upstream/pull/5425'

11 months agoMerge remote-tracking branch 'upstream/pull/5424'
Tom Hughes [Fri, 20 Dec 2024 08:38:28 +0000 (08:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5424'

11 months agoMerge remote-tracking branch 'upstream/pull/5423'
Tom Hughes [Fri, 20 Dec 2024 08:37:42 +0000 (08:37 +0000)]
Merge remote-tracking branch 'upstream/pull/5423'

11 months agoMerge remote-tracking branch 'upstream/pull/5422'
Tom Hughes [Fri, 20 Dec 2024 08:35:38 +0000 (08:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5422'

11 months agoSimplify calls to user block path helpers
Anton Khorev [Fri, 20 Dec 2024 03:30:21 +0000 (06:30 +0300)]
Simplify calls to user block path helpers

11 months agoSimplify calls to api_message_path helper
Anton Khorev [Fri, 20 Dec 2024 03:11:05 +0000 (06:11 +0300)]
Simplify calls to api_message_path helper

11 months agoMove user preferences routes to api namespace
Anton Khorev [Fri, 20 Dec 2024 03:00:54 +0000 (06:00 +0300)]
Move user preferences routes to api namespace

11 months agoReplace show and index abilities with read ability
Anton Khorev [Fri, 20 Dec 2024 02:21:06 +0000 (05:21 +0300)]
Replace show and index abilities with read ability

11 months agoMerge remote-tracking branch 'upstream/pull/5420'
Tom Hughes [Thu, 19 Dec 2024 16:09:14 +0000 (16:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5420'

11 months agoMerge remote-tracking branch 'upstream/pull/5416'
Tom Hughes [Thu, 19 Dec 2024 16:06:40 +0000 (16:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5416'

11 months agoChange image download warning message to a list
Anton Khorev [Wed, 18 Dec 2024 16:55:45 +0000 (19:55 +0300)]
Change image download warning message to a list

11 months agoAdd 'canDownloadImage' layer option
Anton Khorev [Wed, 18 Dec 2024 16:41:25 +0000 (19:41 +0300)]
Add 'canDownloadImage' layer option

11 months agoTest share textarea not to leak into note text on hiding resolved notes
Anton Khorev [Thu, 19 Dec 2024 14:59:44 +0000 (17:59 +0300)]
Test share textarea not to leak into note text on hiding resolved notes

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Dec 2024 12:15:39 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoMerge pull request #5417 from tomhughes/social-share-helper
Andy Allan [Thu, 19 Dec 2024 10:28:13 +0000 (10:28 +0000)]
Merge pull request #5417 from tomhughes/social-share-helper

Refactor social sharing helper

11 months agoMerge remote-tracking branch 'upstream/pull/5419'
Tom Hughes [Thu, 19 Dec 2024 08:42:02 +0000 (08:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5419'

11 months agoMerge remote-tracking branch 'upstream/pull/5418'
Tom Hughes [Thu, 19 Dec 2024 08:22:57 +0000 (08:22 +0000)]
Merge remote-tracking branch 'upstream/pull/5418'

11 months agoImprove testing of social sharing buttons
Tom Hughes [Wed, 18 Dec 2024 17:24:18 +0000 (17:24 +0000)]
Improve testing of social sharing buttons

11 months agoUse safe_join to join social sharing buttons
Tom Hughes [Wed, 18 Dec 2024 17:08:04 +0000 (17:08 +0000)]
Use safe_join to join social sharing buttons

11 months agoDrop unused options from social_share_buttons
Tom Hughes [Wed, 18 Dec 2024 16:57:08 +0000 (16:57 +0000)]
Drop unused options from social_share_buttons

11 months agoDrop unused ability to filter social sharing sites
Tom Hughes [Wed, 18 Dec 2024 16:45:42 +0000 (16:45 +0000)]
Drop unused ability to filter social sharing sites

11 months agoDrop render prefix from social_share_buttons function
Tom Hughes [Wed, 18 Dec 2024 16:42:56 +0000 (16:42 +0000)]
Drop render prefix from social_share_buttons function

11 months agoUse within_sidebar in CreateNoteTest
Anton Khorev [Thu, 19 Dec 2024 02:26:45 +0000 (05:26 +0300)]
Use within_sidebar in CreateNoteTest

11 months agoMove blocked resolve/reactivate tests to ResolveNoteTest
Anton Khorev [Thu, 19 Dec 2024 02:25:23 +0000 (05:25 +0300)]
Move blocked resolve/reactivate tests to ResolveNoteTest

11 months agoGet note text only from textarea within left sidebar
Anton Khorev [Thu, 19 Dec 2024 02:22:54 +0000 (05:22 +0300)]
Get note text only from textarea within left sidebar

11 months agoTest share textarea not to leak into note text on reactivation
Anton Khorev [Thu, 19 Dec 2024 02:14:15 +0000 (05:14 +0300)]
Test share textarea not to leak into note text on reactivation

11 months agoCenter share popup inside the browser window
Anton Khorev [Thu, 19 Dec 2024 01:09:31 +0000 (04:09 +0300)]
Center share popup inside the browser window

11 months agoRemove references to database maintenance from offline messages
Anton Khorev [Wed, 18 Dec 2024 16:04:54 +0000 (19:04 +0300)]
Remove references to database maintenance from offline messages

11 months agoMerge pull request #5388 from AntonKhorev/map-layer-can-embed
Andy Allan [Wed, 18 Dec 2024 16:03:10 +0000 (16:03 +0000)]
Merge pull request #5388 from AntonKhorev/map-layer-can-embed

Add 'canEmbed' layer option

11 months agoAdd expected restoration date setting
Anton Khorev [Mon, 16 Dec 2024 17:04:08 +0000 (20:04 +0300)]
Add expected restoration date setting

11 months agoAdd offline announcement setting
Anton Khorev [Mon, 16 Dec 2024 16:29:52 +0000 (19:29 +0300)]
Add offline announcement setting

11 months agoChange scope of offline flash messages
Anton Khorev [Mon, 16 Dec 2024 16:12:37 +0000 (19:12 +0300)]
Change scope of offline flash messages

11 months agoUse offline flash partial on offline redirect target page
Anton Khorev [Mon, 16 Dec 2024 16:09:23 +0000 (19:09 +0300)]
Use offline flash partial on offline redirect target page

11 months agoUse offline flash partial on edit page
Anton Khorev [Mon, 16 Dec 2024 15:49:10 +0000 (18:49 +0300)]
Use offline flash partial on edit page

11 months agoMove map offline flash to partial
Anton Khorev [Mon, 16 Dec 2024 15:23:13 +0000 (18:23 +0300)]
Move map offline flash to partial

11 months agoAdd 'canEmbed' layer option
Anton Khorev [Wed, 18 Dec 2024 15:36:44 +0000 (18:36 +0300)]
Add 'canEmbed' layer option

11 months agoAdd map.getMapBaseLayer()
Anton Khorev [Mon, 9 Dec 2024 21:31:59 +0000 (00:31 +0300)]
Add map.getMapBaseLayer()

11 months agoRename return values of getMapBaseLayerId() to layerId
Anton Khorev [Wed, 18 Dec 2024 15:28:18 +0000 (18:28 +0300)]
Rename return values of getMapBaseLayerId() to layerId

11 months agoMerge pull request #5413 from tomhughes/social-share-helper
Andy Allan [Wed, 18 Dec 2024 15:17:25 +0000 (15:17 +0000)]
Merge pull request #5413 from tomhughes/social-share-helper

Convert social share helper library into a real helper

11 months agoConvert social share helper library into a real helper
Tom Hughes [Wed, 18 Dec 2024 15:05:10 +0000 (15:05 +0000)]
Convert social share helper library into a real helper

11 months agoMerge pull request #5411 from tomhughes/bluesky-sharing
Andy Allan [Wed, 18 Dec 2024 15:06:18 +0000 (15:06 +0000)]
Merge pull request #5411 from tomhughes/bluesky-sharing

Add Bluesky to social sharing buttons

11 months agoMerge pull request #5412 from tomhughes/facebook-sharing
Andy Allan [Wed, 18 Dec 2024 15:05:09 +0000 (15:05 +0000)]
Merge pull request #5412 from tomhughes/facebook-sharing

Pass correct URL to Facebook sharing

11 months agoPass correct URL to Facebook sharing
Tom Hughes [Wed, 18 Dec 2024 14:50:49 +0000 (14:50 +0000)]
Pass correct URL to Facebook sharing

11 months agoAdd Bluesky to social sharing buttons
Tom Hughes [Wed, 18 Dec 2024 14:44:29 +0000 (14:44 +0000)]
Add Bluesky to social sharing buttons