9108e27c2f
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
...
[#2074 ] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
4 years ago
b36b6259d8
Merge branch 'issue/2099' into 'develop'
...
[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
4 years ago
994ce250c2
Merge branch '2161-block-changes' into 'develop'
...
ActivityPub: Don't block-filter your own posts
Closes #2161
See merge request pleroma/pleroma!3017
4 years ago
8afdbcdb1c
Force HTTP for fedsockets
4 years ago
f2f0a0260f
ActivityPub: Don't block-filter your own posts
...
We are filtering out replies to people you block, but that should
not include your own posts.
4 years ago
882c1fc6bd
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3014
4 years ago
f3c62b246d
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 24.5% (26 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
4 years ago
d72970a1fc
Added translation using Weblate (Chinese (Simplified))
4 years ago
402acce525
Merge branch 'fix/openapi-errors' into 'develop'
...
OpenAPI: fix various errors pointed out by editor.swagger.io
See merge request pleroma/pleroma!3011
4 years ago
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
4 years ago
4b12e071ac
OpenAPI: make it possible to generate a spec without starting the app
...
Needed for api docs generation on pleroma.social that will come later
4 years ago
51116b5392
OpenAPI: fix various errors pointed out by editor.swagger.io
4 years ago
26859c549c
Add user agent to fedsocket requests
4 years ago
ed3bc53fa1
Merge branch 'develop' into issue/2099
4 years ago
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
4 years ago
91ddd47e51
Merge branch 'fix/fedsocket-log-spam' into 'develop'
...
FedSockets: fix log spam on cached rejects
See merge request pleroma/pleroma!3009
4 years ago
26c571df33
FedSockets: fix log spam on cached rejects
4 years ago
7e02f4ed3b
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
...
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
4 years ago
875b6654ec
Merge branch 'websocket-data-fed' into 'develop'
...
Federate data through persistent websocket connections
See merge request pleroma/pleroma!2408
4 years ago
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
2159daa9af
update changelog
4 years ago
2ec0dcf001
Merge branch 'develop' into issue/2099
4 years ago
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
4 years ago
49584a9928
Merge branch 'stable-sync/2.1.2' into 'develop'
...
Sync develop with 2.1.2
Closes #2133 , #2131 , and #2130
See merge request pleroma/pleroma!3007
4 years ago
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
4 years ago
065a4dddfd
Merge branch 'stable' into stable-sync/2.1.2
4 years ago
a0f5e8b27e
Merge branch 'release/2.1.2' into 'stable'
...
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
4 years ago
7bf269fe83
Fix MRF reject for ChatMessage
4 years ago
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
4 years ago
3a0f99ed35
KeywordPolicy: Still match when fields are absent
4 years ago
34afc2b074
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
4 years ago
b751c5babc
CHANGELOG.md: Add 2.1.2 entry
4 years ago
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
4 years ago
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
4 years ago
a5d6c9aa8e
mix.exs: bump version to 2.1.2
4 years ago
6bbd65fb09
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
...
[#2130 ] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
4 years ago
608017b7df
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
4 years ago
0465bdbd49
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
4 years ago
bb70b231d0
Merge branch 'reply-visibility-user-guard' into 'develop'
...
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
4 years ago
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
4 years ago
9d77f4abf8
adapt to new user factory behavior
4 years ago
dfc621a529
add test and changelog entry
4 years ago
41939e3175
User search respect discoverable flag
4 years ago
eff7f9892d
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
...
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
4 years ago
dee4639dbb
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
4 years ago
6b9bfc9e86
Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'
...
Deny ConfigDB migration when deprecated settings found
Closes #2148
See merge request pleroma/pleroma!3005
4 years ago
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
4 years ago
2a7c9ac147
Merge branch 'nondiscoverable-user-metadata' into 'develop'
...
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
4 years ago
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
4 years ago
lain