Commit Graph

4908 Commits

Author SHA1 Message Date
Maksim Pechnikov
a36607c27e add mix task to set\unset privacy option of notification 2019-11-28 22:13:28 +03:00
Maksim Pechnikov
04a8ffbe84 added privacy option to push notifications 2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9 added User.NotificationSetting struct 2019-11-28 22:08:30 +03:00
lain
50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count 2019-11-27 14:48:28 +01:00
lain
f36724efb1 User: Never return nil for user follower counts. 2019-11-27 14:13:36 +01:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2 2019-11-27 19:43:47 +07:00
Egor Kislitsyn
4af69f047d
Remove account field from web push payload 2019-11-27 02:32:55 +07:00
Egor Kislitsyn
80ededc04f
Add direct_conversation_id to web push payload 2019-11-26 19:53:43 +07:00
lain
dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
Disable rendering AP representation for remote users and objects

See merge request pleroma/pleroma!2010
2019-11-25 15:23:45 +00:00
rinpatch
4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead 2019-11-25 17:55:17 +03:00
rinpatch
02f7383891 ActivityPub controller: do not render remote users 2019-11-25 17:19:33 +03:00
feld
5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
Admin API: list all statuses from a given instance

See merge request pleroma/pleroma!1981
2019-11-25 13:29:53 +00:00
feld
9374b52756 Merge branch 'fix/update-reports-old-format' into 'develop'
Admin API: Fix error when trying to update reports in the "old" format

See merge request pleroma/pleroma!1986
2019-11-25 13:29:22 +00:00
Sadposter
d3656c2725 add ability to set a custom user-agent string 2019-11-25 09:53:11 +00:00
Maxim Filippov
82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-25 01:43:11 +09:00
rinpatch
9f29930440 fetcher: move local object checking into a reusable function 2019-11-23 22:55:41 +03:00
lain
bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email

See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
Maxim Filippov
b64c7b35d4 Swap map with each 2019-11-22 09:11:36 +09:00
rinpatch
c2ad9fd5f9 Merge branch 'list-users' into 'develop'
Add CLI list users command

See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689 Add CLI list users command 2019-11-21 21:07:06 +01:00
lain
19b727bf8f Merge branch 'fix/mix-task-logging' into 'develop'
Allow mix tasks to always run with debug logging

See merge request pleroma/pleroma!1997
2019-11-21 15:04:19 +00:00
lain
8feb5dcb42 Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937
2019-11-21 13:13:14 +00:00
lain
320690f7a5 Object: Use inspect to log missing preload. 2019-11-21 14:03:01 +01:00
Egor Kislitsyn
d38ab4bb89
Fix user.following_count 2019-11-21 16:31:13 +07:00
Mark Felder
edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
2019-11-20 11:55:30 -06:00
Mark Felder
ff9133b978 Allow mix tasks to always run with debug logging 2019-11-19 16:01:17 -06:00
Maxim Filippov
46eb160135 AdminAPI: Confirm user account, resend confirmation email 2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header 2019-11-19 15:58:20 +07:00
Maxim Filippov
c506cc48ef Admin API: Error when trying to update reports in the "old" format 2019-11-16 18:44:48 +09:00
kaniini
81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
Add fieldsLimit to metadata of nodeinfo

See merge request pleroma/pleroma!1983
2019-11-15 20:29:38 +00:00
rinpatch
22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop'
Bugfix/1395 email activation

Closes #1395

See merge request pleroma/pleroma!1965
2019-11-15 14:11:48 +00:00
lain
f17e0f8e4f OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug 2019-11-15 14:13:21 +01:00
kPherox
72d2557e11 Add fieldsLimit to metadata of nodeinfo 2019-11-15 18:52:31 +09:00
Ariadne Conill
eecd64cc07 object age policy: remove debug logging 2019-11-14 19:56:14 -06:00
Ariadne Conill
5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported 2019-11-14 19:48:10 -06:00
Maxim Filippov
114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330 Admin API: list all statuses from a given instance 2019-11-14 23:44:07 +09:00
rinpatch
09b4f7269e Merge branch 'fix/conversations-rendering' into 'develop'
Fix rendering conversations when there's a malformed status

Closes #1401

See merge request pleroma/pleroma!1973
2019-11-14 14:40:37 +00:00
rinpatch
94f1cfced8 format the code 2019-11-14 17:26:59 +03:00
feld
1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
2019-11-14 13:35:41 +00:00
rinpatch
6085c71bd1 Merge branch 'reactions' into 'develop'
Emoji Reactions

See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
Phil Hagelberg
3c60adbc1f Support redirecting by activity UUID in static FE as well. 2019-11-13 08:22:11 -08:00
Phil Hagelberg
0867cb083e Support redirecting by object ID in static FE.
This matches the behavior of pleroma-fe better.

Fixes #1412.
2019-11-13 08:02:02 -08:00
lain
facc37aaa6 Merge branch 'static-remote-redirect' into 'develop'
For remote notices, redirect to the original instead of 404 in static-fe

See merge request pleroma/pleroma!1974
2019-11-13 10:16:00 +00:00
Phil Hagelberg
62f3a93049 For remote notices, redirect to the original instead of 404.
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.

This new redirecting behavior should improve that situation.
2019-11-12 09:40:29 -08:00
lain
e835cd97f6 Containment: Add a catch-all clause to contain_origin. 2019-11-12 12:07:17 +01:00
Mark Felder
7d101bc9c5 Fix rendering conversations when there's a malformed status 2019-11-11 18:29:55 -06:00
feld
e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop'
report federating status in nodeinfo

See merge request pleroma/pleroma!1971
2019-11-11 19:14:06 +00:00
kaniini
2cc043591c Merge branch 'feature/static-fe' into 'develop'
Static frontend

See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00