Commit graph

2374 commits

Author SHA1 Message Date
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
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
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
3faf9a77f7 Merge remote-tracking branch 'upstream/pull/5469' 2025-01-05 16:14:18 +00: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
c992d51fe2 Move browse history template to old elements directory 2025-01-04 17:22:38 +03:00
Tom Hughes
44ec0e02fc Merge remote-tracking branch 'upstream/pull/5458' 2025-01-03 19:21:29 +00:00
Tom Hughes
a6b8cf3e64 Merge remote-tracking branch 'upstream/pull/5454' 2025-01-03 19:19:52 +00:00
Anton Khorev
13994ca6ca Use resourceful routes for user new/create actions 2025-01-03 11:45:26 +03:00
Anton Khorev
f7b0e87973 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.
2025-01-03 11:37:32 +03:00
Anton Khorev
0016c6f4b1 Use resourceful route for message reply 2025-01-03 11:12:29 +03:00
Tom Hughes
7286ad027c Merge remote-tracking branch 'upstream/pull/5457' 2025-01-02 18:50:39 +00:00
Tom Hughes
402d7b9c10 Merge remote-tracking branch 'upstream/pull/5456' 2025-01-02 18:49:04 +00:00
Anton Khorev
d57033fa87 Use resourceful route for new message 2025-01-02 10:28:03 +03:00
Anton Khorev
6f4b06df70 Remove test_logout_removes_session_token 2025-01-02 10:00:21 +03:00
Anton Khorev
f0b8498879 Remove commit parameter from diary controller test 2025-01-02 09:15:24 +03:00