Egor Kislitsyn [Tue, 3 Dec 2019 15:31:12 +0000 (22:31 +0700)]
Fix Pleroma.FollowingRelationship.move_following/2
Egor Kislitsyn [Tue, 3 Dec 2019 15:13:38 +0000 (22:13 +0700)]
Add `with_move` query param to the notifications API
lain [Mon, 2 Dec 2019 16:26:19 +0000 (16:26 +0000)]
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
rinpatch [Mon, 2 Dec 2019 11:18:58 +0000 (11:18 +0000)]
Merge branch 'update-floki' into 'develop'
Update Floki dependency
See merge request pleroma/pleroma!2028
Egor Kislitsyn [Mon, 2 Dec 2019 06:38:35 +0000 (13:38 +0700)]
Update Floki dependency
rinpatch [Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)]
Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field
See merge request pleroma/pleroma!2006
rinpatch [Sat, 30 Nov 2019 10:41:18 +0000 (10:41 +0000)]
Merge branch 'hide-relation-for-friendica' into 'develop'
Hide relation for friendica users
See merge request pleroma/pleroma!2026
rinpatch [Sat, 30 Nov 2019 10:39:48 +0000 (10:39 +0000)]
Merge branch 'benchmarks/favourites_timeline' into 'develop'
Benchmarks: favourites timeline
See merge request pleroma/pleroma!2027
kPherox [Sat, 30 Nov 2019 06:24:08 +0000 (15:24 +0900)]
test missing first field
kPherox [Fri, 29 Nov 2019 19:26:45 +0000 (04:26 +0900)]
hide follower/following for friendica
lain [Fri, 29 Nov 2019 10:10:30 +0000 (10:10 +0000)]
Merge branch 'fix/extract_first_external_url' into 'develop'
Fix Pleroma.HTML.extract_first_external_url/2
Closes #1451
See merge request pleroma/pleroma!2024
Egor Kislitsyn [Fri, 29 Nov 2019 08:49:35 +0000 (15:49 +0700)]
Fix Pleroma.HTML.extract_first_external_url/2
rinpatch [Thu, 28 Nov 2019 19:13:42 +0000 (19:13 +0000)]
Merge branch 'bugfix/1447-set-following' into 'develop'
Migrations: Set users.following_count to NOT NULL
Closes #1447
See merge request pleroma/pleroma!2021
rinpatch [Thu, 28 Nov 2019 17:46:23 +0000 (17:46 +0000)]
Merge branch 'chore/manual-benchmark' into 'develop'
CI: Make benchmarks manually triggered.
See merge request pleroma/pleroma!2020
lain [Thu, 28 Nov 2019 16:58:41 +0000 (16:58 +0000)]
Merge branch 'use-pg12-in-ci' into 'develop'
Use PosgreSQL v12 in the federated tests
See merge request pleroma/pleroma!2022
Egor Kislitsyn [Thu, 28 Nov 2019 16:08:13 +0000 (23:08 +0700)]
Use PosgreSQL v12 in the federated tests
lain [Thu, 28 Nov 2019 16:01:43 +0000 (17:01 +0100)]
Migrations: Set users.following_count to NOT NULL
Also set following_count for local users to the correct value and for remote
users to 0.
lain [Thu, 28 Nov 2019 14:34:07 +0000 (14:34 +0000)]
Merge branch 'fed-testing-updates' into 'develop'
Add federated test infrastructure
See merge request pleroma/pleroma!2014
lain [Thu, 28 Nov 2019 14:14:11 +0000 (15:14 +0100)]
CI: Make benchmarks manually triggered.
lain [Thu, 28 Nov 2019 12:19:15 +0000 (12:19 +0000)]
Merge branch 'cleanup-tests-output' into 'develop'
Cleanup tests output
See merge request pleroma/pleroma!2018
Egor Kislitsyn [Thu, 28 Nov 2019 09:44:48 +0000 (16:44 +0700)]
Cleanup tests output
kaniini [Wed, 27 Nov 2019 16:46:41 +0000 (16:46 +0000)]
Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'
User: Never return nil for user follower counts.
Closes #1442
See merge request pleroma/pleroma!2017
lain [Wed, 27 Nov 2019 13:48:28 +0000 (14:48 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
lain [Wed, 27 Nov 2019 13:40:39 +0000 (13:40 +0000)]
Merge branch 'remove-user-info' into 'develop'
Remove User.user_info/2
See merge request pleroma/pleroma!2016
lain [Wed, 27 Nov 2019 13:13:36 +0000 (14:13 +0100)]
User: Never return nil for user follower counts.
Egor Kislitsyn [Wed, 27 Nov 2019 12:43:47 +0000 (19:43 +0700)]
Remove User.user_info/2
Egor Kislitsyn [Tue, 26 Nov 2019 11:48:56 +0000 (18:48 +0700)]
Add a view for the move notification
stwf [Tue, 26 Nov 2019 20:24:34 +0000 (15:24 -0500)]
update tests and Oban
lain [Mon, 22 Jul 2019 14:32:50 +0000 (16:32 +0200)]
Tests: Run the daemon
lain [Mon, 22 Jul 2019 14:18:37 +0000 (16:18 +0200)]
CI: Add testing stage for federated tests.
lain [Mon, 22 Jul 2019 14:17:18 +0000 (16:17 +0200)]
Tests: Don't run federated tests by default
Chris McCord [Thu, 11 Jul 2019 20:33:20 +0000 (16:33 -0400)]
Add federated test infrastructure
lain [Tue, 26 Nov 2019 19:43:16 +0000 (19:43 +0000)]
Merge branch 'feature/direct_conversation_id_web_push' into 'develop'
Add `direct_conversation_id` to web push payload
See merge request pleroma/pleroma!2012
Egor Kislitsyn [Tue, 26 Nov 2019 19:32:55 +0000 (02:32 +0700)]
Remove `account` field from web push payload
Egor Kislitsyn [Tue, 26 Nov 2019 12:53:43 +0000 (19:53 +0700)]
Add `direct_conversation_id` to web push payload
feld [Tue, 26 Nov 2019 12:03:44 +0000 (12:03 +0000)]
Merge branch 'fix/prod-syslog-level' into 'develop'
Default log level for syslog in prod should also be :warn
See merge request pleroma/pleroma!2011
Mark Felder [Tue, 26 Nov 2019 11:46:48 +0000 (05:46 -0600)]
Default log level for syslog in prod should also be :warn
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
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
rinpatch [Sat, 23 Nov 2019 19:55:41 +0000 (22:55 +0300)]
fetcher: move local object checking into a reusable function
Ivan Tashkinov [Sat, 23 Nov 2019 11:06:19 +0000 (14:06 +0300)]
Removed users.info and remaining usages.
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
Maksim Pechnikov [Fri, 22 Nov 2019 11:17:12 +0000 (14:17 +0300)]
fix
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)]
Maksim Pechnikov [Tue, 19 Nov 2019 18:11:15 +0000 (21:11 +0300)]
benchmarks/ added favourites timeline
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
projects / akkoma / log