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 |
|
|
|
bf048ab72f
|
Merge branch 'develop' into 'develop'
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
|
2020-09-08 14:52:51 +00:00 |
|
Haelwenn
|
9e49f4627f
|
Merge branch 'bugfix/favicon-empty-test' into 'develop'
Bugfix/favicon empty test
See merge request pleroma/pleroma!2972
|
2020-09-08 14:52:33 +00:00 |
|
Haelwenn (lanodan) Monnier
|
f6723dc9bd
|
account_view_test: Remove empty test
|
2020-09-08 16:33:22 +02:00 |
|
Haelwenn (lanodan) Monnier
|
788dececff
|
test: remove extraneous :instances_favicons config bits
|
2020-09-08 16:32:54 +02:00 |
|
Mark Felder
|
bb0d7b7aaa
|
Revert "description.exs: add ForceBotUnlistedPolicy"
This reverts commit 7215563641.
|
2020-09-08 09:31:47 -05:00 |
|
Mark Felder
|
21efda2edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
|
2020-09-08 09:31:26 -05:00 |
|
rinpatch
|
0a05670b44
|
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 12:21:33 +00:00 |
|
rinpatch
|
9c76769878
|
mix.exs: bump version to 2.1.1
|
2020-09-08 15:09:10 +03:00 |
|
rinpatch
|
ce3474f4d3
|
Disable favicon scraping in tests
|
2020-09-08 15:09:10 +03:00 |
|
|
|
5d814f739c
|
changelog: add ForceBotUnlistedPolicy
|
2020-09-08 11:35:34 +00:00 |
|
|
|
efff2caccc
|
docs: cheatsheet: add ForceBotUnlistedPolicy
|
2020-09-08 11:34:04 +00:00 |
|
|
|
7215563641
|
description.exs: add ForceBotUnlistedPolicy
|
2020-09-08 11:32:46 +00:00 |
|
rinpatch
|
d34dc4a746
|
Merge branch 'fix/2108-adapter-options' into 'develop'
Adapter options unification
Closes #2108
See merge request pleroma/pleroma!2952
|
2020-09-08 11:20:31 +00:00 |
|
rinpatch
|
4b76d7ce67
|
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
|
2020-09-08 14:00:00 +03:00 |
|
lain
|
9b85592b8b
|
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
|
2020-09-08 13:56:42 +03:00 |
|
lain
|
4306050da9
|
Merge branch 'develop' into 'develop'
Added cmake
See merge request pleroma/pleroma!2953
|
2020-09-08 13:56:29 +03:00 |
|
rinpatch
|
59f5e39f9b
|
Merge branch 'chore/fast_html-bump' into 'develop'
mix.lock: Bump fast_html
See merge request pleroma/pleroma!2950
|
2020-09-08 13:56:09 +03:00 |
|
rinpatch
|
964bc8e2e8
|
Merge branch 'bugfix/favicon-too-long' into 'develop'
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
|
2020-09-08 13:55:52 +03:00 |
|
|
|
43b07c31cb
|
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
|
2020-09-08 13:53:47 +03:00 |
|
rinpatch
|
515116e2f0
|
Merge branch 'chore/fast-sanitize-bump' into 'develop'
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
|
2020-09-08 13:53:32 +03:00 |
|
rinpatch
|
dccbed856d
|
Merge branch 'http-fixes' into 'develop'
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
|
2020-09-08 13:53:16 +03:00 |
|
rinpatch
|
ea4b6c64d6
|
Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements
See merge request pleroma/pleroma!2944
|
2020-09-08 13:00:49 +03:00 |
|
rinpatch
|
8c3241df44
|
Merge branch 'fix/2047-rich-media-parser' into 'develop'
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
|
2020-09-08 13:00:15 +03:00 |
|
