Maksim Pechnikov
2ec0dcf001
Merge branch 'develop' into issue/2099
4 years ago
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
4 years ago
rinpatch
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
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
4 years ago
rinpatch
065a4dddfd
Merge branch 'stable' into stable-sync/2.1.2
4 years ago
rinpatch
a0f5e8b27e
Merge branch 'release/2.1.2' into 'stable'
...
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
4 years ago
Haelwenn (lanodan) Monnier
7bf269fe83
Fix MRF reject for ChatMessage
4 years ago
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
4 years ago
Haelwenn (lanodan) Monnier
3a0f99ed35
KeywordPolicy: Still match when fields are absent
4 years ago
rinpatch
34afc2b074
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
4 years ago
rinpatch
b751c5babc
CHANGELOG.md: Add 2.1.2 entry
4 years ago
Haelwenn
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
4 years ago
feld
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
rinpatch
a5d6c9aa8e
mix.exs: bump version to 2.1.2
4 years ago
rinpatch
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
rinpatch
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
Haelwenn
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
lain
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
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
4 years ago
stwf
9d77f4abf8
adapt to new user factory behavior
4 years ago
stwf
dfc621a529
add test and changelog entry
4 years ago
stwf
41939e3175
User search respect discoverable flag
4 years ago
rinpatch
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
rinpatch
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
feld
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
Mark Felder
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
4 years ago
lain
2a7c9ac147
Merge branch 'nondiscoverable-user-metadata' into 'develop'
...
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
4 years ago
Ivan Tashkinov
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
4 years ago
rinpatch
cd93aa2aed
Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'
...
RichMedia: Fix log spam on failures and resetting TTL on cached errors
See merge request pleroma/pleroma!3006
4 years ago
lain
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
4 years ago
rinpatch
db80b9d630
RichMedia: Fix log spam on failures and resetting TTL on cached errors
4 years ago
eugenijm
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
4 years ago
stwf
f58262c673
add description to changelog
4 years ago
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
lain
5426eb5997
Merge branch 'chat-moderation' into 'develop'
...
Chat moderation MVP
See merge request pleroma/pleroma!2937
4 years ago
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
4 years ago
lain
5e3c70afa5
AdminAPI Chat tests: Remove factory.
...
The factory system doesn't work too well with how the chats are
done. Instead of tempting people to use it, let's rather use the
CommonAPI system for now.
4 years ago
lain
e39ff2616b
Admin chat api tests: Small additions.
4 years ago
lain
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
4 years ago
Maksim Pechnikov
5a8ea0a5b0
small refactoring
4 years ago
Maksim Pechnikov
b867f9d7ae
Merge branch 'develop' into issue/2099
4 years ago
Ivan Tashkinov
a781f41f96
[ #2497 ] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
4 years ago
feld
c5acbf8a1b
Merge branch 'chore/unused-import' into 'develop'
...
Remove unused import
See merge request pleroma/pleroma!3004
4 years ago
Mark Felder
73e0e6a8a2
Remove unused import
4 years ago
rinpatch
3a9baa9d0d
Merge branch '2144-empty-users' into 'develop'
...
User: Remote users don't need to be confirmed or approved
Closes #2144
See merge request pleroma/pleroma!3003
4 years ago
lain
7a88b726bf
User: Remote users don't need to be confirmed or approved
4 years ago
rinpatch
a4f80e1e74
Merge branch 'feat/connection-worker-monitor-flush' into 'develop'
...
ConnectionPool Worker: use monitor flush instead of checking ref
See merge request pleroma/pleroma!3002
4 years ago
rinpatch
adb1b0282d
ConnectionPool Worker: use monitor flush instead of checking ref
...
`:flush` removes the DOWN message if one had arrived, so this check
should no longer be necessary.
4 years ago
rinpatch
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
...
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
4 years ago