Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
4 years ago |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
4 years ago |
|
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
4 years ago |
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Mark Felder
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
4 years ago |
|
Mark Felder
|
9968b7efed
|
Change user.locked field to user.is_locked
|
4 years ago |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
4 years ago |
|
Alexander Strizhakov
|
66e0b0065b
|
Cache plug module name
|
4 years ago |
|
Alexander Strizhakov
|
c6baa811d6
|
EnsureAuthenticatedPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8c993c5f63
|
FederatingPlug module name
|
4 years ago |
|
Mark Felder
|
8539e386c3
|
Add missing Copyright headers
|
4 years ago |
|
Mark Felder
|
04b514c567
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
218a3e61e1
|
Fix incompatible types warning (Elixir 1.11)
|
4 years ago |
|
Mark Felder
|
636c00037d
|
Fix duplicate @doc entries
|
4 years ago |
|
rinpatch
|
2698bbc9f6
|
Merge branch 'filtering-following' into 'develop'
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
|
4 years ago |
|
Maksim Pechnikov
|
de993b856b
|
added `force` option to the unfollow operation
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
5e86a2809e
|
transmogrifier: Drop incoming create early if it already exists
|
4 years ago |
|
lain
|
ee3052a2d8
|
ActivityPub: Return Announces when filtering by `following`.
|
4 years ago |
|
lain
|
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 |
|
feld
|
6c052bd5b6
|
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
|
4 years ago |
|
Steven Fuchs
|
f2ef9735c5
|
Federate data through persistent websocket connections
|
4 years ago |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
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 |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
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 |
|
rinpatch
|
adbd0032fa
|
Merge branch 'features/validators-video' into 'develop'
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
|
4 years ago |
|
Ivan Tashkinov
|
2f155fb89f
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
4 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
|
4 years ago |
|
Mark Felder
|
709723182d
|
Ensure SimplePolicy's tags in string representation don't trip up the object validator
|
4 years ago |
|
Mark Felder
|
c0b36621f1
|
Ensure we only apply NSFW Simple policy on parsable objects
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f1f44069ae
|
Fetcher: Correctly return MRF reject reason
|
4 years ago |
|
Ivan Tashkinov
|
0bda85857e
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f18178cb09
|
AttachmentValidator: directly embed url schema and pass it fix_media_type
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
1b3d5956b1
|
Pipeline Ingestion: Article
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
2132b24a9d
|
object_validators: likes & announcements as [ObjectID]
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
846b59ccb0
|
Pipeline Ingestion: Video
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
b73e9ef686
|
transmogrifier: Call strip_internal_fields on pipeline ingestion
|
4 years ago |
|
Mark Felder
|
55562ca936
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Alexander Strizhakov
|
357d971a10
|
expiration for new pipeline
|
4 years ago |
|
Alexander Strizhakov
|
93e1c8df9d
|
reject activity creation
if passed expires_at option and expiring activities are not configured
|
4 years ago |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
4 years ago |
|
rinpatch
|
541a3eede2
|
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
|
4 years ago |
|
Ivan Tashkinov
|
148bc24435
|
[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).
|
4 years ago |
|
Mark Felder
|
4ee99dafcc
|
Merge branch 'develop' into media-preview-proxy
|
4 years ago |
