eugenijm [Fri, 11 Oct 2019 03:40:58 +0000 (06:40 +0300)]
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
rinpatch [Sat, 19 Oct 2019 08:51:03 +0000 (08:51 +0000)]
Merge branch 'mix-emoji-task-pack-json' into 'develop'
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
rinpatch [Fri, 18 Oct 2019 22:29:04 +0000 (22:29 +0000)]
Merge branch 'patch-1' into 'develop'
Fix a typo in default static directory configuration for OTP releases
Closes #1289
See merge request pleroma/pleroma!1829
rinpatch [Fri, 18 Oct 2019 21:40:07 +0000 (21:40 +0000)]
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
rinpatch [Fri, 18 Oct 2019 21:37:39 +0000 (00:37 +0300)]
pleroma_ctl: Fix attempting to use RPC for config generation
kaniini [Fri, 18 Oct 2019 16:51:04 +0000 (16:51 +0000)]
Merge branch 'feature/relay-list' into 'develop'
Admin API: Ability to list all followed relays
See merge request pleroma/pleroma!1835
Maxim Filippov [Fri, 18 Oct 2019 16:35:58 +0000 (18:35 +0200)]
Merge branch 'develop' into feature/relay-list
kaniini [Fri, 18 Oct 2019 16:04:57 +0000 (16:04 +0000)]
Merge branch 'feature/ostatus-removal' into 'develop'
ostatus removal
Closes #1145
See merge request pleroma/pleroma!1854
Ariadne Conill [Fri, 18 Oct 2019 15:46:46 +0000 (15:46 +0000)]
tests: mastodon api: fix broken test that used OStatus
Ariadne Conill [Fri, 18 Oct 2019 15:39:15 +0000 (15:39 +0000)]
object: containment: simplify the pattern match for OStatus testsuite hack
Ariadne Conill [Fri, 18 Oct 2019 15:34:36 +0000 (15:34 +0000)]
object: containment: only allow OStatus references in test suite environment
Ariadne Conill [Fri, 18 Oct 2019 04:14:26 +0000 (04:14 +0000)]
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
Ariadne Conill [Fri, 18 Oct 2019 04:08:25 +0000 (04:08 +0000)]
object: fetcher: fix up formatting
Ariadne Conill [Fri, 18 Oct 2019 03:58:28 +0000 (03:58 +0000)]
add some missing tesla fixtures
Ariadne Conill [Fri, 18 Oct 2019 03:57:32 +0000 (03:57 +0000)]
activitypub: tag containment checks for better error tracing
Ariadne Conill [Fri, 18 Oct 2019 03:56:31 +0000 (03:56 +0000)]
object: containment: also allow OStatus object IDs through when comparing origins
Ariadne Conill [Fri, 18 Oct 2019 03:41:38 +0000 (03:41 +0000)]
object: fetcher: improve error reporting
Ariadne Conill [Fri, 18 Oct 2019 03:26:50 +0000 (03:26 +0000)]
object: containment: don't try to contain ostatus objects
Ariadne Conill [Fri, 18 Oct 2019 02:56:02 +0000 (02:56 +0000)]
tests: fix up signature tests
Ariadne Conill [Fri, 18 Oct 2019 02:52:08 +0000 (02:52 +0000)]
tests: fix relay tests
Ariadne Conill [Fri, 18 Oct 2019 02:42:25 +0000 (02:42 +0000)]
object fetcher: fix up error handling
Ariadne Conill [Fri, 18 Oct 2019 00:51:53 +0000 (00:51 +0000)]
tests: simplify object fetching and containment tests
Ariadne Conill [Fri, 18 Oct 2019 00:37:13 +0000 (00:37 +0000)]
tests: remove some more ostatus tests
Ariadne Conill [Fri, 18 Oct 2019 00:30:01 +0000 (00:30 +0000)]
fix up some tests
Ariadne Conill [Thu, 17 Oct 2019 23:37:21 +0000 (23:37 +0000)]
kill almost all of the OStatus module
Ariadne Conill [Thu, 17 Oct 2019 23:15:09 +0000 (23:15 +0000)]
federator: remove OStatus incoming document support
Ariadne Conill [Thu, 17 Oct 2019 23:09:15 +0000 (23:09 +0000)]
remove Salmon module
Ariadne Conill [Thu, 17 Oct 2019 23:07:54 +0000 (23:07 +0000)]
router: disconnect Salmon
Ariadne Conill [Thu, 17 Oct 2019 23:07:20 +0000 (23:07 +0000)]
webfinger: stop pulling Salmon data out of WebFinger
Ariadne Conill [Thu, 17 Oct 2019 23:06:53 +0000 (23:06 +0000)]
feed: don't advertise salmon endpoint
Ariadne Conill [Thu, 17 Oct 2019 23:05:45 +0000 (23:05 +0000)]
publisher: move remote_users() from Salmon module
Ariadne Conill [Thu, 17 Oct 2019 22:57:37 +0000 (22:57 +0000)]
websub: remove entirely
Ariadne Conill [Thu, 17 Oct 2019 22:53:45 +0000 (22:53 +0000)]
federator: remove websub stuff
Ariadne Conill [Thu, 17 Oct 2019 22:52:46 +0000 (22:52 +0000)]
application: don't start Federator.init/1 anymore
Ariadne Conill [Thu, 17 Oct 2019 22:31:20 +0000 (22:31 +0000)]
config: disable Websub and Salmon publisher modules
Ariadne Conill [Thu, 17 Oct 2019 22:29:28 +0000 (22:29 +0000)]
update changelog
rinpatch [Fri, 18 Oct 2019 13:00:33 +0000 (13:00 +0000)]
Merge branch 'fix/changelog-typo' into 'develop'
Fix wrong list level in the changelog
See merge request pleroma/pleroma!1860
rinpatch [Fri, 18 Oct 2019 12:56:14 +0000 (15:56 +0300)]
Fix wrong list level in the changelog
rinpatch [Fri, 18 Oct 2019 12:47:45 +0000 (12:47 +0000)]
Merge branch 'chore/develop-changelog-sync' into 'develop'
Sync the changelog from stable and collapse the API sections
See merge request pleroma/pleroma!1859
rinpatch [Fri, 18 Oct 2019 12:34:29 +0000 (15:34 +0300)]
Sync the changelog from stable and collapse the API sections
rinpatch [Fri, 18 Oct 2019 12:42:09 +0000 (12:42 +0000)]
Merge branch 'backport/develop-safe-jsonb' into 'develop'
Backport safe_jsonb_set fixes to develop
See merge request pleroma/pleroma!1858
rinpatch [Fri, 18 Oct 2019 11:33:51 +0000 (14:33 +0300)]
Add a test for safe_jsonb_set
rinpatch [Fri, 18 Oct 2019 11:11:30 +0000 (14:11 +0300)]
Fix a migration wiping user info of users that don't have any mutes
And introduce safe_jsonb_set
rinpatch [Fri, 18 Oct 2019 11:34:48 +0000 (11:34 +0000)]
Merge branch 'cleanup/deprecated_config_upload' into 'develop'
upload.ex: Remove deprecated configuration
See merge request pleroma/pleroma!1855
Haelwenn (lanodan) Monnier [Fri, 18 Oct 2019 10:29:42 +0000 (12:29 +0200)]
upload.ex: Remove deprecated configuration
Maxim Filippov [Fri, 18 Oct 2019 08:24:29 +0000 (10:24 +0200)]
Merge branch 'develop' into feature/relay-list
kaniini [Fri, 18 Oct 2019 04:42:02 +0000 (04:42 +0000)]
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
kaniini [Fri, 18 Oct 2019 04:36:37 +0000 (04:36 +0000)]
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
feld [Thu, 17 Oct 2019 20:05:01 +0000 (20:05 +0000)]
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
Mastodon API / Conversations: Mark the conversation as read for the author when they send a new direct message
See merge request pleroma/pleroma!1853
eugenijm [Thu, 17 Oct 2019 12:25:15 +0000 (15:25 +0300)]
Mastodon API: Mark the conversation as read for the author when they send a new direct message
lain [Wed, 16 Oct 2019 12:29:08 +0000 (12:29 +0000)]
Merge branch 'user-search-experiments' into 'develop'
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
feld [Wed, 16 Oct 2019 12:14:47 +0000 (12:14 +0000)]
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
rinpatch [Wed, 16 Oct 2019 12:09:39 +0000 (15:09 +0300)]
Remove a failing search test due to it being unrealistic
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)
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
rinpatch [Wed, 16 Oct 2019 10:49:33 +0000 (13:49 +0300)]
Order fts results by trigram
rinpatch [Wed, 16 Oct 2019 09:52:47 +0000 (12:52 +0300)]
User search: Remove trigram and refactor the module
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
Maxim Filippov [Tue, 15 Oct 2019 15:33:29 +0000 (17:33 +0200)]
DELETE /api/pleroma/admin/users now accepts nicknames array
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
kPherox [Tue, 15 Oct 2019 10:10:22 +0000 (19:10 +0900)]
Add `Sec-WebSocket-Protocol` to response header
Ekaterina Vaartis [Mon, 30 Sep 2019 13:04:30 +0000 (16:04 +0300)]
For pleroma.emoji downloaded packs, generate pack.json instead
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.
Maxim Filippov [Fri, 11 Oct 2019 16:31:00 +0000 (19:31 +0300)]
This line either causes a warning, or a failed test
Maxim Filippov [Fri, 11 Oct 2019 16:12:29 +0000 (19:12 +0300)]
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
Maxim Filippov [Fri, 11 Oct 2019 12:59:35 +0000 (15:59 +0300)]
Merge branch 'develop' into feature/multiple-users-activation-permissions
Maxim Filippov [Fri, 11 Oct 2019 12:58:45 +0000 (15:58 +0300)]
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
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.
Maxim Filippov [Thu, 10 Oct 2019 21:24:31 +0000 (00:24 +0300)]
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
yalh76 [Thu, 10 Oct 2019 20:05:54 +0000 (20:05 +0000)]
Fix https://git.pleroma.social/pleroma/pleroma/issues/1289
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
Maxim Filippov [Wed, 9 Oct 2019 14:03:54 +0000 (17:03 +0300)]
Ability to toggle activation status and permission group for a group of users
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`)
projects / akkoma / log