Maxim Filippov [Mon, 25 Nov 2019 15:25:43 +0000 (00:25 +0900)]
Merge branch 'develop' into feature/admin-api-render-whole-status
lain [Mon, 25 Nov 2019 15:23:45 +0000 (15:23 +0000)]
Merge branch 'fix/ap-disable-remote-render' into 'develop'
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
Maxim Filippov [Fri, 22 Nov 2019 04:35:21 +0000 (13:35 +0900)]
AdminAPI: Grouped reports old/new fix
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
Maxim Filippov [Sun, 24 Nov 2019 16:39:35 +0000 (01:39 +0900)]
AdminAPI: Fix grouped reports for closed/resolved reports
rinpatch [Mon, 25 Nov 2019 14:55:17 +0000 (17:55 +0300)]
OStatus controller: don't serve json at /notice/, redirect instead
rinpatch [Mon, 25 Nov 2019 14:19:33 +0000 (17:19 +0300)]
ActivityPub controller: do not render remote users
feld [Mon, 25 Nov 2019 13:29:53 +0000 (13:29 +0000)]
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
feld [Mon, 25 Nov 2019 13:29:22 +0000 (13:29 +0000)]
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
rinpatch [Mon, 25 Nov 2019 11:36:59 +0000 (11:36 +0000)]
Merge branch 'feature/useragent-override' into 'develop'
Add ability to set a custom user-agent string
See merge request pleroma/pleroma!2009
Sadposter [Mon, 25 Nov 2019 11:26:42 +0000 (11:26 +0000)]
move documentation section for http client
Sadposter [Mon, 25 Nov 2019 09:53:11 +0000 (09:53 +0000)]
add ability to set a custom user-agent string
Maxim Filippov [Sun, 24 Nov 2019 16:46:18 +0000 (01:46 +0900)]
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
Maxim Filippov [Sun, 24 Nov 2019 16:43:11 +0000 (01:43 +0900)]
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
Maxim Filippov [Sun, 24 Nov 2019 15:05:52 +0000 (00:05 +0900)]
Typo
Maxim Filippov [Sun, 24 Nov 2019 15:04:29 +0000 (00:04 +0900)]
Admin API: Render whole status in grouped reports
rinpatch [Sat, 23 Nov 2019 19:55:41 +0000 (22:55 +0300)]
fetcher: move local object checking into a reusable function
rinpatch [Fri, 22 Nov 2019 17:17:20 +0000 (17:17 +0000)]
Merge branch 'fix/release-envvars' into 'develop'
OTP releases: only set name and distribution type if not set already
See merge request pleroma/pleroma!2004
rinpatch [Fri, 22 Nov 2019 16:58:39 +0000 (19:58 +0300)]
OTP releases: only set name and distribution type if not set already
Fixes not being able to run two OTP releases on one machine because of
the name conflict.
lain [Fri, 22 Nov 2019 15:39:19 +0000 (15:39 +0000)]
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
Maxim Filippov [Fri, 22 Nov 2019 00:11:36 +0000 (09:11 +0900)]
Swap map with each
rinpatch [Thu, 21 Nov 2019 20:33:11 +0000 (20:33 +0000)]
Merge branch 'list-users' into 'develop'
Add CLI list users command
See merge request pleroma/pleroma!1990
Alex Schroeder [Sun, 17 Nov 2019 20:58:30 +0000 (21:58 +0100)]
Add CLI list users command
rinpatch [Thu, 21 Nov 2019 15:20:05 +0000 (15:20 +0000)]
Merge branch 'revert-
5c6c3026' into 'develop'
Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002
lain [Thu, 21 Nov 2019 15:04:19 +0000 (15:04 +0000)]
Merge branch 'fix/mix-task-logging' into 'develop'
Allow mix tasks to always run with debug logging
See merge request pleroma/pleroma!1997
rinpatch [Thu, 21 Nov 2019 15:03:27 +0000 (15:03 +0000)]
Revert "Merge branch 'patch-1' into 'develop'"
This reverts merge request !1829
lain [Thu, 21 Nov 2019 13:13:14 +0000 (13:13 +0000)]
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
lain [Thu, 21 Nov 2019 13:03:01 +0000 (14:03 +0100)]
Object: Use inspect to log missing preload.
lain [Thu, 21 Nov 2019 12:26:05 +0000 (12:26 +0000)]
Merge branch 'fix/user-following-count' into 'develop'
Fix user.following_count
See merge request pleroma/pleroma!2000
lain [Thu, 21 Nov 2019 12:22:46 +0000 (12:22 +0000)]
Merge branch 'remove-useless-warning' into 'develop'
Remove version mismatch warning
See merge request pleroma/pleroma!2001
Egor Kislitsyn [Thu, 21 Nov 2019 11:22:18 +0000 (18:22 +0700)]
Remove version mismatch warning
Egor Kislitsyn [Thu, 21 Nov 2019 09:31:13 +0000 (16:31 +0700)]
Fix user.following_count
Mark Felder [Wed, 20 Nov 2019 17:55:30 +0000 (11:55 -0600)]
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.
Mark Felder [Wed, 20 Nov 2019 17:18:42 +0000 (11:18 -0600)]
Console backend's log format should be prefixed and suffixed with newlines.
This is how upstream does it by default.
Mark Felder [Wed, 20 Nov 2019 15:16:46 +0000 (09:16 -0600)]
Merge branch 'develop' into fix/mix-task-logging
Mark Felder [Wed, 20 Nov 2019 15:14:27 +0000 (09:14 -0600)]
Be specific about format for logs in test as we have tests that check it
lain [Wed, 20 Nov 2019 12:46:33 +0000 (12:46 +0000)]
Merge branch 'fix/sporadic-tests' into 'develop'
Fix sporadically failing test
Closes #1432
See merge request pleroma/pleroma!1999
lain [Wed, 20 Nov 2019 10:32:58 +0000 (10:32 +0000)]
Merge branch 'fix-docker-build' into 'develop'
Fix failing docker build
See merge request pleroma/pleroma!1998
Egor Kislitsyn [Wed, 20 Nov 2019 07:25:00 +0000 (14:25 +0700)]
Fix sporadically failing test
Mark Felder [Tue, 19 Nov 2019 22:21:30 +0000 (16:21 -0600)]
Allow test builds to have info and debug logs stripped
Mark Felder [Tue, 19 Nov 2019 22:01:17 +0000 (16:01 -0600)]
Allow mix tasks to always run with debug logging
rinpatch [Tue, 19 Nov 2019 21:03:42 +0000 (21:03 +0000)]
Merge branch 'chore/bump-fe' into 'develop'
Bump fe and sync changelogs
See merge request pleroma/pleroma!1996
rinpatch [Tue, 19 Nov 2019 21:01:58 +0000 (00:01 +0300)]
changelog: add 1.1.6 entries from stable
rinpatch [Tue, 19 Nov 2019 16:45:20 +0000 (19:45 +0300)]
kPherox [Tue, 19 Nov 2019 14:52:47 +0000 (23:52 +0900)]
remove docs/ from .dockerignore
Maxim Filippov [Tue, 19 Nov 2019 13:50:24 +0000 (22:50 +0900)]
Fix tests
lain [Tue, 19 Nov 2019 13:16:49 +0000 (13:16 +0000)]
Merge branch 'feature/admin-api/support-token-header' into 'develop'
Admin API: Support authentication via `x-admin-token` HTTP header
Closes #1430
See merge request pleroma/pleroma!1993
Maxim Filippov [Tue, 19 Nov 2019 11:14:02 +0000 (20:14 +0900)]
AdminAPI: Confirm user account, resend confirmation email
Egor Kislitsyn [Tue, 19 Nov 2019 08:58:20 +0000 (15:58 +0700)]
Support authentication via `x-admin-token` HTTP header
feld [Mon, 18 Nov 2019 16:16:27 +0000 (16:16 +0000)]
Merge branch 'docs/remove_activation_status_endpoint' into 'develop'
Remove deprecated endpoint from docs that is fully removed from backend now
See merge request pleroma/pleroma!1992
feld [Mon, 18 Nov 2019 16:16:27 +0000 (16:16 +0000)]
Remove deprecated endpoint from docs that is fully removed from backend now
rinpatch [Sat, 16 Nov 2019 17:49:49 +0000 (17:49 +0000)]
Merge branch 'chore/bump-fast-sanitize' into 'develop'
Bump fast_sanitize
See merge request pleroma/pleroma!1988
rinpatch [Sat, 16 Nov 2019 16:19:25 +0000 (19:19 +0300)]
Bump fast_sanitize
Maxim Filippov [Sat, 16 Nov 2019 09:44:48 +0000 (18:44 +0900)]
Admin API: Error when trying to update reports in the "old" format
rinpatch [Fri, 15 Nov 2019 22:03:28 +0000 (22:03 +0000)]
Merge branch 'chore/changelog-sync-' into 'develop'
Sync the changelogs between develop and stable
See merge request pleroma/pleroma!1985
rinpatch [Fri, 15 Nov 2019 22:02:08 +0000 (01:02 +0300)]
Sync the changelogs between develop and stable
kaniini [Fri, 15 Nov 2019 20:29:38 +0000 (20:29 +0000)]
Merge branch 'nodeinfo-fields-limit' into 'develop'
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
rinpatch [Fri, 15 Nov 2019 19:38:52 +0000 (19:38 +0000)]
Merge branch 'mix-task-warning' into 'develop'
Documentation: Add warning about database mix tasks.
See merge request pleroma/pleroma!1984
kPherox [Fri, 15 Nov 2019 14:55:28 +0000 (23:55 +0900)]
Add test
rinpatch [Fri, 15 Nov 2019 14:11:48 +0000 (14:11 +0000)]
Merge branch 'bugfix/1395-email-activation' into 'develop'
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
lain [Fri, 15 Nov 2019 13:30:59 +0000 (14:30 +0100)]
Documentation: Add warning about database mix tasks.
lain [Fri, 15 Nov 2019 13:13:21 +0000 (14:13 +0100)]
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
lain [Fri, 15 Nov 2019 12:44:54 +0000 (12:44 +0000)]
Merge branch 'feature/mrf-object-age-policy' into 'develop'
MRF: add ObjectAgePolicy
See merge request pleroma/pleroma!1982
lain [Fri, 15 Nov 2019 12:31:09 +0000 (12:31 +0000)]
Apply suggestion to CHANGELOG.md
kPherox [Fri, 15 Nov 2019 09:51:55 +0000 (18:51 +0900)]
Add fieldsLimit to metadata of nodeinfo
Ariadne Conill [Fri, 15 Nov 2019 02:18:45 +0000 (20:18 -0600)]
fix credo
Ariadne Conill [Fri, 15 Nov 2019 01:56:14 +0000 (19:56 -0600)]
object age policy: remove debug logging
Ariadne Conill [Fri, 15 Nov 2019 01:49:25 +0000 (19:49 -0600)]
add changelog entry for MRF ObjectAgePolicy
Ariadne Conill [Fri, 15 Nov 2019 01:48:10 +0000 (19:48 -0600)]
MRF: add ObjectAgePolicy which deals with old posts being imported
Ariadne Conill [Fri, 15 Nov 2019 00:31:30 +0000 (18:31 -0600)]
docs: document MRF ObjectAgePolicy
Ariadne Conill [Fri, 15 Nov 2019 00:26:06 +0000 (18:26 -0600)]
config: add configuration for MRF ObjectAgePolicy
Maxim Filippov [Thu, 14 Nov 2019 14:45:29 +0000 (23:45 +0900)]
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
Maxim Filippov [Thu, 14 Nov 2019 14:44:07 +0000 (23:44 +0900)]
Admin API: list all statuses from a given instance
rinpatch [Thu, 14 Nov 2019 14:40:37 +0000 (14:40 +0000)]
Merge branch 'fix/conversations-rendering' into 'develop'
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
rinpatch [Thu, 14 Nov 2019 14:26:59 +0000 (17:26 +0300)]
format the code
feld [Thu, 14 Nov 2019 13:35:41 +0000 (13:35 +0000)]
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
rinpatch [Thu, 14 Nov 2019 13:26:15 +0000 (13:26 +0000)]
Merge branch 'ci/disable-trace' into 'develop'
ci: disable --trace for unit tests
See merge request pleroma/pleroma!1980
rinpatch [Thu, 14 Nov 2019 13:06:08 +0000 (16:06 +0300)]
ci: disable --trace for unit tests
it is mostly useless, but makes failures harder to find
rinpatch [Thu, 14 Nov 2019 08:47:10 +0000 (08:47 +0000)]
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
lain [Thu, 14 Nov 2019 08:21:06 +0000 (08:21 +0000)]
Update CHANGELOG.md
lain [Wed, 13 Nov 2019 17:37:48 +0000 (17:37 +0000)]
Merge branch 'static-fe-object-id' into 'develop'
Redirect object/activity ID to notice in static-fe
Closes #1412
See merge request pleroma/pleroma!1977
Phil Hagelberg [Wed, 13 Nov 2019 01:33:54 +0000 (17:33 -0800)]
Support redirecting by activity UUID in static FE as well.
Phil Hagelberg [Wed, 13 Nov 2019 01:19:46 +0000 (17:19 -0800)]
Support redirecting by object ID in static FE.
This matches the behavior of pleroma-fe better.
Fixes #1412.
lain [Wed, 13 Nov 2019 14:27:37 +0000 (14:27 +0000)]
Merge branch 'fix-rate-limiter-test' into 'develop'
Fix random fails of the rate limiter tests (hopefully)
See merge request pleroma/pleroma!1978
rinpatch [Wed, 13 Nov 2019 12:08:11 +0000 (12:08 +0000)]
Merge branch 'fix-docs-formatting' into 'develop'
Fix formatting in OpenBSD install manual
See merge request pleroma/pleroma!1979
Egor Kislitsyn [Wed, 13 Nov 2019 11:48:53 +0000 (18:48 +0700)]
Fix formatting in OpenBSD install manual
Egor Kislitsyn [Wed, 13 Nov 2019 11:07:53 +0000 (18:07 +0700)]
Fix random fails of the rate limiter tests
lain [Wed, 13 Nov 2019 10:16:00 +0000 (10:16 +0000)]
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
rinpatch [Wed, 13 Nov 2019 10:08:07 +0000 (10:08 +0000)]
Merge branch 'bugfix/1360-actorless-posts' into 'develop'
Containment: Add a catch-all clause to contain_origin.
Closes #1360
See merge request pleroma/pleroma!1975
Phil Hagelberg [Tue, 12 Nov 2019 01:16:44 +0000 (17:16 -0800)]
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.
lain [Tue, 12 Nov 2019 11:07:17 +0000 (12:07 +0100)]
Containment: Add a catch-all clause to contain_origin.
Mark Felder [Tue, 12 Nov 2019 00:29:55 +0000 (18:29 -0600)]
Fix rendering conversations when there's a malformed status
rinpatch [Mon, 11 Nov 2019 20:25:48 +0000 (20:25 +0000)]
Merge branch 'fix/docs-static-fe-category' into 'develop'
docs: move static-fe docs under a proper category
See merge request pleroma/pleroma!1972
rinpatch [Mon, 11 Nov 2019 20:24:15 +0000 (23:24 +0300)]
docs: move static-fe docs under a proper category
feld [Mon, 11 Nov 2019 19:14:06 +0000 (19:14 +0000)]
Merge branch 'nodeinfo-federation-enabled' into 'develop'
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
kaniini [Mon, 11 Nov 2019 19:10:44 +0000 (19:10 +0000)]
Merge branch 'feature/static-fe' into 'develop'
Static frontend
See merge request pleroma/pleroma!1917
href [Mon, 11 Nov 2019 18:03:43 +0000 (19:03 +0100)]
report federating status in nodeinfo
lain [Mon, 11 Nov 2019 15:01:31 +0000 (15:01 +0000)]
Merge branch 'fix-dokku-2' into 'develop'
Dokku deploys: Keep the git dir so version number generation works.
See merge request pleroma/pleroma!1967
rinpatch [Mon, 11 Nov 2019 14:09:46 +0000 (14:09 +0000)]
Merge branch 'patch-1' into 'develop'
Default config: Use extended nickname format
See merge request pleroma/pleroma!1968
rinpatch [Mon, 11 Nov 2019 14:07:23 +0000 (14:07 +0000)]
Merge branch 'chore/changelog-1940' into 'develop'
Add a changelog entry for !1940
See merge request pleroma/pleroma!1970
rinpatch [Mon, 11 Nov 2019 14:05:30 +0000 (17:05 +0300)]
Add a changelog entry for !1940
projects / akkoma / log