rinpatch [Mon, 9 Dec 2019 10:27:43 +0000 (10:27 +0000)]
Merge branch 'feat/docs-otp-source-picker' into 'develop'
docs: add OTP/From source tabs to CLI tasks
See merge request pleroma/pleroma!2046
rinpatch [Mon, 9 Dec 2019 10:16:26 +0000 (10:16 +0000)]
Merge branch 'move-api-docs' into 'develop'
Document `with_move` parameter of the notification API
See merge request pleroma/pleroma!2047
Egor Kislitsyn [Mon, 9 Dec 2019 07:46:06 +0000 (14:46 +0700)]
Document `with_move` parameter of the notification API
rinpatch [Mon, 9 Dec 2019 01:07:16 +0000 (04:07 +0300)]
docs: add OTP/From source tabs to CLI tasks
rinpatch [Sun, 8 Dec 2019 13:50:57 +0000 (13:50 +0000)]
Merge branch 'fix/clause-never-matches' into 'develop'
Fix never matching clause
See merge request pleroma/pleroma!2042
rinpatch [Sun, 8 Dec 2019 13:36:22 +0000 (16:36 +0300)]
Fix never matching clause
`length/1` is only used with lists.
rinpatch [Sun, 8 Dec 2019 13:07:05 +0000 (13:07 +0000)]
Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
rinpatch [Sun, 8 Dec 2019 11:23:31 +0000 (11:23 +0000)]
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
rinpatch [Fri, 6 Dec 2019 15:36:30 +0000 (15:36 +0000)]
Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
lain [Fri, 6 Dec 2019 13:48:37 +0000 (13:48 +0000)]
Merge branch 'fix/mrf-delete' into 'develop'
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
See merge request pleroma/pleroma!2037
lain [Fri, 6 Dec 2019 13:25:13 +0000 (14:25 +0100)]
ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
rinpatch [Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)]
Merge branch 'develop' into fix/mrf-delete
rinpatch [Wed, 4 Dec 2019 23:50:38 +0000 (02:50 +0300)]
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
lain [Thu, 5 Dec 2019 17:16:23 +0000 (17:16 +0000)]
Merge branch '1335-user-api-id-fields-relations' into 'develop'
[#1335] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
feld [Thu, 5 Dec 2019 13:34:34 +0000 (13:34 +0000)]
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
Egor Kislitsyn [Thu, 5 Dec 2019 07:55:48 +0000 (14:55 +0700)]
Merge branch 'develop' into improve-move-notificaions-api
Ivan Tashkinov [Wed, 4 Dec 2019 16:41:14 +0000 (19:41 +0300)]
[#1335] Merge issue fix.
Ivan Tashkinov [Wed, 4 Dec 2019 15:56:31 +0000 (18:56 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
lain [Wed, 4 Dec 2019 13:25:12 +0000 (13:25 +0000)]
Merge branch 'fix_test' into 'develop'
[#1457] fix test
See merge request pleroma/pleroma!2035
lain [Wed, 4 Dec 2019 13:25:00 +0000 (14:25 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
Maksim Pechnikov [Wed, 4 Dec 2019 13:22:01 +0000 (16:22 +0300)]
fix test
lain [Wed, 4 Dec 2019 11:51:06 +0000 (12:51 +0100)]
Cheat Sheet: Addg chat_limit information.
lain [Wed, 4 Dec 2019 11:49:46 +0000 (12:49 +0100)]
Changelog: Add information about chat limit.
lain [Wed, 4 Dec 2019 11:48:34 +0000 (12:48 +0100)]
ChatChannel: Ignore messages that are too long.
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
Ivan Tashkinov [Fri, 29 Nov 2019 07:17:59 +0000 (10:17 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
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
Maxim Filippov [Wed, 27 Nov 2019 15:09:00 +0000 (00:09 +0900)]
Fetch account from report, not from status (it might be deleted)
Maxim Filippov [Wed, 27 Nov 2019 13:54:12 +0000 (22:54 +0900)]
Handle reopened reports with deleted statuses
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
Ivan Tashkinov [Tue, 26 Nov 2019 07:42:36 +0000 (10:42 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
Maxim Filippov [Mon, 25 Nov 2019 16:06:54 +0000 (01:06 +0900)]
Fix tests
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
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
Ivan Tashkinov [Thu, 21 Nov 2019 13:47:52 +0000 (16:47 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
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
projects / akkoma / log