aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
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 'temp-hackney-fix' into 'develop'rinpatch
temp hackney fix See merge request pleroma/pleroma!2951
2020-09-08Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch
Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924
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 'bugfix/favicon-too-long' into 'develop'rinpatch
instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949
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 'secfix/search-crash' into 'develop'rinpatch
Fix crash done via search See merge request pleroma/secteam/pleroma!12
2020-09-08Merge branch 'fix-searching-following' into 'develop'rinpatch
search: fix 'following' query parameter See merge request pleroma/pleroma!2943
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-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
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-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
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-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-2.1-rc0
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 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0lain
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-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators-audio2
2020-08-19fixes for mix tasksAlexander Strizhakov
- fix for `mix pleroma.database update_users_following_followers_counts` - raise error, if fetch was unsuccessful in emoji tasks - fix for `pleroma.digest test` task
2020-08-19relay fix for admin-feAlexander Strizhakov
2020-08-19Pipeline Ingestion: Audio (Part 2)Haelwenn (lanodan) Monnier
2020-08-18Merge branch '2064-image-blanking' into 'develop'Haelwenn
Resolve "Make default image description blank" Closes #2064 See merge request pleroma/pleroma!2899
2020-08-18Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators-audio
2020-08-18Merge branch 'purge-user' into 'develop'lain
Purge a local user upon deletion, fixes #2062 Closes #2062 See merge request pleroma/pleroma!2898
2020-08-18Pleroma.Upload: Set default upload name / description based on config.lain
2020-08-18Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators_use_ectotypes
2020-08-17Purge most user fields upon deletion, "right to be forgotten" #859Alex Gleason
2020-08-17Also purge bio and display nameAlex Gleason
2020-08-17Purge a local user upon deletion, fixes #2062Alex Gleason
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-18fetcher: fallback to [] when to/cc is nilHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2063