rinpatch
|
cb06e98da2
|
websocket handler: Do not log client ping frames as errors
|
2020-09-10 21:14:23 +03:00 |
|
rinpatch
|
9b6ab32166
|
Merge branch 'fix/tesla-client-opts' into 'develop'
Pass options without adapter key in tesla reverse proxy client
See merge request pleroma/pleroma!2985
|
2020-09-10 17:41:37 +00:00 |
|
Alexander Strizhakov
|
e8bfb50fa3
|
pass options without adapter key
|
2020-09-10 20:09:44 +03:00 |
|
Alexander Strizhakov
|
8af1fd3223
|
oban warning
|
2020-09-10 16:01:20 +03:00 |
|
Alexander Strizhakov
|
eca42566ba
|
formatting
|
2020-09-10 16:01:20 +03:00 |
|
Alexander Strizhakov
|
e11fca88d4
|
migration to move tokens expiration into Oban
|
2020-09-10 16:01:20 +03:00 |
|
Alexander Strizhakov
|
c6647c08e1
|
migration and changelog
|
2020-09-10 16:01:20 +03:00 |
|
Alexander Strizhakov
|
7dd986a563
|
expire mfa tokens through Oban
|
2020-09-10 16:01:19 +03:00 |
|
Alexander Strizhakov
|
3ce658b930
|
schedule expired oauth tokens deletion with Oban
|
2020-09-10 16:01:19 +03:00 |
|
lain
|
c8c17d9c63
|
Merge branch 'fix/2132-emoji-packs' into 'develop'
use Pleroma.HTTP in emoji packs tasks
Closes #2132
See merge request pleroma/pleroma!2980
|
2020-09-10 11:05:00 +00:00 |
|
Maksim Pechnikov
|
9853c90abb
|
added paginate links to headers for /chats/:id/messages
|
2020-09-10 12:39:29 +03:00 |
|
Ivan Tashkinov
|
148bc24435
|
[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).
|
2020-09-10 11:54:10 +03:00 |
|
Alexander Strizhakov
|
ab56dd54e7
|
use Pleroma.HTTP in emoji packs tasks
|
2020-09-10 11:23:39 +03:00 |
|
Ivan Tashkinov
|
cad69669fc
|
[#2130] Fixed OAuth OOB authentication for users with enabled MFA.
|
2020-09-09 22:44:38 +03:00 |
|
Ivan Tashkinov
|
b4860c57a6
|
[#2497] Formatting fix.
|
2020-09-09 19:43:36 +03:00 |
|
Ivan Tashkinov
|
68a74d6659
|
[#2497] Added missing alias, removed legacy :adapter option specification for HTTP.get/_.
|
2020-09-09 19:30:42 +03:00 |
|
Mark Felder
|
4ee99dafcc
|
Merge branch 'develop' into media-preview-proxy
|
2020-09-09 11:11:36 -05:00 |
|
rinpatch
|
9d20d29a79
|
Merge branch 'chore/concurrent_limiter_update' into 'develop'
bump concurrent_limiter
See merge request pleroma/pleroma!2978
|
2020-09-09 15:49:34 +00:00 |
|
rinpatch
|
0c1d243185
|
bump concurrent_limiter
Should fix gun deadlocks
|
2020-09-09 18:34:07 +03:00 |
|
lain
|
b9f4bb73d7
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2977
|
2020-09-09 11:34:31 +00:00 |
|
tarteka
|
6ec1a9ded1
|
Translated using Weblate (Spanish)
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-09 10:52:44 +00:00 |
|
tarteka
|
ace94bfcc8
|
Added translation using Weblate (Spanish)
|
2020-09-09 09:49:27 +00:00 |
|
rinpatch
|
7c055af567
|
Merge branch 'stable-sync/2.1.1' into 'develop'
Sync stable with develop after 2.1.1
Closes #2, #2047, #2095, #2116, #1987, and #2080
See merge request pleroma/pleroma!2974
|
2020-09-08 17:57:02 +00:00 |
|
rinpatch
|
5ef840ed9c
|
Merge branch 'stable' into stable-sync/2.1.1
|
2020-09-08 20:34:02 +03:00 |
|
rinpatch
|
0d2814ec8e
|
Metadata: Move restriction check from Feed provider to activated_providers
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
2011142ed9
|
Use :restrict_unauthenticated testing for more granular control
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
549c895d80
|
Document breaking change for metadata providers
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
96697db3bc
|
RelMe and Feed no longer configurable
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
a85ed6defb
|
Do not serve RSS/Atom feeds when instance is private
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
44ced17634
|
Fix test so setting doesn't leak
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
14d07081fd
|
Feed provider only generates a redirect, so always activate it.
Making this configurable is misleading.
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
ff07014b26
|
Disable providers of user and status metadata when instance is private
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
630444ee08
|
Do not make RelMe metadata provider optional.
There's really no sound reason to turn this off anyway.
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
947ee55ae2
|
user: harden get_friends_query(), get_followers_query() and their wrappers
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
16c451f8f1
|
search: Apply following filter only when user is usable
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
10ef532c63
|
AP C2S: Restrict character limit on Note
|
2020-09-08 20:21:34 +03:00 |
|
Egor Kislitsyn
|
a781ac6ca5
|
Fix atom leak in AdminAPIController
|
2020-09-08 20:21:34 +03:00 |
|
rinpatch
|
425324aae3
|
Merge branch 'release/2.1.1' into 'stable'
2.1.1 release
See merge request pleroma/secteam/pleroma!13
|
2020-09-08 17:21:12 +00:00 |
|
rinpatch
|
acf6393c87
|
SECURITY.md: we don't support 2.0 anymore, bump to 2.1
|
2020-09-08 20:13:00 +03:00 |
|
Haelwenn
|
073f5490ec
|
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
|
2020-09-08 19:46:23 +03:00 |
|
rinpatch
|
7528a7e447
|
pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
|
2020-09-08 19:45:44 +03:00 |
|
rinpatch
|
27c3973b78
|
Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix
See merge request pleroma/pleroma!2951
|
2020-09-08 19:45:44 +03:00 |
|
rinpatch
|
7490b76bbf
|
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
|
2020-09-08 19:45:44 +03:00 |
|
rinpatch
|
e430e98e7d
|
CHANGELOG.md: Add 2.1.1 entry
|
2020-09-08 19:45:44 +03:00 |
|
Haelwenn (lanodan) Monnier
|
921f926e96
|
Remove OStatus in testsuite
|
2020-09-08 18:43:57 +02:00 |
|
Haelwenn (lanodan) Monnier
|
ee0e05f930
|
Drop unused "inReplyToAtomUri" in objects
|
2020-09-08 18:43:57 +02:00 |
|
Haelwenn
|
09416d8a03
|
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
|
2020-09-08 16:42:27 +00:00 |
|
Alexander Strizhakov
|
87d2805791
|
combo fixes
|
2020-09-08 17:40:23 +02:00 |
|
Alexander Strizhakov
|
fd7e9bdd25
|
don't run async tests, which use Mock
|
2020-09-08 17:40:23 +02:00 |
|
feld
|
bf048ab72f
|
Merge branch 'develop' into 'develop'
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
|
2020-09-08 14:52:51 +00:00 |
|