Commit graph

2393 commits

Author SHA1 Message Date
Tom Hughes
6ef11b2c9a Merge remote-tracking branch 'upstream/pull/5536' 2025-01-26 10:09:17 +00:00
Tom Hughes
49e257200e Merge remote-tracking branch 'upstream/pull/5545' 2025-01-24 15:10:03 +00:00
Anton Khorev
01b5ed5d28 Create api map resource 2025-01-24 10:47:58 +03:00
Anton Khorev
47d55a2b0f Simplify write_notes scope check in api notes controller 2025-01-24 06:16:11 +03:00
Anton Khorev
fafed5f821 Create message mute resource 2025-01-24 04:36:04 +03:00
Anton Khorev
cc3bccb9b3 Create message read_mark resource 2025-01-24 04:34:20 +03:00
Tom Hughes
8cf77a2f36 Merge remote-tracking branch 'upstream/pull/5537' 2025-01-23 18:14:09 +00:00
Anton Khorev
54c2787e87 Add user transient attribute to oauth_access_grant factory 2025-01-23 18:00:55 +03:00
Anton Khorev
ef648a53ba Add user transient attribute to oauth_access_token factory 2025-01-23 17:43:30 +03:00
Anton Khorev
b77c9f863d Create trace data resource 2025-01-23 06:08:27 +03:00
Anton Khorev
84a3a41531 Create changeset subscription resource 2025-01-22 19:50:41 +03:00
Tom Hughes
bd577d7c92 Merge remote-tracking branch 'upstream/pull/5518' 2025-01-21 18:44:31 +00:00
Anton Khorev
aafcd95364 Test fallback locale on embed page 2025-01-21 02:49:07 +03: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
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
6f71b372fb Change user's diary comments path to match model name 2025-01-19 02:05:49 +03:00
Anton Khorev
899795a82b Rename diary_comments_path to user_diary_comments_path 2025-01-19 01:54:07 +03:00
Anton Khorev
df1a9bb2c9 Simplify diary_comments_path calls in tests 2025-01-19 01:48:34 +03:00
Anton Khorev
f2a0f53cf5 Create traces feed resource 2025-01-18 23:15:43 +03:00
Anton Khorev
1be841589a Use resourceful routes for api tracepoints 2025-01-18 20:08:07 +03:00
Tom Hughes
5eb4c7c0d1 Rename friends rate limit as follows 2025-01-17 23:01:55 +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
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
283e7b975b Merge remote-tracking branch 'upstream/pull/5494' 2025-01-16 18:35:36 +00: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
11e0444f36 Added unit tests for new Note methods
Added unit tests for new Note methods and updated system tests to use description instead of first comment's body.
2025-01-15 12:12:56 +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
Anton Khorev
e9fd07a799 Test that encouragement disappears after verified email signup 2025-01-13 15:03:58 +03:00
Anton Khorev
03c7b18fa8 Test that anonymous note encouragement disappears after signup 2025-01-13 15:03:58 +03:00
Anton Khorev
fe214adbc6 Test that anonymous note encouragement disappears after login 2025-01-13 15:03:58 +03:00
Anton Khorev
f745cae93b Test that encouragement appears after 10 anonymous notes 2025-01-13 15:03:58 +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
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
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