aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-02Merge branch '1559-follow-request-notifications' into 'develop'rinpatch
[#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354
2020-05-02pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3rinpatch
2020-05-01signature.ex: Remove the use of ObjectID typerinpatch
It is not in stable yet
2020-05-01Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'rinpatch
Bugfix/1727 fix signature decoding Closes #1727 See merge request pleroma/pleroma!2454
2020-05-01Update AdminFE build in preparation for the 2.0.3 releaseMark Felder
2020-05-01Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-05-01Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'Haelwenn
Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373
2020-05-01Uploads: Sandbox them in the CSP.lain
2020-05-01Fix Oban not receiving :ok from RichMediaHelper jobMark Felder
2020-05-01[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks ↵Ivan Tashkinov
when password is provided. Refactored plugs skipping functionality.
2020-05-01Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349
2020-05-01Merge branch 'fix-object_age_policy' into 'develop'lain
Fix ObjectAgePolicy See merge request pleroma/pleroma!2404
2020-05-01mix.exs: Do not bail out when .git doesn’t existsHaelwenn (lanodan) Monnier
2020-05-01Merge branch 'bugfix/1670-user-count' into 'develop'Haelwenn
Stats: Ignore internal users for user count. Closes #1670 See merge request pleroma/pleroma!2414
2020-05-01Merge branch 'fix/follow-and-blocks-import' into 'develop'Haelwenn
Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416
2020-05-01CommonAPI: Don't make repeating announces possiblelain
2020-05-01Let blob: pass CSPAlex Gleason
2020-05-01Mastodon API: do not create a following relationship if the corresponding ↵eugenijm
follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
2020-05-01Deactivate local users on deletion instead of deleting the recordrinpatch
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
2020-04-08Merge branch 'release/2.0.2' into 'stable'v2.0.2rinpatch
2.0.2 Release See merge request pleroma/pleroma!2336
2020-04-08pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360frinpatch
2020-04-08CHANGELOG.md: update 2.0.2 release daterinpatch
2020-04-08CHANGELOG.md: add 2.0.2 update notesrinpatch
2020-04-08Update AdminFE build in preparation for Pleroma 2.0.2Mark Felder
2020-04-08Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352
2020-04-08CHANGELOG.md: add entries for funkwhale-related changesrinpatch
2020-04-02Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300
2020-04-02Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287
2020-04-02Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
Fix profile url for funkwhale channels, removes one source_data use Closes #1653 See merge request pleroma/pleroma!2333
2020-03-31Merge branch 'fix-testing' into 'develop'lain
Fix CI by temporarily removing federated testing See merge request pleroma/pleroma!2314
2020-03-31mix.exs bump version to 2.0.2rinpatch
2020-03-31CHANGELOG.md: Add 2.0.2 entryrinpatch
2020-03-31Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
Improve documentation of mrf_object_age See merge request pleroma/pleroma!2305
2020-03-31Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch
Fix ssl option on Ecto config breaking release See merge request pleroma/pleroma!2307
2020-03-31Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
AccountView: fix for other forms of <br> in bio Closes #1643 See merge request pleroma/pleroma!2322
2020-03-31Merge branch 'admin-api-change-password' into 'develop'lain
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149
2020-03-31Merge branch 'fix/activity-deletion' into 'develop'feld
Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328
2020-03-31Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
[#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301
2020-03-15Merge branch 'release/2.0.1' into 'stable'v2.0.1rinpatch
2.0.1 release See merge request pleroma/pleroma!2298
2020-03-16CHANGELOG.md: Add upgrade notes for 2.0.1rinpatch
2020-03-16CHANGELOG.md: Add remaining entries for 2.0.1rinpatch
2020-03-16static-fe tests: fix to work on stablerinpatch
2020-03-16rate limiter: disable based on if remote ip was found, not on if the plug ↵rinpatch
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
2020-03-16rip out fetch_initial_postsrinpatch
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
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
static_fe: Sanitize HTML Closes #1614 See merge request pleroma/pleroma!2299
2020-03-15changelog.md: add 2.0.1 entryrinpatch
2020-03-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15Update AdminFEMark Felder
2020-03-15Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
Fix Cache Control headers on media See merge request pleroma/pleroma!2295
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265