aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-10-29CookieAuthPlug code quality improvementsalexgleason-oauth-formAlex Gleason
2020-10-29Clear user's session cookie when an OAuth token is revokedAlex Gleason
2020-10-29OAuth: refactor, add CookieAuthPlugAlex Gleason
2020-10-29Removed H1 element with instance name from app layout (per #2780).Ivan Tashkinov
2020-10-29Merge remote-tracking branch 'remotes/origin/develop' into oauth-formIvan Tashkinov
# Conflicts: # CHANGELOG.md # lib/pleroma/web/templates/layout/app.html.eex
2020-10-28Fixed User.is_discoverable attribute rendering in Admin API User view.Ivan Tashkinov
2020-10-28@doc fix.Ivan Tashkinov
2020-10-28Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
ostatus-controller-no-auth-check-on-non-federating-instances # Conflicts: # CHANGELOG.md
2020-10-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261Mark Felder
2020-10-27Merge branch 'feature/autofollowing' into 'develop'feld
autofollowing_nicknames See merge request pleroma/pleroma!3087
2020-10-27Merge branch '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-27FrontStatic plug: excluded invalid urlMaksim Pechnikov
2020-10-27Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-10-27Merge branch 'develop' into 'feature/autofollowing'feld
# Conflicts: # CHANGELOG.md
2020-10-26ActivityPub: Add back debug call + explanation.lain
2020-10-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-namelain
2020-10-26Merge branch 'docs/ap_c2s' into 'develop'Haelwenn
AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056
2020-10-23Merge branch '2242-nsfw-case' into 'develop'rinpatch
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094
2020-10-23User: Correctly handle whitespace names.lain
2020-10-22Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-10-22[#3059] Formatting fix.Ivan Tashkinov
2020-10-22[#3059] Fixed Phoenix 1.5 telemetry processing.Ivan Tashkinov
2020-10-22SideEffects: Correctly handle chat messages sent to yourselflain
2020-10-19Transmogrifier: Refactor and unify incoming tag handlinglain
2020-10-19Transmogrifier: Downcase incoming Hashtagslain
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19Merge branch '2239-mute-fixes' into 'develop'Haelwenn
ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084
2020-10-18[#1668] Restricted access to app metrics endpoint by default. Added ability ↵Ivan Tashkinov
to configure IP whitelist for this endpoint. Added tests and documentation.
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11Ivan Tashkinov
2020-10-17[#3053] Post-merge fix.Ivan Tashkinov
2020-10-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
ostatus-controller-no-auth-check-on-non-federating-instances # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-16Adds feature to permit e.g., local admins and community moderators to ↵Mark Felder
automatically follow all newly registered accounts
2020-10-15Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-15Apply 1 suggestion(s) to 1 file(s)Haelwenn
2020-10-15Fix warningsEgor Kislitsyn
2020-10-15ActivityPub: Show own replies to muted users.lain
Aligns mute with block behavior.
2020-10-14Apply 3 suggestion(s) to 3 file(s)feld
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534
2020-10-14Undo API breaking changesMark Felder
2020-10-14Finish undoing API breakageMark Felder
2020-10-14Undo API breaking changesMark Felder
2020-10-13Merge remote-tracking branch 'upstream/develop' into oauth-formAlex Gleason
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13Merge branch 'develop' into chore/elixir-1.11Mark Felder
2020-10-13Merge branch 'develop' into refactor/locked_user_fieldMark Felder
2020-10-13Merge branch 'develop' into refactor/discoverable_user_fieldMark Felder
2020-10-13Change user.discoverable field to user.is_discoverableMark Felder
2020-10-13Change user.locked field to user.is_lockedMark Felder
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13migration and warning for RemoteIp plug renameAlexander Strizhakov