]> git.openstreetmap.org Git - rails.git/log
rails.git
4 days agoTest that anonymous note encouragement disappears after signup
Anton Khorev [Mon, 13 Jan 2025 10:52:44 +0000 (13:52 +0300)]
Test that anonymous note encouragement disappears after signup

4 days agoTest that anonymous note encouragement disappears after login
Anton Khorev [Mon, 13 Jan 2025 10:30:57 +0000 (13:30 +0300)]
Test that anonymous note encouragement disappears after login

4 days agoTest that encouragement appears after 10 anonymous notes
Anton Khorev [Mon, 13 Jan 2025 10:27:15 +0000 (13:27 +0300)]
Test that encouragement appears after 10 anonymous notes

4 days agoMerge branch 'anonymous-notes-counter'
Anton Khorev [Mon, 13 Jan 2025 11:50:26 +0000 (14:50 +0300)]
Merge branch 'anonymous-notes-counter'

4 days agodisplay an encouragement to contribute after many anonymous notes
Etilène Jourdier [Sun, 12 Jan 2025 21:42:57 +0000 (22:42 +0100)]
display an encouragement to contribute after many anonymous notes

create a counter of anonymous notes in a cookie, read by new note controller to display an encouragement to contribute in the already existing anonymous warning if the anonymous visitor has already created at least 10 anonymous notes. Cookie deleted on log-in and sign-up after email validation

