lain [Wed, 16 Oct 2019 11:54:49 +0000 (11:54 +0000)]
Merge branch 'benchmark-finishing' into 'develop'
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
Alexander [Tue, 15 Oct 2019 13:26:04 +0000 (16:26 +0300)]
some fixes
Alexander [Tue, 15 Oct 2019 12:16:17 +0000 (15:16 +0300)]
don't stream in benchmark env
feld [Mon, 14 Oct 2019 19:40:40 +0000 (19:40 +0000)]
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
rinpatch [Mon, 14 Oct 2019 19:17:06 +0000 (19:17 +0000)]
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
Backport "Fix hiding branch name logic" to develop
See merge request pleroma/pleroma!1846
rinpatch [Mon, 14 Oct 2019 19:13:18 +0000 (22:13 +0300)]
Fix hiding branch name logic
rinpatch [Mon, 14 Oct 2019 16:08:53 +0000 (16:08 +0000)]
Merge branch 'master-to-stable' into 'develop'
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
rinpatch [Mon, 14 Oct 2019 15:45:16 +0000 (18:45 +0300)]
Correct version parser branch name detection
rinpatch [Mon, 14 Oct 2019 15:42:30 +0000 (18:42 +0300)]
Add a changelog entry for branch-moving
rinpatch [Mon, 14 Oct 2019 15:39:56 +0000 (18:39 +0300)]
Prepare pleroma_ctl for moving master to stable and relax the error
message
rinpatch [Mon, 14 Oct 2019 15:38:51 +0000 (18:38 +0300)]
Preparations for renaming `master` to `stable`
eugenijm [Tue, 8 Oct 2019 20:05:57 +0000 (23:05 +0300)]
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
lain [Sun, 13 Oct 2019 15:37:49 +0000 (15:37 +0000)]
Merge branch 'incoming-id-fixes' into 'develop'
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
rinpatch [Sat, 12 Oct 2019 14:42:55 +0000 (14:42 +0000)]
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
rinpatch [Fri, 11 Oct 2019 19:52:38 +0000 (22:52 +0300)]
Make MediaProxy failure tracking less brutal
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
Haelwenn [Fri, 11 Oct 2019 10:56:45 +0000 (10:56 +0000)]
Merge branch 'pleroma-ctl-enchancements' into 'develop'
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
lain [Fri, 11 Oct 2019 10:53:09 +0000 (12:53 +0200)]
Ostatus DeleteHandler: Fix for new option format.
lain [Fri, 11 Oct 2019 10:41:44 +0000 (12:41 +0200)]
SearchController: Fix test.
Turns out you can't actually find the user with this.
rinpatch [Fri, 11 Oct 2019 10:22:21 +0000 (13:22 +0300)]
pleroma_ctl: Make it possible to specify branches/flavours when updating
lain [Fri, 11 Oct 2019 09:48:58 +0000 (11:48 +0200)]
Transmogrifier: Correctly save incoming ids for Accept/Reject.
lain [Fri, 11 Oct 2019 09:25:45 +0000 (11:25 +0200)]
Transmogrifier: Actually store who deleted a note.
lain [Thu, 10 Oct 2019 15:17:33 +0000 (17:17 +0200)]
Transmogrifier: Save correct ids for incoming deletes.
lain [Thu, 10 Oct 2019 13:42:54 +0000 (15:42 +0200)]
Benchmark config: Don't use the sql sandbox.
lain [Thu, 10 Oct 2019 13:31:32 +0000 (15:31 +0200)]
Gitlab CI: Run correct benchmark task.
lain [Thu, 10 Oct 2019 13:01:06 +0000 (15:01 +0200)]
Benchmark config: Database adjustments.
lain [Thu, 10 Oct 2019 12:40:59 +0000 (14:40 +0200)]
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
lain [Thu, 10 Oct 2019 12:24:54 +0000 (14:24 +0200)]
Gitlab: Run benchmark in CI.
kaniini [Wed, 9 Oct 2019 16:33:05 +0000 (16:33 +0000)]
Merge branch 'unicode-search' into 'develop'
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
kaniini [Wed, 9 Oct 2019 16:32:28 +0000 (16:32 +0000)]
Merge branch 'webfinger-mocks' into 'develop'
provide mocks for webfinger endpoints
See merge request pleroma/pleroma!1821
Steven Fuchs [Wed, 9 Oct 2019 16:32:28 +0000 (16:32 +0000)]
provide mocks for webfinger endpoints
lain [Wed, 9 Oct 2019 15:10:08 +0000 (15:10 +0000)]
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
lain [Wed, 9 Oct 2019 14:11:23 +0000 (14:11 +0000)]
Merge branch 'feature/count-statuses-task' into 'develop'
Add a task to re-count statuses for all users
Closes #1305
See merge request pleroma/pleroma!1823
lain [Wed, 9 Oct 2019 14:03:45 +0000 (16:03 +0200)]
Search: Add tests for unicode searches.
Egor Kislitsyn [Wed, 9 Oct 2019 06:11:57 +0000 (13:11 +0700)]
Add a task to re-count statuses for all users
eugenijm [Wed, 9 Oct 2019 03:51:14 +0000 (06:51 +0300)]
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
rinpatch [Tue, 8 Oct 2019 12:28:10 +0000 (12:28 +0000)]
Merge branch 'chore/format-migrations' into 'develop'
Enable `mix format` for migrations
See merge request pleroma/pleroma!1819
rinpatch [Tue, 8 Oct 2019 12:16:39 +0000 (15:16 +0300)]
Enable `mix format` for migrations
rinpatch [Mon, 7 Oct 2019 14:54:24 +0000 (14:54 +0000)]
Merge branch 'chore/bump-fe-
122323f3' into 'develop'
Bump pleroma-fe bundle to https://git.pleroma.social/pleroma/pleroma-fe/commit/
122323f35c32a4f12a345a8b3f163e9318f5dea3
See merge request pleroma/pleroma!1817
rinpatch [Mon, 7 Oct 2019 14:42:33 +0000 (17:42 +0300)]
Bump pleroma-fe bundle to https://git.pleroma.social/pleroma/pleroma-fe/commit/
122323f35c32a4f12a345a8b3f163e9318f5dea3
kaniini [Mon, 7 Oct 2019 12:43:21 +0000 (12:43 +0000)]
Merge branch 'bugfix/exclude-replies' into 'develop'
mastodon api: fix exclude_replies (closes #1287)
Closes #1287
See merge request pleroma/pleroma!1813
Ariadne Conill [Mon, 7 Oct 2019 12:29:33 +0000 (12:29 +0000)]
mastodon api: fix exclude_replies (closes #1287)
kaniini [Mon, 7 Oct 2019 12:20:41 +0000 (12:20 +0000)]
Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'
Extract RSS Feed functionality from OStatus
Closes #1243
See merge request pleroma/pleroma!1644
Sergey Suprunenko [Mon, 7 Oct 2019 12:20:41 +0000 (12:20 +0000)]
Extract RSS Feed functionality from OStatus
kaniini [Mon, 7 Oct 2019 11:34:50 +0000 (11:34 +0000)]
Merge branch 'chore/context-cleanups' into 'develop'
clean up bundled litepub schema (closes #1303)
Closes #1303
See merge request pleroma/pleroma!1808
Ariadne Conill [Mon, 7 Oct 2019 11:33:58 +0000 (11:33 +0000)]
clean up bundled litepub schema (closes #1303)
kaniini [Mon, 7 Oct 2019 10:19:24 +0000 (10:19 +0000)]
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
Haelwenn [Mon, 7 Oct 2019 09:16:42 +0000 (09:16 +0000)]
Merge branch '1260-rate-limited-auth-actions' into 'develop'
[#1260] Rate-limiting for create authentication and related requests
Closes #1260
See merge request pleroma/pleroma!1681
Ivan Tashkinov [Mon, 7 Oct 2019 08:06:30 +0000 (11:06 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
Haelwenn [Mon, 7 Oct 2019 02:14:45 +0000 (02:14 +0000)]
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
Haelwenn (lanodan) Monnier [Mon, 7 Oct 2019 00:55:09 +0000 (02:55 +0200)]
mrf/simple_policy: check actor against accept/reject
kaniini [Sun, 6 Oct 2019 15:15:00 +0000 (15:15 +0000)]
Merge branch 'fix/bad-migration' into 'develop'
Fix muted notification migration only working with a schema
See merge request pleroma/pleroma!1803
rinpatch [Sun, 6 Oct 2019 14:53:03 +0000 (17:53 +0300)]
Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
kaniini [Sun, 6 Oct 2019 14:32:56 +0000 (14:32 +0000)]
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
rinpatch [Sun, 6 Oct 2019 14:05:51 +0000 (17:05 +0300)]
Fix the use of queries with a schema in a migration
feld [Sun, 6 Oct 2019 14:13:04 +0000 (14:13 +0000)]
Merge branch 'fix/report-email' into 'develop'
Fix/report email
Closes #1300
See merge request pleroma/pleroma!1800
feld [Sun, 6 Oct 2019 14:13:04 +0000 (14:13 +0000)]
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
Ivan Tashkinov [Sun, 6 Oct 2019 14:12:17 +0000 (17:12 +0300)]
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
rinpatch [Sun, 6 Oct 2019 13:22:35 +0000 (16:22 +0300)]
Move local keys out of `user.info`
Ivan Tashkinov [Sun, 6 Oct 2019 08:43:49 +0000 (11:43 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
Ivan Tashkinov [Sun, 6 Oct 2019 06:30:49 +0000 (09:30 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
Haelwenn [Sun, 6 Oct 2019 04:41:06 +0000 (04:41 +0000)]
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
kaniini [Sat, 5 Oct 2019 19:28:53 +0000 (19:28 +0000)]
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
kaniini [Sat, 5 Oct 2019 19:28:29 +0000 (19:28 +0000)]
Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
kaniini [Sat, 5 Oct 2019 19:28:07 +0000 (19:28 +0000)]
Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
eugenijm [Tue, 1 Oct 2019 21:37:08 +0000 (00:37 +0300)]
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
kaniini [Sat, 5 Oct 2019 15:51:19 +0000 (15:51 +0000)]
Merge branch 'update-activity-fixes' into 'develop'
Update activity fixes
Closes #1298
See merge request pleroma/pleroma!1795
lain [Sat, 5 Oct 2019 12:53:50 +0000 (14:53 +0200)]
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
lain [Sat, 5 Oct 2019 12:49:45 +0000 (14:49 +0200)]
ActivityPub / Transmogrifier: Correctly store incoming Update id.
Thibaut Girka [Sat, 5 Oct 2019 10:46:06 +0000 (12:46 +0200)]
Add test for handling Announces with inlined object from different origin
Thibaut Girka [Wed, 2 Oct 2019 11:46:06 +0000 (13:46 +0200)]
Make credo happy
Thibaut Girka [Wed, 2 Oct 2019 11:18:51 +0000 (13:18 +0200)]
Import object from self-Announce whenever possible
kaniini [Sat, 5 Oct 2019 10:00:44 +0000 (10:00 +0000)]
Merge branch 'revert-
5c04e817' into 'develop'
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
See merge request pleroma/pleroma!1794
kaniini [Sat, 5 Oct 2019 10:00:05 +0000 (10:00 +0000)]
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
kaniini [Fri, 4 Oct 2019 20:07:47 +0000 (20:07 +0000)]
Merge branch 'issue/1296' into 'develop'
[#1296] removed legacy api: "/objects/:uuid/likes"
See merge request pleroma/pleroma!1788
Maksim Pechnikov [Fri, 4 Oct 2019 19:20:53 +0000 (22:20 +0300)]
removed legacy api: "/objects/:uuid/likes"
kaniini [Fri, 4 Oct 2019 17:39:06 +0000 (17:39 +0000)]
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
widen streaming API block effects
See merge request pleroma/pleroma!1784
kaniini [Fri, 4 Oct 2019 17:33:18 +0000 (17:33 +0000)]
Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
kaniini [Fri, 4 Oct 2019 15:53:47 +0000 (15:53 +0000)]
Merge branch 'fix/extended-nickname-format-default-config' into 'develop'
Add missing extended_nickname_format setting to the default config
See merge request pleroma/pleroma!1776
kaniini [Fri, 4 Oct 2019 15:52:41 +0000 (15:52 +0000)]
Merge branch 'undo-fixes' into 'develop'
ActivityPub: Change addressing of Undo.
See merge request pleroma/pleroma!1782
Ariadne Conill [Fri, 4 Oct 2019 15:45:06 +0000 (15:45 +0000)]
update changelog
Ariadne Conill [Fri, 4 Oct 2019 15:42:25 +0000 (15:42 +0000)]
streamer: worker: actually use should_send? consistently
Ariadne Conill [Fri, 4 Oct 2019 15:41:55 +0000 (15:41 +0000)]
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
Ariadne Conill [Fri, 4 Oct 2019 15:21:45 +0000 (15:21 +0000)]
streamer: add missing copyright headers
Ariadne Conill [Fri, 4 Oct 2019 15:17:32 +0000 (15:17 +0000)]
tests: streamer: add a test for blocked transitive activities
lain [Fri, 4 Oct 2019 15:10:49 +0000 (17:10 +0200)]
ActivityPub.Utils: Fix undo test.
lain [Fri, 4 Oct 2019 14:32:42 +0000 (16:32 +0200)]
ActivityPub: Change addressing of Undo.
feld [Fri, 4 Oct 2019 14:16:28 +0000 (14:16 +0000)]
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
# Conflicts:
# CHANGELOG.md
lain [Fri, 4 Oct 2019 12:52:11 +0000 (12:52 +0000)]
Merge branch 'featrue/job-monitor' into 'develop'
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
lain [Fri, 4 Oct 2019 11:54:05 +0000 (11:54 +0000)]
Merge branch 'fix/nickname-fail' into 'develop'
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777
rinpatch [Thu, 3 Oct 2019 22:05:50 +0000 (01:05 +0300)]
Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname
Closes #1293
lain [Fri, 4 Oct 2019 11:28:20 +0000 (11:28 +0000)]
Merge branch 'bugfix/notification-nil-actor' into 'develop'
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
lain [Fri, 4 Oct 2019 11:27:30 +0000 (11:27 +0000)]
Merge branch 'fix/oauth-controller' into 'develop'
Fix OAuthController
Closes #1294
See merge request pleroma/pleroma!1780
Egor Kislitsyn [Fri, 4 Oct 2019 06:30:46 +0000 (13:30 +0700)]
Fix OAuthController
Haelwenn (lanodan) Monnier [Fri, 4 Oct 2019 04:47:36 +0000 (06:47 +0200)]
notification_view.ex: Make sure `account` isn’t empty
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
rinpatch [Thu, 3 Oct 2019 22:22:47 +0000 (22:22 +0000)]
Merge branch 'docs/frontend_configuration' into 'develop'
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
See merge request pleroma/pleroma!1778
Haelwenn (lanodan) Monnier [Thu, 3 Oct 2019 22:10:28 +0000 (00:10 +0200)]
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
eugenijm [Tue, 1 Oct 2019 21:37:08 +0000 (00:37 +0300)]
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
rinpatch [Thu, 3 Oct 2019 15:43:03 +0000 (15:43 +0000)]
Merge branch 'mkdocs-migration-prep' into 'develop'
MkDocs migration preparation
See merge request pleroma/pleroma!1774
rinpatch [Thu, 3 Oct 2019 15:42:02 +0000 (18:42 +0300)]
Remove a test branch from CI
Mark Felder [Thu, 3 Oct 2019 15:40:49 +0000 (10:40 -0500)]
Add missing extended_nickname_format setting to the default config
projects / akkoma / log