Commit graph

7978 commits

Author SHA1 Message Date
Andy Allan
d6238e87a1
Merge pull request #5508 from AntonKhorev/fix-dashboard-follow
Fix missing translation of Follow links on dashboard
2025-01-17 17:53:51 +00:00
Anton Khorev
84a9d7117d Use form with normal-sized button on follows show pages 2025-01-17 05:28:59 +03:00
Anton Khorev
835756e979 Fix missing translation of Follow links on dashboard 2025-01-17 05:09:05 +03:00
Anton Khorev
3eccf65d8c Merge branch 'pull/5261' 2025-01-17 04:01:22 +03:00
Tom Hughes
bde5fb48db Merge remote-tracking branch 'upstream/pull/5500' 2025-01-16 19:03:43 +00:00
Tom Hughes
0ab8d954ad Merge remote-tracking branch 'upstream/pull/5499' 2025-01-16 18:38:36 +00:00
Tom Hughes
283e7b975b Merge remote-tracking branch 'upstream/pull/5494' 2025-01-16 18:35:36 +00:00
Anton Khorev
87e7f887f5 Remove account terms code unreachable for unregistered users 2025-01-16 19:05:53 +03:00
Anton Khorev
8db2ff289f Use resourceful route for user status 2025-01-16 02:17:06 +03:00
Andy Allan
f32aea6d14
Merge pull request #5433 from AntonKhorev/user-routes-api-namespace
Resourceful routes for users api
2025-01-15 12:55:41 +00:00
Andy Allan
b8a1a904c6
Merge pull request #5449 from AntonKhorev/edit-preferences
Make preferences page editable without clicking 'Edit Preferences'
2025-01-15 12:49:34 +00:00
Nenad Vujicic
2c19c2143e Changed note's first comment body to description
Replaced using note's first comment body with note's description.
2025-01-15 12:03:08 +01:00
Anton Khorev
9d7e59784f Install add/remove event listeners directly on note layer 2025-01-15 02:02:47 +03:00
Tom Hughes
473aff084d Fix new rubocop warnings 2025-01-14 18:31:52 +00:00
Nenad Vujicic
f3fc4cdb49 Added description and author_id methods to Note
Added description and author_id (author_ip already exists) methods to Note model. They still use first comment (but will be soon replaced to use records from Note model).
2025-01-14 14:27:02 +01:00
nertc
be11f2075e Refactor friendships controller and model 2025-01-14 11:33:56 +04:00
nertc
2b7a48029b Modify the way Friends are added 2025-01-14 11:32:54 +04:00
Etilène Jourdier
0f2df0b9ef 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
2025-01-13 14:36:21 +03:00
Nenad Vujicic
16bdcac6d7 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).
2025-01-13 10:52:38 +01:00
Anton Khorev
4c73b2651c Rename gpx description template to details
"Description" is just one of trace properties, details include description and other things.
2025-01-11 16:03:59 +03:00
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
Anton Khorev
606b5c1b6a Use resourceful routes for terms view/accept/decline 2025-01-08 22:19:35 +03:00
Anton Khorev
44843c1dd7 Remove slashes from body css classes 2025-01-08 22:11:28 +03: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
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
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
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
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
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