aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-10Merge 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-10Merge 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-10Streaming integration tests: remove unexpected error assumptionrinpatch
For some reason instead of fixing unexpected errors, we made tests assert they indeed trigger... Now that the errors are fixed these were failing
2020-09-10[#2497] Removed support for thumbnail_max_* params for media preview proxyIvan Tashkinov
(per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771)
2020-09-10Websocket handler: fix never matching code on failed authrinpatch
`:cowboy_req.reply` does not return tuples since 2.0, see https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
2020-09-10Websocket handler: do not raise if handler is terminated before switching ↵rinpatch
protocols Closes #2131
2020-09-10websocket handler: Do not log client ping frames as errorsrinpatch
2020-09-10Merge branch 'fix/tesla-client-opts' into 'develop'rinpatch
Pass options without adapter key in tesla reverse proxy client See merge request pleroma/pleroma!2985
2020-09-10pass options without adapter keyAlexander Strizhakov
2020-09-10oban warningAlexander Strizhakov
2020-09-10formattingAlexander Strizhakov
2020-09-10migration to move tokens expiration into ObanAlexander Strizhakov
2020-09-10migration and changelogAlexander Strizhakov
2020-09-10expire mfa tokens through ObanAlexander Strizhakov
2020-09-10schedule expired oauth tokens deletion with ObanAlexander Strizhakov
2020-09-10Merge branch 'fix/2132-emoji-packs' into 'develop'lain
use Pleroma.HTTP in emoji packs tasks Closes #2132 See merge request pleroma/pleroma!2980
2020-09-10[#2497] Removed Hackney-specific codeIvan Tashkinov
(no longer needed due to adapter options unification).
2020-09-10use Pleroma.HTTP in emoji packs tasksAlexander Strizhakov
2020-09-09[#2130] Fixed OAuth OOB authentication for users with enabled MFA.Ivan Tashkinov
2020-09-09[#2497] Formatting fix.Ivan Tashkinov
2020-09-09[#2497] Added missing alias, removed legacy `:adapter` option specification ↵Ivan Tashkinov
for HTTP.get/_.
2020-09-09Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-09Merge branch 'chore/concurrent_limiter_update' into 'develop'rinpatch
bump concurrent_limiter See merge request pleroma/pleroma!2978
2020-09-09bump concurrent_limiterrinpatch
Should fix gun deadlocks
2020-09-09Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!2977
2020-09-09Translated using Weblate (Spanish)tarteka
Currently translated at 9.4% (10 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
2020-09-09Added translation using Weblate (Spanish)tarteka
2020-09-08Merge branch 'stable-sync/2.1.1' into 'develop'rinpatch
Sync stable with develop after 2.1.1 Closes #2, #2047, #2095, #2116, #1987, and #2080 See merge request pleroma/pleroma!2974
2020-09-08Merge branch 'stable' into stable-sync/2.1.1rinpatch
2020-09-08Metadata: Move restriction check from Feed provider to activated_providersrinpatch
2020-09-08Use :restrict_unauthenticated testing for more granular controlMark Felder
2020-09-08Document breaking change for metadata providersMark Felder
2020-09-08RelMe and Feed no longer configurableMark Felder
2020-09-08Do not serve RSS/Atom feeds when instance is privateMark Felder
2020-09-08Fix test so setting doesn't leakMark Felder
2020-09-08Feed provider only generates a redirect, so always activate it.Mark Felder
Making this configurable is misleading.
2020-09-08Disable providers of user and status metadata when instance is privateMark Felder
2020-09-08Do not make RelMe metadata provider optional.Mark Felder
There's really no sound reason to turn this off anyway.
2020-09-08user: harden get_friends_query(), get_followers_query() and their wrappersHaelwenn (lanodan) Monnier
2020-09-08search: Apply following filter only when user is usableHaelwenn (lanodan) Monnier
2020-09-08AP C2S: Restrict character limit on NoteHaelwenn (lanodan) Monnier
2020-09-08Fix atom leak in AdminAPIControllerEgor Kislitsyn
2020-09-08Merge branch 'release/2.1.1' into 'stable'v2.1.1rinpatch
2.1.1 release See merge request pleroma/secteam/pleroma!13
2020-09-08SECURITY.md: we don't support 2.0 anymore, bump to 2.1rinpatch
2020-09-08Merge branch 'bugfix/mock' into 'develop'Haelwenn
mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973
2020-09-08pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679rinpatch
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-08CHANGELOG.md: Add 2.1.1 entryrinpatch
2020-09-08Remove OStatus in testsuiteHaelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 05:19:58 +0000