5 days agoMerge remote-tracking branch 'upstream/pull/5492'
Tom Hughes [Sun, 12 Jan 2025 16:02:07 +0000 (16:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5492'

5 days agoMerge remote-tracking branch 'upstream/pull/5491'
Tom Hughes [Sun, 12 Jan 2025 16:00:09 +0000 (16:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5491'

6 days agoRename gpx description template to details
Anton Khorev [Sat, 11 Jan 2025 12:57:17 +0000 (15:57 +0300)]
Rename gpx description template to details

"Description" is just one of trace properties, details include description and other things.

6 days agoMove number of points to file details in gpx emails
Anton Khorev [Sat, 11 Jan 2025 12:53:36 +0000 (15:53 +0300)]
Move number of points to file details in gpx emails

6 days agoBump eslint from 9.17.0 to 9.18.0
dependabot[bot] [Fri, 10 Jan 2025 23:43:33 +0000 (23:43 +0000)]
Bump eslint from 9.17.0 to 9.18.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.17.0 to 9.18.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.17.0...v9.18.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
8 days agoMerge remote-tracking branch 'upstream/pull/5487'
Tom Hughes [Thu, 9 Jan 2025 18:08:31 +0000 (18:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5487'

8 days agoMerge branch 'pull/5484'
Anton Khorev [Thu, 9 Jan 2025 14:20:25 +0000 (17:20 +0300)]
Merge branch 'pull/5484'

8 days agoShow diary entry after creation
Andy Allan [Wed, 8 Jan 2025 11:27:54 +0000 (11:27 +0000)]
Show diary entry after creation

This allows users to review their post and use the social share
buttons more easily.

Refs #1391

8 days agoMove trace descriptions out of success/failure sentences in emails
Anton Khorev [Thu, 9 Jan 2025 10:58:38 +0000 (13:58 +0300)]
Move trace descriptions out of success/failure sentences in emails

9 days agoMerge remote-tracking branch 'upstream/pull/5486'
Tom Hughes [Wed, 8 Jan 2025 20:19:16 +0000 (20:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5486'

9 days agoMerge pull request #5462 from AntonKhorev/user-terms-resource
Andy Allan [Wed, 8 Jan 2025 19:31:17 +0000 (19:31 +0000)]
Merge pull request #5462 from AntonKhorev/user-terms-resource

Use resourceful routes for terms view/accept/decline

9 days agoUse resourceful routes for terms view/accept/decline
Anton Khorev [Sat, 4 Jan 2025 11:25:47 +0000 (14:25 +0300)]
Use resourceful routes for terms view/accept/decline

9 days agoUpdate documentation to avoid erb_lint deprecations
Andy Allan [Wed, 8 Jan 2025 19:15:22 +0000 (19:15 +0000)]
Update documentation to avoid erb_lint deprecations

I didn't spot this in #5357

9 days agoRemove slashes from body css classes
Anton Khorev [Sat, 4 Jan 2025 10:23:22 +0000 (13:23 +0300)]
Remove slashes from body css classes

9 days agoMerge remote-tracking branch 'upstream/pull/5483'
Tom Hughes [Wed, 8 Jan 2025 18:57:37 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5483'

9 days agoRestrict version of dry-schema for ruby 3.1.2 compatibility
Andy Allan [Wed, 8 Jan 2025 15:14:50 +0000 (15:14 +0000)]
Restrict version of dry-schema for ruby 3.1.2 compatibility

https://bugs.ruby-lang.org/issues/18673 affects some methods using
anonymous blocks, and was fixed in ruby 3.1.3. However, debian/bookworm
ruby 3.1 package is based on 3.1.2 and does not yet contain this fix.

Since bookworm is used in our Docker build, and also used in production
by OSMF, then we can restrict dry-schema to a version that does not
use anonymous blocks.

Fixes #5482

9 days agoMerge remote-tracking branch 'upstream/pull/5480'
Tom Hughes [Wed, 8 Jan 2025 18:29:14 +0000 (18:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5480'

9 days agoBump leaflet.locatecontrol from 0.83.0 to 0.83.1
dependabot[bot] [Tue, 7 Jan 2025 23:11:50 +0000 (23:11 +0000)]
Bump leaflet.locatecontrol from 0.83.0 to 0.83.1

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

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

Signed-off-by: dependabot[bot] <support@github.com>
10 days agoMerge remote-tracking branch 'upstream/pull/5459'
Tom Hughes [Tue, 7 Jan 2025 19:08:13 +0000 (19:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5459'

10 days agoMerge remote-tracking branch 'upstream/pull/5479'
Tom Hughes [Tue, 7 Jan 2025 18:31:05 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5479'

10 days agoMerge remote-tracking branch 'upstream/pull/5478'
Tom Hughes [Tue, 7 Jan 2025 18:28:04 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/5478'

10 days agoUpdate bundle
Tom Hughes [Tue, 7 Jan 2025 18:22:09 +0000 (18:22 +0000)]
Update bundle

10 days agoMove browse/feature template to elements/show
Anton Khorev [Mon, 6 Jan 2025 15:58:55 +0000 (18:58 +0300)]
Move browse/feature template to elements/show

10 days agoAdd ElementsController base class
Anton Khorev [Mon, 6 Jan 2025 14:42:51 +0000 (17:42 +0300)]
Add ElementsController base class

10 days agoReport deactivates_at as block read date
Anton Khorev [Tue, 7 Jan 2025 10:19:33 +0000 (13:19 +0300)]
Report deactivates_at as block read date

10 days agoMerge remote-tracking branch 'upstream/pull/5477'
Tom Hughes [Tue, 7 Jan 2025 08:42:45 +0000 (08:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5477'

10 days agoUpdate redefinition of interestingNode to match leaflet-osm
Tom Hughes [Tue, 7 Jan 2025 08:38:51 +0000 (08:38 +0000)]
Update redefinition of interestingNode to match leaflet-osm

10 days agoUpdate arguments of data overlay interestingNode()
Anton Khorev [Tue, 7 Jan 2025 08:26:15 +0000 (11:26 +0300)]
Update arguments of data overlay interestingNode()

11 days agoMerge remote-tracking branch 'upstream/pull/5476'
Tom Hughes [Mon, 6 Jan 2025 19:07:56 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5476'

11 days agoMerge remote-tracking branch 'upstream/pull/5475'
Tom Hughes [Mon, 6 Jan 2025 19:06:32 +0000 (19:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5475'

11 days agoCheck deactivates_at to report if block was read after its end date
Anton Khorev [Mon, 6 Jan 2025 18:10:18 +0000 (21:10 +0300)]
Check deactivates_at to report if block was read after its end date

11 days agoMake browse not found pages consistent
Anton Khorev [Mon, 6 Jan 2025 17:15:08 +0000 (20:15 +0300)]
Make browse not found pages consistent

11 days agoUpdate leaflet-osm to latest upstream version
Tom Hughes [Sun, 5 Jan 2025 22:37:14 +0000 (22:37 +0000)]
Update leaflet-osm to latest upstream version

12 days agoMerge remote-tracking branch 'upstream/pull/5464'
Tom Hughes [Sun, 5 Jan 2025 16:38:12 +0000 (16:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5464'

12 days agoMerge remote-tracking branch 'upstream/pull/5471'
Tom Hughes [Sun, 5 Jan 2025 16:23:49 +0000 (16:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5471'

12 days agoMerge remote-tracking branch 'upstream/pull/5470'
Tom Hughes [Sun, 5 Jan 2025 16:17:20 +0000 (16:17 +0000)]
Merge remote-tracking branch 'upstream/pull/5470'

12 days agoMerge remote-tracking branch 'upstream/pull/5469'
Tom Hughes [Sun, 5 Jan 2025 16:14:18 +0000 (16:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5469'

12 days agoMerge remote-tracking branch 'upstream/pull/5465'
Tom Hughes [Sun, 5 Jan 2025 16:09:32 +0000 (16:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5465'

12 days agoUse details attribute to render changeset bounding box
Anton Khorev [Sun, 5 Jan 2025 14:59:47 +0000 (17:59 +0300)]
Use details attribute to render changeset bounding box

Do this instead of using L.OSM.DataLayer. DataLayer makes an extra request just to get the bbox. Also it expects bbox to always exist, which is not true for some changesets.

12 days agoWrite details attribute to changeset page
Anton Khorev [Sun, 5 Jan 2025 14:57:31 +0000 (17:57 +0300)]
Write details attribute to changeset page

12 days agoMove changeset data to a helper
Anton Khorev [Sun, 5 Jan 2025 14:35:37 +0000 (17:35 +0300)]
Move changeset data to a helper

12 days agoRemove 'center' argument of addChangeset()
Anton Khorev [Sun, 5 Jan 2025 14:28:36 +0000 (17:28 +0300)]
Remove 'center' argument of addChangeset()

It is always set to true.

12 days agoRemove zoomend listener on history unload
Anton Khorev [Sun, 5 Jan 2025 12:02:25 +0000 (15:02 +0300)]
Remove zoomend listener on history unload

12 days agoAllow thirdparty images on failed diary comment saves
Anton Khorev [Sun, 5 Jan 2025 06:55:48 +0000 (09:55 +0300)]
Allow thirdparty images on failed diary comment saves

13 days agoFix options passed by allow_thirdparty_images
Anton Khorev [Sat, 4 Jan 2025 15:47:51 +0000 (18:47 +0300)]
Fix options passed by allow_thirdparty_images

13 days agoShow outbox after sending new message
Anton Khorev [Sat, 4 Jan 2025 15:09:27 +0000 (18:09 +0300)]
Show outbox after sending new message

13 days agoMove redacted version locale strings to old_elements
Anton Khorev [Sat, 4 Jan 2025 14:41:29 +0000 (17:41 +0300)]
Move redacted version locale strings to old_elements

13 days agoMove history_title_html locale string to old_elements
Anton Khorev [Sat, 4 Jan 2025 14:35:05 +0000 (17:35 +0300)]
Move history_title_html locale string to old_elements

13 days agoMove browse history template to old elements directory
Anton Khorev [Sat, 4 Jan 2025 14:22:38 +0000 (17:22 +0300)]
Move browse history template to old elements directory

13 days agoMove element version actions template to old elements directory
Anton Khorev [Sat, 4 Jan 2025 14:11:48 +0000 (17:11 +0300)]
Move element version actions template to old elements directory

13 days agoAdd OldElementsController base class
Anton Khorev [Sat, 4 Jan 2025 14:00:43 +0000 (17:00 +0300)]
Add OldElementsController base class

2 weeks agoMerge remote-tracking branch 'upstream/pull/5461'
Tom Hughes [Fri, 3 Jan 2025 19:32:42 +0000 (19:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5461'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5460'
Tom Hughes [Fri, 3 Jan 2025 19:29:28 +0000 (19:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5460'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5458'
Tom Hughes [Fri, 3 Jan 2025 19:21:29 +0000 (19:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5458'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5454'
Tom Hughes [Fri, 3 Jan 2025 19:19:52 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5454'

2 weeks agoRename Account module to Accounts
Anton Khorev [Fri, 3 Jan 2025 12:40:59 +0000 (15:40 +0300)]
Rename Account module to Accounts

2 weeks agoConvert Auth.providers into array
Anton Khorev [Fri, 3 Jan 2025 11:09:53 +0000 (14:09 +0300)]
Convert Auth.providers into array

2 weeks agoUse resourceful routes for user new/create actions
Anton Khorev [Thu, 2 Jan 2025 10:10:24 +0000 (13:10 +0300)]
Use resourceful routes for user new/create actions

2 weeks agoRemove "expired unread" short block status
Anton Khorev [Thu, 2 Jan 2025 05:44:34 +0000 (08:44 +0300)]
Remove "expired unread" short block status

It was supposed to mean that the block is past its end date but still wasn't read by the user. That turned out to be confusing because although it said "expired", such blocks were active.

2 weeks agoUse resourceful route for message reply
Anton Khorev [Thu, 2 Jan 2025 08:41:43 +0000 (11:41 +0300)]
Use resourceful route for message reply

2 weeks agoMerge remote-tracking branch 'upstream/pull/5457'
Tom Hughes [Thu, 2 Jan 2025 18:50:39 +0000 (18:50 +0000)]
Merge remote-tracking branch 'upstream/pull/5457'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5456'
Tom Hughes [Thu, 2 Jan 2025 18:49:04 +0000 (18:49 +0000)]
Merge remote-tracking branch 'upstream/pull/5456'

2 weeks agoMerge remote-tracking branch 'upstream/pull/5455'
Tom Hughes [Thu, 2 Jan 2025 18:44:56 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5455'

2 weeks agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Jan 2025 12:15:49 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

2 weeks agoUse resourceful route for new message
Anton Khorev [Thu, 2 Jan 2025 07:28:03 +0000 (10:28 +0300)]
Use resourceful route for new message

2 weeks agoRemove test_logout_removes_session_token
Anton Khorev [Thu, 2 Jan 2025 07:00:21 +0000 (10:00 +0300)]
Remove test_logout_removes_session_token

2 weeks agoRemove commit parameter from diary controller test
Anton Khorev [Thu, 2 Jan 2025 06:15:24 +0000 (09:15 +0300)]
Remove commit parameter from diary controller test

2 weeks agoMerge remote-tracking branch 'upstream/pull/5451'
Tom Hughes [Wed, 1 Jan 2025 13:34:16 +0000 (13:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5451'

2 weeks 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'

2 weeks 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.

2 weeks 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

2 weeks 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.

2 weeks 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.

2 weeks 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().

2 weeks 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.

2 weeks 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.

2 weeks 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

2 weeks 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.

2 weeks 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.

2 weeks 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.

2 weeks 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()

2 weeks 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

2 weeks 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()

2 weeks 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()

2 weeks 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

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

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

2 weeks 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>
2 weeks 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'

2 weeks 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

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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'

2 weeks 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