Anton Khorev
be8d76926c
Move number of points to file details in gpx emails
2025-01-11 16:03:59 +03:00
Tom Hughes
a6c6f26acb
Merge remote-tracking branch 'upstream/pull/5487'
2025-01-09 18:08:31 +00:00
Anton Khorev
45abfe49e1
Merge branch 'pull/5484'
2025-01-09 17:20:25 +03:00
Andy Allan
55e3f90dd4
Show diary entry after creation
...
This allows users to review their post and use the social share
buttons more easily.
Refs #1391
2025-01-09 13:38:54 +00:00
Anton Khorev
6c0366d2a2
Move trace descriptions out of success/failure sentences in emails
2025-01-09 14:16:32 +03:00
Tom Hughes
d877cd1ebc
Merge remote-tracking branch 'upstream/pull/5486'
2025-01-08 20:19:16 +00:00
Andy Allan
fa51bcbcb2
Merge pull request #5462 from AntonKhorev/user-terms-resource
...
Use resourceful routes for terms view/accept/decline
2025-01-08 19:31:17 +00:00
Anton Khorev
606b5c1b6a
Use resourceful routes for terms view/accept/decline
2025-01-08 22:19:35 +03:00
Andy Allan
2d77633d40
Update documentation to avoid erb_lint deprecations
...
I didn't spot this in #5357
2025-01-08 19:15:22 +00:00
Anton Khorev
44843c1dd7
Remove slashes from body css classes
2025-01-08 22:11:28 +03:00
Tom Hughes
2c1428c9ad
Merge remote-tracking branch 'upstream/pull/5483'
2025-01-08 18:57:37 +00:00
Andy Allan
14b33b9433
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
2025-01-08 18:50:05 +00:00
Tom Hughes
dcbfe85bcd
Merge remote-tracking branch 'upstream/pull/5480'
2025-01-08 18:29:14 +00:00
dependabot[bot]
c7da54d959
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>
2025-01-07 23:11:50 +00:00
Tom Hughes
c20160d313
Merge remote-tracking branch 'upstream/pull/5459'
2025-01-07 19:08:13 +00:00
Tom Hughes
3c5e89e69a
Merge remote-tracking branch 'upstream/pull/5479'
2025-01-07 18:31:05 +00:00
Tom Hughes
65bbd320e0
Merge remote-tracking branch 'upstream/pull/5478'
2025-01-07 18:28:04 +00:00
Tom Hughes
045f0ac1be
Update bundle
2025-01-07 18:22:09 +00:00
Anton Khorev
23488f2028
Move browse/feature template to elements/show
2025-01-07 13:41:47 +03:00
Anton Khorev
e74273d496
Add ElementsController base class
2025-01-07 13:40:25 +03:00
Anton Khorev
3df14c5a40
Report deactivates_at as block read date
2025-01-07 13:19:33 +03:00
Tom Hughes
1ca2c2837e
Merge remote-tracking branch 'upstream/pull/5477'
2025-01-07 08:42:45 +00:00
Tom Hughes
70012abd8b
Update redefinition of interestingNode to match leaflet-osm
2025-01-07 08:38:51 +00:00
Anton Khorev
937d461106
Update arguments of data overlay interestingNode()
2025-01-07 11:26:15 +03:00
Tom Hughes
f946797520
Merge remote-tracking branch 'upstream/pull/5476'
2025-01-06 19:07:56 +00:00
Tom Hughes
e6b0afc6c8
Merge remote-tracking branch 'upstream/pull/5475'
2025-01-06 19:06:32 +00:00
Anton Khorev
7e8fd5d7b7
Check deactivates_at to report if block was read after its end date
2025-01-06 21:10:18 +03:00
Anton Khorev
68e55078ec
Make browse not found pages consistent
2025-01-06 20:15:57 +03:00
Tom Hughes
97b14ce22a
Update leaflet-osm to latest upstream version
2025-01-05 22:37:14 +00:00
Tom Hughes
231177aa29
Merge remote-tracking branch 'upstream/pull/5464'
2025-01-05 16:38:12 +00:00
Tom Hughes
6e444155d6
Merge remote-tracking branch 'upstream/pull/5471'
2025-01-05 16:23:49 +00:00
Tom Hughes
cdcf15e7b1
Merge remote-tracking branch 'upstream/pull/5470'
2025-01-05 16:17:20 +00:00
Tom Hughes
3faf9a77f7
Merge remote-tracking branch 'upstream/pull/5469'
2025-01-05 16:14:18 +00:00
Tom Hughes
af9d4f2696
Merge remote-tracking branch 'upstream/pull/5465'
2025-01-05 16:09:32 +00:00
Anton Khorev
c887f1d7b2
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.
2025-01-05 18:18:33 +03:00
Anton Khorev
0b0569f150
Write details attribute to changeset page
2025-01-05 17:57:31 +03:00
Anton Khorev
bb4720f09b
Move changeset data to a helper
2025-01-05 17:35:37 +03:00
Anton Khorev
b816f5b27e
Remove 'center' argument of addChangeset()
...
It is always set to true.
2025-01-05 17:28:36 +03:00
Anton Khorev
7a99295884
Remove zoomend listener on history unload
2025-01-05 15:02:25 +03:00
Anton Khorev
11b887c118
Allow thirdparty images on failed diary comment saves
2025-01-05 09:55:48 +03:00
Anton Khorev
201796cced
Fix options passed by allow_thirdparty_images
2025-01-04 18:47:51 +03:00
Anton Khorev
3350789978
Show outbox after sending new message
2025-01-04 18:24:47 +03:00
Anton Khorev
27d82356ab
Move redacted version locale strings to old_elements
2025-01-04 17:41:29 +03:00
Anton Khorev
dda0fb6597
Move history_title_html locale string to old_elements
2025-01-04 17:35:05 +03:00
Anton Khorev
c992d51fe2
Move browse history template to old elements directory
2025-01-04 17:22:38 +03:00
Anton Khorev
ccf71302e9
Move element version actions template to old elements directory
2025-01-04 17:11:48 +03:00
Anton Khorev
cb80bd3b96
Add OldElementsController base class
2025-01-04 17:00:43 +03:00
Tom Hughes
95b919c5d1
Merge remote-tracking branch 'upstream/pull/5461'
2025-01-03 19:32:42 +00:00
Tom Hughes
c8c13e7d00
Merge remote-tracking branch 'upstream/pull/5460'
2025-01-03 19:29:28 +00:00
Tom Hughes
44ec0e02fc
Merge remote-tracking branch 'upstream/pull/5458'
2025-01-03 19:21:29 +00:00