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
3 years ago
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
3 years ago
stwf
9d77f4abf8
adapt to new user factory behavior
3 years ago
stwf
dfc621a529
add test and changelog entry
3 years ago
stwf
41939e3175
User search respect discoverable flag
3 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
3 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
3 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
3 years ago
Mark Felder
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
3 years ago
lain
2a7c9ac147
Merge branch 'nondiscoverable-user-metadata' into 'develop'
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
3 years ago
Ivan Tashkinov
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
3 years ago
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
3 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
3 years ago
lain
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
# Conflicts:
# CHANGELOG.md
3 years ago
rinpatch
db80b9d630
RichMedia: Fix log spam on failures and resetting TTL on cached errors
3 years ago
eugenijm
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
3 years ago
stwf
f58262c673
add description to changelog
3 years ago
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
3 years ago
lain
5426eb5997
Merge branch 'chat-moderation' into 'develop'
Chat moderation MVP
See merge request pleroma/pleroma!2937
3 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.
3 years ago
lain
e39ff2616b
Admin chat api tests: Small additions.
3 years ago
lain
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
3 years ago
Maksim Pechnikov
5a8ea0a5b0
small refactoring
3 years ago
Maksim Pechnikov
b867f9d7ae
Merge branch 'develop' into issue/2099
3 years ago
Ivan Tashkinov
a781f41f96
[ #2497 ] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
3 years ago
feld
c5acbf8a1b
Merge branch 'chore/unused-import' into 'develop'
Remove unused import
See merge request pleroma/pleroma!3004
3 years ago
Mark Felder
73e0e6a8a2
Remove unused import
3 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
3 years ago
lain
7a88b726bf
User: Remote users don't need to be confirmed or approved
3 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
3 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.
3 years ago
rinpatch
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
3 years ago
rinpatch
adbd0032fa
Merge branch 'features/validators-video' into 'develop'
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
3 years ago
lain
6b088ed76a
Merge branch 'issue/2089' into 'develop'
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
3 years ago
Maksim Pechnikov
599f8bb152
RepoStreamer.chunk_stream -> Repo.chunk_stream
3 years ago
Maksim
c74fad9e06
Apply 1 suggestion(s) to 1 file(s)
3 years ago
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
3 years ago
Maksim Pechnikov
f879d07fa1
fixed tests
3 years ago
lain
cfad4f46b2
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
3 years ago
eugenijm
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
3 years ago
Haelwenn
5c4ff5c73c
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
3 years ago
Mark Felder
0b66e806e3
Move changelog entry to next patch
3 years ago
Mark Felder
709723182d
Ensure SimplePolicy's tags in string representation don't trip up the object validator
3 years ago
stwf
f900a40d5d
fix credo warning
3 years ago
stwf
38b2db297b
search indexing metadata respects discoverable flag
3 years ago
Mark Felder
118bf6e92b
Fixed Welcome chats with MRF Simple applied locally
3 years ago
Mark Felder
25d1caf1dd
Merge duplicate Changed sections
3 years ago
Mark Felder
d31f0393bf
Validate Welcome Chat message works with Simple policy applied to local instance
3 years ago
rinpatch
39d769f250
Merge branch 'remove/managed-config-option' into 'develop'
Remove `:managed_config` option.
Closes #2086
See merge request pleroma/pleroma!2983
3 years ago
rinpatch
0b5e72ecf0
Remove `:managed_config` option.
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
3 years ago