aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-09-17Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'rinpatch
[#2130] Fixed OAuth OOB authentication for users with enabled MFA Closes #2130 See merge request pleroma/pleroma!2979
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982
2020-09-17Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn
Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992
2020-09-17Merge branch 'reply-visibility-user-guard' into 'develop'lain
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user See merge request pleroma/pleroma!2999
2020-09-17Merge branch 'bugfix/mrf-ingestion' into 'develop'rinpatch
Bugfix: MRF and Pipeline Ingestion See merge request pleroma/secteam/pleroma!15
2020-09-17Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch
RichMedia: fix a compilation error due to nonexistent variable See merge request pleroma/pleroma!2996
2020-09-17Merge branch 'feat/rich-media-head' into 'develop'rinpatch
RichMedia: Do a HEAD request to check content type/length See merge request pleroma/pleroma!2995
2020-09-08Merge branch 'fix/admin-controller-atom-leak' into 'develop'rinpatch
Fix atom leak in AdminAPIController See merge request pleroma/secteam/pleroma!6
2020-09-08Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-08Merge branch 'http-fixes' into 'develop'rinpatch
Improvements and fixes for http requests See merge request pleroma/pleroma!2904
2020-09-08Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
Rich media improvements See merge request pleroma/pleroma!2944
2020-09-08Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch
RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941
2020-09-08Merge branch 'fix/2087-metadata' into 'develop'rinpatch
Fix/2087 metadata See merge request pleroma/secteam/pleroma!11
2020-09-08Merge branch 'fix/apc2s-limits' into 'develop'rinpatch
AP C2S: Restrict character limit on Note Closes #2 See merge request pleroma/secteam/pleroma!9
2020-08-27Merge branch '2078-list-fixes' into 'develop'Haelwenn
Resolve "List timeline returns incorrectly assigned Account for replies and repeats" Closes #2070 and #2078 See merge request pleroma/pleroma!2923
2020-08-27ChatController: Don't die if the recipient is gone.lain
2020-08-26TimelineController: Keys are atoms now.lain
Closes #2078 Closes #2070
2020-08-25Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld
Automatically mark notifications about statuses from muted users and threads as read Closes #1952 See merge request pleroma/pleroma!2893
2020-08-25Webfinger: Handle bogus ids better.lain
2020-08-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-24Merge branch 'relay-fix-admin-fe' into 'develop'feld
Relay fix for admin-fe See merge request pleroma/pleroma!2902
2020-08-21Merge branch 'features/validators-event' into 'develop'lain
Pipeline Ingestion: Event See merge request pleroma/pleroma!2909
2020-08-21adding actor type in user showAlexander Strizhakov
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-19relay fix for admin-feAlexander Strizhakov
2020-08-19Pipeline Ingestion: Audio (Part 2)Haelwenn (lanodan) Monnier
2020-08-18Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators-audio
2020-08-18Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators_use_ectotypes
2020-08-18common_fixes: Remove Utils.make_date callHaelwenn (lanodan) Monnier
2020-08-18common_fixes: Get fixes common from Audio and QuestionHaelwenn (lanodan) Monnier
2020-08-18Pipeline Ingestion: AudioHaelwenn (lanodan) Monnier
2020-08-17object_validators: Use ecto_types where availableHaelwenn (lanodan) Monnier
2020-08-17Merge branch 'issue/1936' into 'develop'lain
[#1936] Ability to search for banned MediaProxy URLs  See merge request pleroma/pleroma!2873
2020-08-17Make notifications about new statuses from muted threads readSergey Suprunenko
2020-08-16fix search media proxy urlsMaksim Pechnikov
2020-08-14[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance ↵Ivan Tashkinov
privacy setting (i.e. restrict on private instances only by default).
2020-08-13Merge branch 'fix/activity-expirations-again' into 'develop'feld
Fix activity expirations again See merge request pleroma/pleroma!2866
2020-08-13side_effects: Fix typo on notificationHaelwenn (lanodan) Monnier
2020-08-13Merge branch 'develop' into issue/1936Maksim Pechnikov
2020-08-12ActivityPub: Remove `reject`, move everything to the Pipeline.lain
2020-08-12Transmogrifier: Move Rejects to the Pipelinelain
2020-08-12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rejectlain
2020-08-11Linting fixes.lain
2020-08-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
fix/activity-expirations-again
2020-08-11ActivityPub: Remove ActivityPub.acceptlain
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11Transmogrifier: Handle accepts with the pipelinelain
2020-08-11Linter fixes.lain
2020-08-11Transmogrifier: Remove handling of orphaned acceptslain
This was a Mastodon 2.3 issue and has been fixed for a long time. According to fediverse.networks, less than one percent of servers still run a version this old or older.
2020-08-11AcceptValidation: Codify accept rules.lain