]>
git.openstreetmap.org Git - rails.git/log
Nenad Vujicic [Mon, 13 Jan 2025 09:52:38 +0000 (10:52 +0100)]
Added description, user_id, user_ip columns to notes
Added migration for adding new columns (description, user_id, user_ip) to notes table. Also, migration adds foreign key connecting notes and users tables (using user_id column).
Tom Hughes [Sun, 12 Jan 2025 16:02:07 +0000 (16:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5492'
Tom Hughes [Sun, 12 Jan 2025 16:00:09 +0000 (16:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5491'
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.
Anton Khorev [Sat, 11 Jan 2025 12:53:36 +0000 (15:53 +0300)]
Move number of points to file details in gpx emails
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>
Tom Hughes [Thu, 9 Jan 2025 18:08:31 +0000 (18:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5487'
Anton Khorev [Thu, 9 Jan 2025 14:20:25 +0000 (17:20 +0300)]
Merge branch 'pull/5484'
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
Anton Khorev [Thu, 9 Jan 2025 10:58:38 +0000 (13:58 +0300)]
Move trace descriptions out of success/failure sentences in emails
Tom Hughes [Wed, 8 Jan 2025 20:19:16 +0000 (20:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5486'
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
Anton Khorev [Sat, 4 Jan 2025 11:25:47 +0000 (14:25 +0300)]
Use resourceful routes for terms view/accept/decline
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
Anton Khorev [Sat, 4 Jan 2025 10:23:22 +0000 (13:23 +0300)]
Remove slashes from body css classes
Tom Hughes [Wed, 8 Jan 2025 18:57:37 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5483'
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
Tom Hughes [Wed, 8 Jan 2025 18:29:14 +0000 (18:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5480'
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>
Tom Hughes [Tue, 7 Jan 2025 19:08:13 +0000 (19:08 +0000)]
Merge remote-tracking branch 'upstream/pull/5459'
Tom Hughes [Tue, 7 Jan 2025 18:31:05 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/5479'
Tom Hughes [Tue, 7 Jan 2025 18:28:04 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/5478'
Tom Hughes [Tue, 7 Jan 2025 18:22:09 +0000 (18:22 +0000)]
Update bundle
Anton Khorev [Mon, 6 Jan 2025 15:58:55 +0000 (18:58 +0300)]
Move browse/feature template to elements/show
Anton Khorev [Mon, 6 Jan 2025 14:42:51 +0000 (17:42 +0300)]
Add ElementsController base class
Anton Khorev [Tue, 7 Jan 2025 10:19:33 +0000 (13:19 +0300)]
Report deactivates_at as block read date
Tom Hughes [Tue, 7 Jan 2025 08:42:45 +0000 (08:42 +0000)]
Merge remote-tracking branch 'upstream/pull/5477'
Tom Hughes [Tue, 7 Jan 2025 08:38:51 +0000 (08:38 +0000)]
Update redefinition of interestingNode to match leaflet-osm
Anton Khorev [Tue, 7 Jan 2025 08:26:15 +0000 (11:26 +0300)]
Update arguments of data overlay interestingNode()
Tom Hughes [Mon, 6 Jan 2025 19:07:56 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5476'
Tom Hughes [Mon, 6 Jan 2025 19:06:32 +0000 (19:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5475'
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
Anton Khorev [Mon, 6 Jan 2025 17:15:08 +0000 (20:15 +0300)]
Make browse not found pages consistent
Tom Hughes [Sun, 5 Jan 2025 22:37:14 +0000 (22:37 +0000)]
Update leaflet-osm to latest upstream version
Tom Hughes [Sun, 5 Jan 2025 16:38:12 +0000 (16:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5464'
Tom Hughes [Sun, 5 Jan 2025 16:23:49 +0000 (16:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5471'
Tom Hughes [Sun, 5 Jan 2025 16:17:20 +0000 (16:17 +0000)]
Merge remote-tracking branch 'upstream/pull/5470'
Tom Hughes [Sun, 5 Jan 2025 16:14:18 +0000 (16:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5469'
Tom Hughes [Sun, 5 Jan 2025 16:09:32 +0000 (16:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5465'
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.
Anton Khorev [Sun, 5 Jan 2025 14:57:31 +0000 (17:57 +0300)]
Write details attribute to changeset page
Anton Khorev [Sun, 5 Jan 2025 14:35:37 +0000 (17:35 +0300)]
Move changeset data to a helper
Anton Khorev [Sun, 5 Jan 2025 14:28:36 +0000 (17:28 +0300)]
Remove 'center' argument of addChangeset()
It is always set to true.
Anton Khorev [Sun, 5 Jan 2025 12:02:25 +0000 (15:02 +0300)]
Remove zoomend listener on history unload
Anton Khorev [Sun, 5 Jan 2025 06:55:48 +0000 (09:55 +0300)]
Allow thirdparty images on failed diary comment saves
Anton Khorev [Sat, 4 Jan 2025 15:47:51 +0000 (18:47 +0300)]
Fix options passed by allow_thirdparty_images
Anton Khorev [Sat, 4 Jan 2025 15:09:27 +0000 (18:09 +0300)]
Show outbox after sending new message
Anton Khorev [Sat, 4 Jan 2025 14:41:29 +0000 (17:41 +0300)]
Move redacted version locale strings 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
Anton Khorev [Sat, 4 Jan 2025 14:22:38 +0000 (17:22 +0300)]
Move browse history 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
Anton Khorev [Sat, 4 Jan 2025 14:00:43 +0000 (17:00 +0300)]
Add OldElementsController base class
Tom Hughes [Fri, 3 Jan 2025 19:32:42 +0000 (19:32 +0000)]
Merge remote-tracking branch 'upstream/pull/5461'
Tom Hughes [Fri, 3 Jan 2025 19:29:28 +0000 (19:29 +0000)]
Merge remote-tracking branch 'upstream/pull/5460'
Tom Hughes [Fri, 3 Jan 2025 19:21:29 +0000 (19:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5458'
Tom Hughes [Fri, 3 Jan 2025 19:19:52 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/5454'
Anton Khorev [Fri, 3 Jan 2025 12:40:59 +0000 (15:40 +0300)]
Rename Account module to Accounts
Anton Khorev [Fri, 3 Jan 2025 11:09:53 +0000 (14:09 +0300)]
Convert Auth.providers into array
Anton Khorev [Thu, 2 Jan 2025 10:10:24 +0000 (13:10 +0300)]
Use resourceful routes for user new/create actions
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.
Anton Khorev [Thu, 2 Jan 2025 08:41:43 +0000 (11:41 +0300)]
Use resourceful route for message reply
Tom Hughes [Thu, 2 Jan 2025 18:50:39 +0000 (18:50 +0000)]
Merge remote-tracking branch 'upstream/pull/5457'
Tom Hughes [Thu, 2 Jan 2025 18:49:04 +0000 (18:49 +0000)]
Merge remote-tracking branch 'upstream/pull/5456'
Tom Hughes [Thu, 2 Jan 2025 18:44:56 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5455'
translatewiki.net [Thu, 2 Jan 2025 12:15:49 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Thu, 2 Jan 2025 07:28:03 +0000 (10:28 +0300)]
Use resourceful route for new message
Anton Khorev [Thu, 2 Jan 2025 07:00:21 +0000 (10:00 +0300)]
Remove test_logout_removes_session_token
Anton Khorev [Thu, 2 Jan 2025 06:15:24 +0000 (09:15 +0300)]
Remove commit parameter from diary controller test
Tom Hughes [Wed, 1 Jan 2025 13:34:16 +0000 (13:34 +0000)]
Merge remote-tracking branch 'upstream/pull/5451'
Tom Hughes [Wed, 1 Jan 2025 11:37:53 +0000 (11:37 +0000)]
Merge remote-tracking branch 'upstream/pull/5443'
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.
Anton Khorev [Wed, 25 Dec 2024 22:11:39 +0000 (01:11 +0300)]
Decrease new note marker opacity when zoomed out
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.
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.
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().
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.
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.
Anton Khorev [Wed, 25 Dec 2024 01:19:19 +0000 (04:19 +0300)]
Move new note page.pushstate/popstate next to page.load
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.
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.
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.
Anton Khorev [Tue, 31 Dec 2024 20:42:40 +0000 (23:42 +0300)]
Pass location instead of marker to createNote()
Anton Khorev [Tue, 31 Dec 2024 20:37:34 +0000 (23:37 +0300)]
Move create note callback to button click handler
Anton Khorev [Tue, 31 Dec 2024 20:25:11 +0000 (23:25 +0300)]
Don't pass url to createNote()
Anton Khorev [Tue, 31 Dec 2024 20:07:49 +0000 (23:07 +0300)]
Pass text instead of form to createNote()
Anton Khorev [Tue, 31 Dec 2024 20:02:47 +0000 (23:02 +0300)]
Disable new note submit button in click handler
Anton Khorev [Wed, 25 Dec 2024 00:17:51 +0000 (03:17 +0300)]
Rename newNote to newNoteMarker
Tom Hughes [Tue, 31 Dec 2024 17:12:12 +0000 (17:12 +0000)]
Update bundle
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>
Tom Hughes [Mon, 30 Dec 2024 12:40:11 +0000 (12:40 +0000)]
Merge remote-tracking branch 'upstream/pull/5440'
Tom Hughes [Mon, 30 Dec 2024 12:19:34 +0000 (12:19 +0000)]
Update leaflet-osm to latest upstream version
Tom Hughes [Sun, 29 Dec 2024 19:11:13 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5448'
Tom Hughes [Sun, 29 Dec 2024 19:00:23 +0000 (19:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5447'
Tom Hughes [Sun, 29 Dec 2024 18:55:54 +0000 (18:55 +0000)]
Merge remote-tracking branch 'upstream/pull/5446'
Tom Hughes [Sun, 29 Dec 2024 18:43:29 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/5442'
Anton Khorev [Sun, 29 Dec 2024 05:27:09 +0000 (08:27 +0300)]
Use resourceful routes for web mailboxes
Anton Khorev [Sun, 29 Dec 2024 03:10:07 +0000 (06:10 +0300)]
Replace resent confirmation link with button
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
Anton Khorev [Sun, 29 Dec 2024 01:09:42 +0000 (04:09 +0300)]
Test signup with confirmation email
Anton Khorev [Sun, 29 Dec 2024 00:25:44 +0000 (03:25 +0300)]
Add within_content_body system test helper