lain
|
81293e5aad
|
ActivityPubController: Don't return local only objects
|
4 years ago |
|
Mark Felder
|
2156de2fee
|
Ingest blurhash field during transmogrification
|
4 years ago |
|
Mark Felder
|
6fd72e9e85
|
Ingest blurhash for attachments if they were federated
|
4 years ago |
|
Alexander Strizhakov
|
8da9f919f8
|
little changes for MRF config descriptions
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
|
4 years ago |
|
Egor Kislitsyn
|
0118ccb53c
|
Add `local` visibility
|
4 years ago |
|
Alexander Strizhakov
|
8d218ebaf5
|
Moving some background jobs into simple tasks
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
|
4 years ago |
|
Alexander Strizhakov
|
f97f24b067
|
making credo happy and test fix
|
4 years ago |
|
Alexander Strizhakov
|
efc27f6464
|
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
|
4 years ago |
|
Alexander Strizhakov
|
485697d96c
|
config descriptions for custom MRF policies
|
4 years ago |
|
lain
|
329aa19c9f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
|
4 years ago |
|
lain
|
c7bcbfbc1d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
|
4 years ago |
|
lain
|
24ce324973
|
Merge branch 'bugfix/poll_replies_count' into 'develop'
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
4caad4e910
|
side_effects: Don’t increase_replies_count when it’s an Answer
|
4 years ago |
|
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
4 years ago |
|
Egor Kislitsyn
|
8542d2efee
|
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
|
4 years ago |
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
lain
|
de6d49c8ce
|
ActivityPub: Add back debug call + explanation.
|
4 years ago |
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
4 years ago |
|
Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
4 years ago |
|
rinpatch
|
df61071422
|
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
|
4 years ago |
|
lain
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
4 years ago |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
4 years ago |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
4 years ago |
|
lain
|
e97b254c6b
|
Transmogrifier: Refactor and unify incoming tag handling
|
4 years ago |
|
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
4 years ago |
|
Egor Kislitsyn
|
18a91d85e5
|
Merge branch 'develop' into feature/local-only-scope
|
4 years ago |
|
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
4 years ago |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
4 years ago |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Egor Kislitsyn
|
2a475622ee
|
Add Pleroma.Constants.as_local_public/0
|
4 years ago |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
4 years ago |
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
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 |
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
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 |
|
Ivan Tashkinov
|
2498e569f1
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
|
4 years ago |
|
Ivan Tashkinov
|
e1eb54d389
|
[#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
|
4 years ago |
|
Mark Felder
|
04b514c567
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Alex Gleason
|
3f9263fb16
|
Merge remote-tracking branch 'upstream/develop' into restrict-origin
|
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 |
|
Ivan Tashkinov
|
094edde7c4
|
[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f497eb034d
|
activity_pub_controller.ex: Remove unused @doc block
[ci skip]
|
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 |
|
Haelwenn (lanodan) Monnier
|
10ef532c63
|
AP C2S: Restrict character limit on Note
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
ee0e05f930
|
Drop unused "inReplyToAtomUri" in objects
|
4 years ago |
|
Mark Felder
|
21efda2edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
|
4 years ago |
|
Alibek Omarov
|
95688c90ad
|
ForceBotUnlistedPolicy: simplify code
|
4 years ago |
|
Alibek Omarov
|
8b695c3eeb
|
ForceBotUnlistedPolicy: format
|
4 years ago |
|
Alibek Omarov
|
699224a900
|
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
|
4 years ago |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
4 years ago |
|
Alexander Strizhakov
|
a83916fdac
|
adapter options unification
not needed options deletion
|
4 years ago |
|
Ivan Tashkinov
|
88a6ee4a59
|
[#2497] Func defs grouping fix.
|
4 years ago |
|
Ivan Tashkinov
|
f170d47130
|
[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
Removed :preview pool in favor of existing :media one. Misc. refactoring.
|
4 years ago |
|
Mark Felder
|
85446cc30c
|
Merge branch 'develop' into media-preview-proxy
|
4 years ago |
|
lain
|
9433311923
|
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
|
4 years ago |
