Commit graph

7961 commits

Author SHA1 Message Date
Anton Khorev
74854f831b Remove doorkeeper_token branch from web deny_access 2025-01-24 05:28:46 +03:00
Anton Khorev
b77c9f863d Create trace data resource 2025-01-23 06:08:27 +03:00
Tom Hughes
b0cf1940e1 Merge remote-tracking branch 'upstream/pull/5535' 2025-01-22 18:07:34 +00:00
Tom Hughes
c2b39a6a7c Merge remote-tracking branch 'upstream/pull/5529' 2025-01-22 17:59:34 +00:00
Tom Hughes
aabe8815b3 Merge remote-tracking branch 'upstream/pull/5532' 2025-01-22 17:54:41 +00:00
Anton Khorev
84a3a41531 Create changeset subscription resource 2025-01-22 19:50:41 +03:00
Andy Allan
322c6c31a5 Use flash.now for messages to be shown during this request 2025-01-22 13:55:30 +00:00
Anton Khorev
8455b7cf03 Set needs_view by default for new blocks 2025-01-22 02:26:07 +03:00
Anton Khorev
7b19ba580c Merge branch 'pull/5531' 2025-01-22 01:05:39 +03:00
Tom Hughes
ebe7cf8d17 Add indexes on user+id to changeset and diary comments 2025-01-21 20:15:56 +00:00
Tom Hughes
6b7f64451e Preload parent objects for user comments 2025-01-21 19:03:03 +00:00
Tom Hughes
bd577d7c92 Merge remote-tracking branch 'upstream/pull/5518' 2025-01-21 18:44:31 +00:00
mmd-osm
18fd80ebb7 Consistent usage of layer information in _osm_location cookie
Fixes #3971
2025-01-21 18:08:50 +01:00
Tom Hughes
ebeef2899a Enable I18n fallback for the embed page
Fixes #5526.
2025-01-20 11:42:23 +00:00
Tom Hughes
af880d10de Merge remote-tracking branch 'upstream/pull/5520' 2025-01-19 15:02:11 +00:00
Tom Hughes
fb7762feb9 Merge remote-tracking branch 'upstream/pull/5517' 2025-01-19 15:01:25 +00:00
Anton Khorev
e096cc35dc Include message_read attribute in api output of messages to self 2025-01-19 05:48:36 +03:00
Anton Khorev
420d9da1f9 Create changeset_comments resources for users 2025-01-19 04:24:35 +03:00
Anton Khorev
9fbe52dd21 Create user comments controller base class 2025-01-19 04:24:35 +03:00
Anton Khorev
43d60108da Add tabbed navigation to user's diary comments page 2025-01-19 04:24:35 +03:00
Anton Khorev
08292292f0 Create diary_comments resources for users 2025-01-19 02:40:13 +03:00
Anton Khorev
899795a82b Rename diary_comments_path to user_diary_comments_path 2025-01-19 01:54:07 +03:00
Anton Khorev
f2a0f53cf5 Create traces feed resource 2025-01-18 23:15:43 +03:00
Anton Khorev
82fb1bf798 Replace lookup_friend with lookup_user in FollowsController 2025-01-18 19:35:30 +03:00
Anton Khorev
2074e9dce2 Merge branch 'pull/5512' 2025-01-18 18:23:51 +03:00
Marwin Hochfelsner
4241d49c63 Disable dark mode filtering by default 2025-01-18 11:50:55 +00:00
Marwin Hochfelsner
01d8dba8ce Allow map layers to specify an alternate tile set for dark mode 2025-01-18 11:50:54 +00:00
Anton Khorev
9c744ab65d Remove "Public editing" line from settings page 2025-01-18 03:32:57 +03:00
Tom Hughes
42d622b735 Rename friends as followings 2025-01-17 23:01:56 +00:00
Tom Hughes
5eb4c7c0d1 Rename friends rate limit as follows 2025-01-17 23:01:55 +00:00
Tom Hughes
3fcdeba29e Rename friendship_notification to follow_notification 2025-01-17 22:58:36 +00:00
Tom Hughes
bc630bca87 Rename friends_with to follows 2025-01-17 22:58:35 +00:00
Andy Allan
4370fe45ad
Merge pull request #5437 from AntonKhorev/user-status-resource
Use resourceful route for user status
2025-01-17 17:55:02 +00:00
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