Commit Graph

  • 53cf7fef6e Merge branch 'fix/streaming-termination-errors' into 'develop' rinpatch 2020-09-10 18:40:54 +0000
  • 45c299e5b5 Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' rinpatch 2020-09-10 18:38:48 +0000
  • 275602daa7 Streaming integration tests: remove unexpected error assumption rinpatch 2020-09-10 21:28:47 +0300
  • dc4e06e199 [#2497] Removed support for thumbnail_max_* params for media preview proxy (per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771) Ivan Tashkinov 2020-09-10 21:28:07 +0300
  • 01fa68fe45 Websocket handler: fix never matching code on failed auth rinpatch 2020-09-10 21:26:52 +0300
  • e16e8f9816 Websocket handler: do not raise if handler is terminated before switching protocols rinpatch 2020-09-10 13:48:24 +0300
  • cb06e98da2 websocket handler: Do not log client ping frames as errors rinpatch 2020-09-10 13:47:53 +0300
  • 9b6ab32166 Merge branch 'fix/tesla-client-opts' into 'develop' rinpatch 2020-09-10 17:41:37 +0000
  • e8bfb50fa3
    pass options without adapter key Alexander Strizhakov 2020-09-10 20:09:44 +0300
  • 8af1fd3223
    oban warning Alexander Strizhakov 2020-09-07 20:06:28 +0300
  • eca42566ba
    formatting Alexander Strizhakov 2020-09-07 13:54:28 +0300
  • e11fca88d4
    migration to move tokens expiration into Oban Alexander Strizhakov 2020-09-07 13:44:42 +0300
  • c6647c08e1
    migration and changelog Alexander Strizhakov 2020-09-07 11:54:10 +0300
  • 7dd986a563
    expire mfa tokens through Oban Alexander Strizhakov 2020-09-05 18:35:01 +0300
  • 3ce658b930
    schedule expired oauth tokens deletion with Oban Alexander Strizhakov 2020-08-25 19:17:51 +0300
  • c8c17d9c63 Merge branch 'fix/2132-emoji-packs' into 'develop' lain 2020-09-10 11:05:00 +0000
  • 9853c90abb added paginate links to headers for /chats/:id/messages Maksim Pechnikov 2020-09-10 12:24:44 +0300
  • 148bc24435 [#2497] Removed Hackney-specific code (no longer needed due to adapter options unification). Ivan Tashkinov 2020-09-10 11:54:10 +0300
  • ab56dd54e7
    use Pleroma.HTTP in emoji packs tasks Alexander Strizhakov 2020-09-10 11:23:39 +0300
  • cad69669fc [#2130] Fixed OAuth OOB authentication for users with enabled MFA. Ivan Tashkinov 2020-09-09 22:44:38 +0300
  • b4860c57a6 [#2497] Formatting fix. Ivan Tashkinov 2020-09-09 19:43:36 +0300
  • 68a74d6659 [#2497] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_. Ivan Tashkinov 2020-09-09 19:30:42 +0300
  • 4ee99dafcc Merge branch 'develop' into media-preview-proxy Mark Felder 2020-09-09 11:11:36 -0500
  • 9d20d29a79 Merge branch 'chore/concurrent_limiter_update' into 'develop' rinpatch 2020-09-09 15:49:34 +0000
  • 0c1d243185 bump concurrent_limiter rinpatch 2020-09-09 18:34:07 +0300
  • 34d7e864db New mix tasks for controlling user confirmation status and sending confirmation mails Mark Felder 2020-09-09 09:10:44 -0500
  • b900c06d4e Add tests for the bulk confirm/unconfirm tasks Mark Felder 2020-09-09 09:02:07 -0500
  • 6c79a60649 Add test for pleroma.user set --confirmed Mark Felder 2020-09-08 17:59:25 -0500
  • b9f4bb73d7 Merge branch 'weblate-pleroma-pleroma' into 'develop' lain 2020-09-09 11:34:31 +0000
  • 6ec1a9ded1 Translated using Weblate (Spanish) tarteka 2020-09-09 09:52:08 +0000
  • ace94bfcc8 Added translation using Weblate (Spanish) tarteka 2020-09-09 09:49:26 +0000
  • de2499e54b
    don't run update in tests Alexander Strizhakov 2020-09-09 09:52:07 +0300
  • bccef4b997 Pedantry Mark Felder 2020-09-08 17:01:55 -0500
  • ed847474c3 Fix descriptions Mark Felder 2020-09-08 16:59:53 -0500
  • d23d0c27c2 Handle possibility of user account in a bulk operation not having an email address Mark Felder 2020-09-08 16:48:54 -0500
  • 75b6fef25d Add mix task for bulk [un]confirming the local instance users Mark Felder 2020-09-08 16:39:41 -0500
  • 23ca5f75af Make it possible to bulk send confirmation emails to all unconfirmed users Mark Felder 2020-09-08 16:39:08 -0500
  • 7c055af567 Merge branch 'stable-sync/2.1.1' into 'develop' rinpatch 2020-09-08 17:57:02 +0000
  • 5ef840ed9c Merge branch 'stable' into stable-sync/2.1.1 rinpatch 2020-09-08 20:34:02 +0300
  • 0d2814ec8e Metadata: Move restriction check from Feed provider to activated_providers rinpatch 2020-09-07 15:06:06 +0300
  • 2011142ed9 Use :restrict_unauthenticated testing for more granular control Mark Felder 2020-09-01 10:43:44 -0500
  • 549c895d80 Document breaking change for metadata providers Mark Felder 2020-08-31 16:11:13 -0500
  • 96697db3bc RelMe and Feed no longer configurable Mark Felder 2020-08-31 16:11:01 -0500
  • a85ed6defb Do not serve RSS/Atom feeds when instance is private Mark Felder 2020-08-31 15:58:21 -0500
  • 44ced17634 Fix test so setting doesn't leak Mark Felder 2020-08-31 15:54:22 -0500
  • 14d07081fd Feed provider only generates a redirect, so always activate it. Mark Felder 2020-08-31 14:48:22 -0500
  • ff07014b26 Disable providers of user and status metadata when instance is private Mark Felder 2020-08-31 14:35:22 -0500
  • 630444ee08 Do not make RelMe metadata provider optional. Mark Felder 2020-08-31 14:19:48 -0500
  • 947ee55ae2 user: harden get_friends_query(), get_followers_query() and their wrappers Haelwenn (lanodan) Monnier 2020-09-02 20:24:03 +0200
  • 16c451f8f1 search: Apply following filter only when user is usable Haelwenn (lanodan) Monnier 2020-09-02 20:11:24 +0200
  • 10ef532c63 AP C2S: Restrict character limit on Note Haelwenn (lanodan) Monnier 2020-07-07 07:06:29 +0200
  • a781ac6ca5 Fix atom leak in AdminAPIController Egor Kislitsyn 2020-06-10 15:37:43 +0400
  • 425324aae3 Merge branch 'release/2.1.1' into 'stable' rinpatch 2020-09-08 17:21:12 +0000
  • acf6393c87 SECURITY.md: we don't support 2.0 anymore, bump to 2.1 rinpatch 2020-09-08 20:13:00 +0300
  • 073f5490ec Merge branch 'bugfix/mock' into 'develop' Haelwenn 2020-09-08 16:42:27 +0000
  • 7528a7e447 pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679 rinpatch 2020-09-08 15:34:20 +0300
  • 27c3973b78 Merge branch 'temp-hackney-fix' into 'develop' rinpatch 2020-09-07 12:47:43 +0000
  • 7490b76bbf Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' rinpatch 2020-09-08 12:21:33 +0000
  • e430e98e7d CHANGELOG.md: Add 2.1.1 entry rinpatch 2020-09-08 14:21:34 +0300
  • 921f926e96
    Remove OStatus in testsuite Haelwenn (lanodan) Monnier 2020-09-08 09:13:11 +0200
  • ee0e05f930
    Drop unused "inReplyToAtomUri" in objects Haelwenn (lanodan) Monnier 2020-09-08 10:43:57 +0200
  • 09416d8a03 Merge branch 'bugfix/mock' into 'develop' Haelwenn 2020-09-08 16:42:27 +0000
  • 87d2805791
    combo fixes Alexander Strizhakov 2020-09-08 17:29:28 +0300
  • fd7e9bdd25
    don't run async tests, which use Mock Alexander Strizhakov 2020-09-08 17:12:38 +0300
  • bf048ab72f Merge branch 'develop' into 'develop' feld 2020-09-08 14:52:51 +0000
  • 9e49f4627f Merge branch 'bugfix/favicon-empty-test' into 'develop' Haelwenn 2020-09-08 14:52:33 +0000
  • f6723dc9bd
    account_view_test: Remove empty test Haelwenn (lanodan) Monnier 2020-09-08 15:47:20 +0200
  • 788dececff
    test: remove extraneous :instances_favicons config bits Haelwenn (lanodan) Monnier 2020-09-08 16:08:01 +0200
  • bb0d7b7aaa Revert "description.exs: add ForceBotUnlistedPolicy" Mark Felder 2020-09-08 09:31:47 -0500
  • 21efda2edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted Mark Felder 2020-09-08 09:31:26 -0500
  • 91b9985e1c Pass expires_in param from status controller Roman Chvanikov 2020-09-08 15:26:06 +0300
  • 0a05670b44 Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' rinpatch 2020-09-08 12:21:33 +0000
  • 880a92ccc7 Merge branch 'develop' into feature/expire-mutes Roman Chvanikov 2020-09-08 15:16:43 +0300
  • e3f845b243 Add expiring mutes for activities Roman Chvanikov 2020-09-08 15:13:50 +0300
  • 9c76769878 mix.exs: bump version to 2.1.1 rinpatch 2020-09-08 15:08:51 +0300
  • ce3474f4d3 Disable favicon scraping in tests rinpatch 2020-09-08 15:06:53 +0300
  • 5d814f739c changelog: add ForceBotUnlistedPolicy Alibek Omarov 2020-09-08 11:35:34 +0000
  • efff2caccc docs: cheatsheet: add ForceBotUnlistedPolicy Alibek Omarov 2020-09-08 11:34:04 +0000
  • 7215563641 description.exs: add ForceBotUnlistedPolicy Alibek Omarov 2020-09-08 11:32:46 +0000
  • d34dc4a746 Merge branch 'fix/2108-adapter-options' into 'develop' rinpatch 2020-09-08 11:20:31 +0000
  • f6b250fb8d Add test for expiring mutes Roman Chvanikov 2020-09-08 14:11:00 +0300
  • 4b76d7ce67 Merge branch 'fix/admin-controller-atom-leak' into 'develop' rinpatch 2020-09-07 11:38:15 +0000
  • 9b85592b8b Merge branch 'fix/rich-media-fake-statuses' into 'develop' lain 2020-09-07 10:19:19 +0000
  • 4306050da9 Merge branch 'develop' into 'develop' lain 2020-09-04 18:19:23 +0000
  • 59f5e39f9b Merge branch 'chore/fast_html-bump' into 'develop' rinpatch 2020-09-04 07:17:10 +0000
  • 964bc8e2e8 Merge branch 'bugfix/favicon-too-long' into 'develop' rinpatch 2020-09-07 11:12:30 +0000
  • 43b07c31cb Merge branch 'fix/2095-deactivated-account-reset' into 'develop' feld 2020-09-02 17:11:24 +0000
  • 515116e2f0 Merge branch 'chore/fast-sanitize-bump' into 'develop' rinpatch 2020-08-31 07:22:35 +0000
  • dccbed856d Merge branch 'http-fixes' into 'develop' rinpatch 2020-09-02 09:36:56 +0000
  • c56e3d4f3b Add expires_in param for account mutes Roman Chvanikov 2020-09-08 13:26:44 +0300
  • ea4b6c64d6 Merge branch 'feat/rich-media-improvements' into 'develop' rinpatch 2020-09-02 13:46:11 +0000
  • 8c3241df44 Merge branch 'fix/2047-rich-media-parser' into 'develop' rinpatch 2020-09-02 09:38:43 +0000
  • 13e606941c Merge branch 'fix/2087-metadata' into 'develop' rinpatch 2020-09-08 09:49:27 +0000
  • 74d46a1b09 Merge branch 'secfix/search-crash' into 'develop' rinpatch 2020-09-08 09:47:16 +0000
  • 84acfab156 Merge branch 'fix-searching-following' into 'develop' rinpatch 2020-09-02 06:55:58 +0000
  • 718c7cc847 Merge branch 'fix/apc2s-limits' into 'develop' rinpatch 2020-09-07 16:38:16 +0000
  • 0f27211dd0 CHANGELOG.md: move the exiftool webp entry to a proper section rinpatch 2020-09-08 12:28:38 +0300
  • 4ea07f74e9 Revert/simplify. Mark Felder 2020-09-04 22:18:01 -0500
  • 216c84a8f4 Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension. Mark Felder 2020-09-04 17:56:05 -0500
  • 3a98960c26 Verify webp files are not processed with exiftool Mark Felder 2020-09-04 17:50:16 -0500