Commit graph

2512 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
Tom Hughes
605d7a5f69 Merge remote-tracking branch 'upstream/pull/5544' 2025-01-24 15:06:37 +00:00
Tom Hughes
959bc5562a Merge remote-tracking branch 'upstream/pull/5543' 2025-01-24 15:00:25 +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
47a8907e2a Move scope_enabled? to ApiController 2025-01-24 05:56:23 +03:00
Anton Khorev
74854f831b Remove doorkeeper_token branch from web deny_access 2025-01-24 05:28:46 +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
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
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
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
Tom Hughes
fb7762feb9 Merge remote-tracking branch 'upstream/pull/5517' 2025-01-19 15:01:25 +00: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
08292292f0 Create diary_comments resources for users 2025-01-19 02:40:13 +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
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
Anton Khorev
3eccf65d8c Merge branch 'pull/5261' 2025-01-17 04:01:22 +03: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
Tom Hughes
473aff084d Fix new rubocop warnings 2025-01-14 18:31:52 +00: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
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
606b5c1b6a Use resourceful routes for terms view/accept/decline 2025-01-08 22:19:35 +03: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
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
Anton Khorev
cb80bd3b96 Add OldElementsController base class 2025-01-04 17:00:43 +03:00