feld [Thu, 11 Jun 2020 16:18:06 +0000 (16:18 +0000)]
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
HTTP security plug: add media proxy base url host to csp
See merge request pleroma/pleroma!2638
rinpatch [Fri, 29 May 2020 21:23:49 +0000 (21:23 +0000)]
Merge branch 'bugfix/csp-unproxied' into 'develop'
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
Haelwenn (lanodan) Monnier [Fri, 1 May 2020 19:15:43 +0000 (21:15 +0200)]
static-fe.css: Restore and move to /priv/static/static-fe
href [Wed, 10 Jun 2020 15:34:23 +0000 (17:34 +0200)]
Remove use of atoms in MRF.UserAllowListPolicy
Egor Kislitsyn [Tue, 9 Jun 2020 17:49:24 +0000 (21:49 +0400)]
Fix atom leak in Rich Media Parser
rinpatch [Tue, 9 Jun 2020 18:06:27 +0000 (18:06 +0000)]
Merge branch 'release/2.0.6' into 'stable'
Release/2.0.6
See merge request pleroma/pleroma!2632
rinpatch [Sun, 7 Jun 2020 22:33:43 +0000 (01:33 +0300)]
CHANGELOG.md: add 2.0.6 entry
rinpatch [Sun, 7 Jun 2020 22:33:07 +0000 (01:33 +0300)]
mix.exs: bump version to 2.0.6
rinpatch [Tue, 19 May 2020 14:32:27 +0000 (14:32 +0000)]
Merge branch 'recipients-query-speedup' into 'develop'
Greatly speed up recipients query
See merge request pleroma/pleroma!2558
lain [Tue, 26 May 2020 14:46:57 +0000 (16:46 +0200)]
Migrations: Add index on client_id and client_secret for apps.
Greatly speeds up app lookup.
lain [Tue, 26 May 2020 15:46:16 +0000 (17:46 +0200)]
Activity.Queries: Use correct actor restriction.
lain [Wed, 27 May 2020 07:46:12 +0000 (09:46 +0200)]
ActivityPub: Change ordering to `nulls last` in favorites query
This makes it use our existing index and speeds up the query.
rinpatch [Wed, 27 May 2020 13:45:14 +0000 (13:45 +0000)]
Merge branch 'notification-fixes' into 'develop'
Notification performance fixes
See merge request pleroma/pleroma!2595
rinpatch [Sun, 7 Jun 2020 20:51:03 +0000 (23:51 +0300)]
[stable rewrite]: fix streamer streaming out announces from a muted thread
Use parent object instead of activity because context is null of Announce activity from Mastodon.
Haelwenn [Fri, 5 Jun 2020 14:52:09 +0000 (14:52 +0000)]
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
Roman Chvanikov [Tue, 19 May 2020 11:46:06 +0000 (14:46 +0300)]
Update crypt library
Alexander Strizhakov [Wed, 6 May 2020 15:04:16 +0000 (18:04 +0300)]
fix for syslog compile with updated rebar3
rinpatch [Sat, 6 Jun 2020 15:11:43 +0000 (18:11 +0300)]
[stable rewrite] update hackney to 1.16.0 and add support for tlsv1.3
rinpatch [Fri, 29 May 2020 09:46:31 +0000 (09:46 +0000)]
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
lain [Wed, 13 May 2020 08:12:09 +0000 (08:12 +0000)]
Merge branch 'release/2.0.5' into 'stable'
Release/2.0.5
See merge request pleroma/secteam/pleroma!4
rinpatch [Tue, 12 May 2020 21:08:36 +0000 (00:08 +0300)]
mix.exs: bump to 2.0.5
rinpatch [Tue, 12 May 2020 21:08:07 +0000 (00:08 +0300)]
CHANGELOG.md: add 2.0.5 entry
lain [Mon, 11 May 2020 10:50:25 +0000 (12:50 +0200)]
User: Truncate bios when updating a remote user.
rinpatch [Tue, 12 May 2020 20:09:44 +0000 (23:09 +0300)]
lain [Tue, 12 May 2020 08:52:46 +0000 (10:52 +0200)]
ActivityPub: Fix non-federating blocks.
lain [Tue, 12 May 2020 10:29:37 +0000 (12:29 +0200)]
Transmogrifier: On incoming follow accept, update follow counts.
rinpatch [Tue, 12 May 2020 20:03:21 +0000 (23:03 +0300)]
fix eldap being required for non-OTP releases
href [Tue, 12 May 2020 19:27:54 +0000 (21:27 +0200)]
Reorder alias
href [Tue, 12 May 2020 19:06:23 +0000 (21:06 +0200)]
Expand and authorize streams in Streamer directly (backport from !2519)
rinpatch [Sun, 10 May 2020 17:13:03 +0000 (17:13 +0000)]
Merge branch 'release/2.0.4' into 'stable'
Release/2.0.4
See merge request pleroma/pleroma!2503
rinpatch [Sun, 10 May 2020 16:54:37 +0000 (19:54 +0300)]
CHANGELOG.md: mention AP C2S change
rinpatch [Sat, 9 May 2020 23:37:36 +0000 (02:37 +0300)]
mix.exs: bump version to 2.0.4
rinpatch [Sat, 9 May 2020 23:36:32 +0000 (02:36 +0300)]
CHANGELOG.md: Add 2.0.4 entry
rinpatch [Fri, 8 May 2020 20:51:59 +0000 (23:51 +0300)]
healthcheck: report real amount of memory allocated by beam
as opposed to memory currently in use
lain [Sun, 3 May 2020 11:48:01 +0000 (13:48 +0200)]
Webfinger: Request account info with the acct scheme
Angelina Filippova [Mon, 4 May 2020 19:41:14 +0000 (22:41 +0300)]
Fix inconsistency in language for activating settings
lain [Tue, 5 May 2020 08:12:37 +0000 (10:12 +0200)]
AP C2S: Restrict creation to `Note`s for now.
Haelwenn (lanodan) Monnier [Thu, 30 Apr 2020 16:55:25 +0000 (18:55 +0200)]
Increase tests on AP C2S
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
Alexander Strizhakov [Wed, 6 May 2020 13:20:47 +0000 (16:20 +0300)]
apache chain issue fix
rinpatch [Sat, 9 May 2020 11:49:46 +0000 (14:49 +0300)]
include eldap in OTP releases
Closes #1313
rinpatch [Sat, 9 May 2020 15:51:20 +0000 (18:51 +0300)]
insert skeletons migration: fix for non-local locals
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
rinpatch [Sat, 2 May 2020 16:22:21 +0000 (16:22 +0000)]
Merge branch 'release/2.0.3' into 'stable'
Release/2.0.3
See merge request pleroma/secteam/pleroma!3
rinpatch [Fri, 1 May 2020 19:11:33 +0000 (22:11 +0300)]
mix.exs: bump to 2.0.3
rinpatch [Fri, 1 May 2020 19:10:02 +0000 (22:10 +0300)]
CHANGELOG.md: Add 2.0.3 changelog
eugenijm [Thu, 30 Apr 2020 12:02:35 +0000 (15:02 +0300)]
Dismiss the follow request notification on rejection
rinpatch [Sat, 2 May 2020 12:24:49 +0000 (12:24 +0000)]
Merge branch 'follow-request-notifications' into 'develop'
Follow request notifications enforcement
See merge request pleroma/pleroma!2451
rinpatch [Sun, 19 Apr 2020 21:45:20 +0000 (21:45 +0000)]
Merge branch '1559-follow-request-notifications' into 'develop'
[#1559] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
rinpatch [Sat, 2 May 2020 15:06:29 +0000 (18:06 +0300)]
rinpatch [Fri, 1 May 2020 19:29:22 +0000 (22:29 +0300)]
signature.ex: Remove the use of ObjectID type
It is not in stable yet
rinpatch [Fri, 1 May 2020 16:48:31 +0000 (16:48 +0000)]
Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'
Bugfix/1727 fix signature decoding
Closes #1727
See merge request pleroma/pleroma!2454
Mark Felder [Wed, 29 Apr 2020 20:49:48 +0000 (15:49 -0500)]
Update AdminFE build in preparation for the 2.0.3 release
rinpatch [Sat, 11 Apr 2020 19:46:04 +0000 (19:46 +0000)]
Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
Haelwenn [Fri, 17 Apr 2020 08:55:46 +0000 (08:55 +0000)]
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
lain [Wed, 15 Apr 2020 10:05:22 +0000 (12:05 +0200)]
Uploads: Sandbox them in the CSP.
Mark Felder [Tue, 14 Apr 2020 16:43:53 +0000 (11:43 -0500)]
Fix Oban not receiving :ok from RichMediaHelper job
Ivan Tashkinov [Fri, 17 Apr 2020 18:21:10 +0000 (21:21 +0300)]
[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
rinpatch [Thu, 16 Apr 2020 21:58:57 +0000 (21:58 +0000)]
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
lain [Mon, 20 Apr 2020 12:59:16 +0000 (12:59 +0000)]
Merge branch 'fix-object_age_policy' into 'develop'
Fix ObjectAgePolicy
See merge request pleroma/pleroma!2404
Haelwenn (lanodan) Monnier [Sun, 19 Apr 2020 18:23:48 +0000 (20:23 +0200)]
mix.exs: Do not bail out when .git doesn’t exists
Haelwenn [Wed, 22 Apr 2020 17:37:09 +0000 (17:37 +0000)]
Merge branch 'bugfix/1670-user-count' into 'develop'
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
Haelwenn [Wed, 22 Apr 2020 15:46:04 +0000 (15:46 +0000)]
Merge branch 'fix/follow-and-blocks-import' into 'develop'
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
lain [Thu, 23 Apr 2020 11:33:30 +0000 (13:33 +0200)]
CommonAPI: Don't make repeating announces possible
Alex Gleason [Sun, 26 Apr 2020 05:28:57 +0000 (00:28 -0500)]
Let blob: pass CSP
eugenijm [Mon, 27 Apr 2020 14:41:38 +0000 (17:41 +0300)]
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
rinpatch [Wed, 29 Apr 2020 11:26:31 +0000 (14:26 +0300)]
Deactivate local users on deletion instead of deleting the record
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
rinpatch [Wed, 8 Apr 2020 15:51:56 +0000 (15:51 +0000)]
Merge branch 'release/2.0.2' into 'stable'
2.0.2 Release
See merge request pleroma/pleroma!2336
rinpatch [Wed, 8 Apr 2020 13:24:45 +0000 (16:24 +0300)]
rinpatch [Tue, 7 Apr 2020 21:39:55 +0000 (00:39 +0300)]
CHANGELOG.md: update 2.0.2 release date
rinpatch [Tue, 7 Apr 2020 21:38:48 +0000 (00:38 +0300)]
CHANGELOG.md: add 2.0.2 update notes
Mark Felder [Tue, 31 Mar 2020 18:05:16 +0000 (13:05 -0500)]
Update AdminFE build in preparation for Pleroma 2.0.2
rinpatch [Tue, 7 Apr 2020 11:41:10 +0000 (11:41 +0000)]
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
rinpatch [Thu, 2 Apr 2020 20:37:14 +0000 (23:37 +0300)]
CHANGELOG.md: add entries for funkwhale-related changes
rinpatch [Sun, 15 Mar 2020 20:04:31 +0000 (20:04 +0000)]
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
Haelwenn [Sun, 29 Mar 2020 19:18:22 +0000 (19:18 +0000)]
Merge branch 'feature/funkwhale-audio' into 'develop'
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
Haelwenn [Tue, 31 Mar 2020 22:04:02 +0000 (22:04 +0000)]
Merge branch 'bugfix/funkwhale-channel' into 'develop'
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
lain [Thu, 19 Mar 2020 18:10:39 +0000 (18:10 +0000)]
Merge branch 'fix-testing' into 'develop'
Fix CI by temporarily removing federated testing
See merge request pleroma/pleroma!2314
rinpatch [Tue, 31 Mar 2020 11:02:51 +0000 (14:02 +0300)]
mix.exs bump version to 2.0.2
rinpatch [Tue, 31 Mar 2020 10:59:26 +0000 (13:59 +0300)]
CHANGELOG.md: Add 2.0.2 entry
Haelwenn [Mon, 16 Mar 2020 17:42:10 +0000 (17:42 +0000)]
Merge branch 'docs/mrf_object_age' into 'develop'
Improve documentation of mrf_object_age
See merge request pleroma/pleroma!2305
rinpatch [Sun, 22 Mar 2020 14:32:40 +0000 (14:32 +0000)]
Merge branch 'fix/ecto_ssl_option' into 'develop'
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
rinpatch [Mon, 23 Mar 2020 19:32:01 +0000 (19:32 +0000)]
Merge branch 'bugfix/profile-bio-newline' into 'develop'
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
lain [Tue, 24 Mar 2020 17:34:13 +0000 (17:34 +0000)]
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
feld [Tue, 24 Mar 2020 19:10:32 +0000 (19:10 +0000)]
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
rinpatch [Wed, 25 Mar 2020 18:00:24 +0000 (18:00 +0000)]
Merge branch '1364-notifications-sending-control' into 'develop'
[#1364] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
rinpatch [Sun, 15 Mar 2020 21:54:24 +0000 (21:54 +0000)]
Merge branch 'release/2.0.1' into 'stable'
2.0.1 release
See merge request pleroma/pleroma!2298
rinpatch [Sun, 15 Mar 2020 21:50:03 +0000 (00:50 +0300)]
CHANGELOG.md: Add upgrade notes for 2.0.1
rinpatch [Sun, 15 Mar 2020 21:18:16 +0000 (00:18 +0300)]
CHANGELOG.md: Add remaining entries for 2.0.1
rinpatch [Sun, 15 Mar 2020 21:17:28 +0000 (00:17 +0300)]
static-fe tests: fix to work on stable
rinpatch [Fri, 13 Mar 2020 18:15:42 +0000 (21:15 +0300)]
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
rinpatch [Sat, 14 Mar 2020 12:39:58 +0000 (15:39 +0300)]
rip out fetch_initial_posts
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
rinpatch [Sun, 15 Mar 2020 19:53:52 +0000 (19:53 +0000)]
Merge branch 'features/staticfe-sanitization' into 'develop'
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
rinpatch [Sun, 15 Mar 2020 14:26:58 +0000 (17:26 +0300)]
changelog.md: add 2.0.1 entry
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 03:23:29 +0000 (04:23 +0100)]
pleroma_api_controller.ex: Improve conversations error reporting
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
Mark Felder [Thu, 12 Mar 2020 20:12:29 +0000 (15:12 -0500)]
Update AdminFE
rinpatch [Sat, 14 Mar 2020 11:19:42 +0000 (11:19 +0000)]
Merge branch 'fix/cache-control-headers' into 'develop'
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
Haelwenn (lanodan) Monnier [Sat, 29 Feb 2020 00:23:36 +0000 (01:23 +0100)]
auth_controller.ex: Add admin scope to MastoFE
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 03:01:37 +0000 (04:01 +0100)]
pleroma_api.md: direct_conversation_id vs. conversation_id
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
Egor Kislitsyn [Fri, 13 Mar 2020 15:30:42 +0000 (19:30 +0400)]
Fix hashtags WebSocket streaming
Phil Hagelberg [Sun, 1 Mar 2020 02:53:49 +0000 (18:53 -0800)]
Fix static FE plug to handle missing Accept header.
Haelwenn (lanodan) Monnier [Thu, 13 Feb 2020 02:39:47 +0000 (03:39 +0100)]
Formatting: Do not use \n and prefer <br> instead
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
projects / akkoma / log