Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
rinpatch
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
4 years ago
Ivan Tashkinov
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
4 years ago
Ivan Tashkinov
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
4 years ago
Ivan Tashkinov
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
4 years ago
Alexander Strizhakov
cbdaabad34
web push http_client fix
4 years ago
rinpatch
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
4 years ago
Mark Felder
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
4 years ago
Maksim Pechnikov
de993b856b
added `force` option to the unfollow operation
4 years ago
rinpatch
f67c967c4a
Merge branch 'features/incoming-create-exists' into 'develop'
...
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
4 years ago
Alexander Strizhakov
5d7ec00bed
fixes after rebase
4 years ago
Alexander Strizhakov
8c6ec4c111
pack routes change
4 years ago
Alexander Strizhakov
dbbc801667
pagination for remote emoji packs
4 years ago
Alexander Strizhakov
9b6d89ff8c
support for special chars in pack name
4 years ago
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
4 years ago
Roman Chvanikov
8f5589cf66
Merge develop
4 years ago
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Maksim Pechnikov
72d2b34d3b
Merge branch 'develop' into issue/1975
4 years ago
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
4 years ago
lain
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
4 years ago
lain
ee3052a2d8
ActivityPub: Return Announces when filtering by `following`.
4 years ago
feld
a5c34e3123
Merge branch 'fix/fedsocket-useragent' into 'develop'
...
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
4 years ago
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset
4 years ago
lain
59680f27ff
Merge branch 'bugfix/federator-actor-error' into 'develop'
...
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
4 years ago
lain
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
lain
b36b6259d8
Merge branch 'issue/2099' into 'develop'
...
[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
4 years ago
Mark Felder
8afdbcdb1c
Force HTTP for fedsockets
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
Roman Chvanikov
28d0986f83
Refactor mutes removing in CommonAPI and User
4 years ago
Roman Chvanikov
4987ee6256
Merge branch 'develop' into feature/expire-mutes
4 years ago
Ivan Tashkinov
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
4 years ago
rinpatch
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
rinpatch
51116b5392
OpenAPI: fix various errors pointed out by editor.swagger.io
4 years ago
Mark Felder
26859c549c
Add user agent to fedsocket requests
4 years ago
Maksim Pechnikov
ed3bc53fa1
Merge branch 'develop' into issue/2099
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
rinpatch
26c571df33
FedSockets: fix log spam on cached rejects
4 years ago
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
Maksim Pechnikov
2ec0dcf001
Merge branch 'develop' into issue/2099
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
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
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
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
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
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
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
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
4 years ago
lain
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
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
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
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
4 years ago
Mark Felder
709723182d
Ensure SimplePolicy's tags in string representation don't trip up the object validator
4 years ago
stwf
38b2db297b
search indexing metadata respects discoverable flag
4 years ago
rinpatch
bb407edce4
RichMedia: fix a compilation error due to nonexistent variable
...
No idea why this passed Gitlab CI
4 years ago
rinpatch
f70335002d
RichMedia: Do a HEAD request to check content type/length
...
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
4 years ago
rinpatch
f66a15c4a5
RichMedia parser: do not set a cache TTL for unchanging errors
4 years ago
Roman Chvanikov
c5830ac037
Merge develop
4 years ago
Ivan Tashkinov
cd234a5321
[ #2497 ] Media preview proxy: preview bypass for small images
...
(basing on Content-Length and Content-Type).
4 years ago
Ivan Tashkinov
32831f371f
[ #2497 ] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.
4 years ago
Mark Felder
c0b36621f1
Ensure we only apply NSFW Simple policy on parsable objects
4 years ago
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
Alex Gleason
e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
4 years ago
Alex Gleason
02d70228b5
AdminAPI: fix delete chat message
4 years ago
Alex Gleason
9dd0b23da4
AdminAPI: show chat
4 years ago
Alex Gleason
f13b52a703
AdminAPI: list messages in a chat
4 years ago
Alex Gleason
c41430b23e
Refactor with Chat.for_user_query/1
4 years ago
Alex Gleason
fb0de07343
AdminAPI: list chats for a user
4 years ago
Alex Gleason
b40a627ab0
AdminAPI: delete a chat message
4 years ago
Alex Gleason
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
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
36c9197ac3
Apply 1 suggestion(s) to 1 file(s)
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
Haelwenn (lanodan) Monnier
da876d09e8
federator: normalize only actor, catch actor error
4 years ago
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
Ivan Tashkinov
4d18a50f3c
[ #2497 ] Formatting fix.
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
0254696e30
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
...
Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957
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
rinpatch
53cf7fef6e
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
Ivan Tashkinov
dc4e06e199
[ #2497 ] Removed support for thumbnail_max_* params for media preview proxy
...
(per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771 )
4 years ago
rinpatch
01fa68fe45
Websocket handler: fix never matching code on failed auth
...
`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
4 years ago
rinpatch
e16e8f9816
Websocket handler: do not raise if handler is terminated before switching protocols
...
Closes #2131
4 years ago
rinpatch
cb06e98da2
websocket handler: Do not log client ping frames as errors
4 years ago
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban
4 years ago
Alexander Strizhakov
3ce658b930
schedule expired oauth tokens deletion with Oban
4 years ago
Maksim Pechnikov
9853c90abb
added paginate links to headers for /chats/:id/messages
4 years ago
Ivan Tashkinov
148bc24435
[ #2497 ] Removed Hackney-specific code
...
(no longer needed due to adapter options unification).
4 years ago
Ivan Tashkinov
cad69669fc
[ #2130 ] Fixed OAuth OOB authentication for users with enabled MFA.
4 years ago
Ivan Tashkinov
68a74d6659
[ #2497 ] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
4 years ago
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
4 years ago
rinpatch
0d2814ec8e
Metadata: Move restriction check from Feed provider to activated_providers
4 years ago
Mark Felder
2011142ed9
Use :restrict_unauthenticated testing for more granular control
4 years ago
Mark Felder
a85ed6defb
Do not serve RSS/Atom feeds when instance is private
4 years ago
Mark Felder
14d07081fd
Feed provider only generates a redirect, so always activate it.
...
Making this configurable is misleading.
4 years ago
Mark Felder
ff07014b26
Disable providers of user and status metadata when instance is private
4 years ago
Mark Felder
630444ee08
Do not make RelMe metadata provider optional.
...
There's really no sound reason to turn this off anyway.
4 years ago
Haelwenn (lanodan) Monnier
10ef532c63
AP C2S: Restrict character limit on Note
4 years ago
Egor Kislitsyn
a781ac6ca5
Fix atom leak in AdminAPIController
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
Roman Chvanikov
91b9985e1c
Pass expires_in param from status controller
4 years ago
Roman Chvanikov
880a92ccc7
Merge branch 'develop' into feature/expire-mutes
4 years ago
Roman Chvanikov
e3f845b243
Add expiring mutes for activities
4 years ago
rinpatch
4b76d7ce67
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
...
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
4 years ago
lain
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
4 years ago
feld
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
4 years ago
rinpatch
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
4 years ago
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
4 years ago
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
4 years ago
rinpatch
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
4 years ago
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
4 years ago
rinpatch
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
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
lain
fdab01ab56
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
4 years ago
Maksim Pechnikov
917d325972
added api spec
4 years ago
Maksim Pechnikov
5ae56aafb2
added import mutes
4 years ago
rinpatch
170599c390
RichMedia: do not log webpages missing metadata as errors
...
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
4 years ago
rinpatch
e198ba492e
Rich Media: Do not cache URLs for preview statuses
...
Closes #1987
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
Ivan Tashkinov
c3b02341bf
[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
4 years ago
Mark Felder
d1e1057e22
Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy
4 years ago
Mark Felder
6141eb94ab
Fetch preview requests through the MediaProxy. Separate connection options are not needed.
...
Use a separate pool for preview requests
4 years ago
Ivan Tashkinov
60c925380d
[ #2497 ] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).
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
feld
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
4 years ago
lain
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
4 years ago
lain
581f382e71
ListController: DRY up stuff.
4 years ago
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
4 years ago
rinpatch
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
4 years ago
rinpatch
19691389b9
Rich media: Add failure tracking
4 years ago
rinpatch
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
4 years ago
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
4 years ago
Ivan Tashkinov
6ce28c4091
[ #2497 ] Fix for png media proxy preview response headers (content-type & content-disposition).
4 years ago
Alexander Strizhakov
03d06062ab
don't fail on url fetch
4 years ago
Haelwenn (lanodan) Monnier
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
4 years ago
rinpatch
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
4 years ago
Maksim Pechnikov
0d5088c2b8
remove `unread_conversation_count` from User
4 years ago
Haelwenn (lanodan) Monnier
b960cede9a
common_fixes: Force inserting context and context_id
4 years ago
Haelwenn (lanodan) Monnier
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
4 years ago
Haelwenn (lanodan) Monnier
2ecc7d9230
transmogrifier: Remove mastodon emoji-format from emoji field
4 years ago
Haelwenn
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
4 years ago
lain
0b621a834a
Chats: Add cascading delete on both referenced users.
...
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
4 years ago
Ivan Tashkinov
0a839d51a7
[ #2497 ] Added Cache-Control response header for media proxy preview endpoint.
4 years ago
lain
d91c4feebe
Notification: Small refactor.
4 years ago
Mark Felder
3737f38432
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
Mark Felder
2d2af75777
Support PNG previews to preserve alpha channels
4 years ago
Maksim Pechnikov
f0fefc4f5c
marks notifications as read after mute
4 years ago
Mark Felder
5b4d483f52
Add a note about the avatars and banners situation
4 years ago
Mark Felder
67c79394e8
Support static avatars and header images with Mediaproxy Preview
4 years ago
Mark Felder
ef9d12fcc5
Attempt at supporting video thumbnails via ffmpeg
4 years ago
Haelwenn
6b01a09a08
Merge branch '2078-list-fixes' into 'develop'
...
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
4 years ago
Mark Felder
157ecf4022
Follow redirects.
...
I think we should be using some global adapter options here, though.
4 years ago
lain
78939c1d16
ChatController: Don't die if the recipient is gone.
4 years ago
Mark Felder
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
Mark Felder
eead2276e7
Ensure GIFs are redirected to the original or they become static.
4 years ago
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
4 years ago
Mark Felder
ddbddc08fc
Redirects for videos right now
4 years ago
Mark Felder
899ea2da3e
Switch to imagemagick, only support videos
4 years ago
feld
fb33321fa2
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
...
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
4 years ago
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
lain
112bec5225
Webfinger: Handle bogus ids better.
4 years ago
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
feld
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
4 years ago
Mark Felder
98f8851f29
Use the image thumbnail for rich metadata (OGP/Twittercards)
4 years ago
Maksim Pechnikov
0922791e4d
updated errors on add emoji
4 years ago
Maksim Pechnikov
f5845ff033
upload emoji zip file
4 years ago
Mark Felder
4e6eb22b4a
Try to warm the cache with the preview image if preview proxy enabled
4 years ago
lain
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
4 years ago
Alexander Strizhakov
1f8c32b773
adding actor type in user show
4 years ago
Ivan Tashkinov
aa0a5ffb48
[ #2497 ] Media preview proxy: added `quality` config setting, adjusted width/height defaults.
4 years ago
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
4 years ago
Ivan Tashkinov
02ad1cd8e9
[ #2497 ] Media preview proxy: added Content-Disposition header with filename to response.
4 years ago
Ivan Tashkinov
4ee15e991e
[ #2497 ] Media preview proxy config refactoring & documentation.
4 years ago
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
4 years ago
Maksim Pechnikov
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
4 years ago
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2)
4 years ago
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
4 years ago
Ivan Tashkinov
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
3998ef9d64
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
4 years ago
lain
548ca43bcf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
4 years ago
Haelwenn (lanodan) Monnier
2f8c3c842d
common_fixes: Remove Utils.make_date call
4 years ago
Haelwenn (lanodan) Monnier
c9d6638461
common_fixes: Get fixes common from Audio and Question
4 years ago
Haelwenn (lanodan) Monnier
2bc08d5573
Pipeline Ingestion: Audio
4 years ago
Haelwenn (lanodan) Monnier
7a273087ed
object_validators: Use ecto_types where available
4 years ago
lain
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
4 years ago
Sergey Suprunenko
25c69e271a
Make notifications about new statuses from muted threads read
4 years ago
Maksim Pechnikov
f6da12f45d
fix search media proxy urls
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
4 years ago
Haelwenn (lanodan) Monnier
4f3c955f26
side_effects: Fix typo on notification
4 years ago
Maksim Pechnikov
56470647de
Merge branch 'develop' into issue/1936
4 years ago
lain
2e347e8286
ActivityPub: Remove `reject`, move everything to the Pipeline.
4 years ago
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
4 years ago
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
4 years ago
lain
500576dcb6
Linting fixes.
4 years ago
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
4 years ago
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
4 years ago
lain
3f6d50111e
Linter fixes.
4 years ago
lain
da3f9b9988
Transmogrifier: Remove handling of orphaned accepts
...
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
4 years ago
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
4 years ago
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
4 years ago
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
4 years ago
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
4 years ago
lain
686002164a
Merge branch '204-fix' into 'develop'
...
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
4 years ago
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain
7e4932362b
SideEffects: Handle strange deletion case.
4 years ago
Maksim Pechnikov
345ac512e4
added paginate+search for admin/MediaProxy URLs
4 years ago
lain
11fc90744c
Transmogrifier: Remove duplicate code.
4 years ago
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
Alex Gleason
4af1b80381
Clean up account aliases
4 years ago
Alex Gleason
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Mark Felder
474147a67a
Make a new function instead of overloading register_changeset/3
4 years ago
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
4 years ago
lain
34cbe9f44a
Merge branch 'features/poll-validation' into 'develop'
...
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
4 years ago
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Ivan Tashkinov
135ae4e35a
[ #2025 ] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
4 years ago
lain
10b0e55acf
Merge branch 'whole-word-filter-hotfix' into 'develop'
...
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
4 years ago
Alex Gleason
24ce9c011c
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason
ad9c925efb
Speed up instance timeline query
4 years ago
Mark Felder
81126b0142
Add email to user account only if it exists in LDAP
4 years ago
lain
9d7ce1a6d0
CommonValidations: More refactors.
4 years ago
lain
3655175639
CommonValidations: Refactor `same_domain?`
4 years ago
lain
9c96fc052a
CommonValidations: Extract modification right checker
4 years ago
Mark Felder
2192d1e492
Permit LDAP users to register without capturing their password hash
...
We don't need it, and local auth fallback has been removed.
4 years ago
Mark Felder
0f9aecbca4
Remove fallback to local database when LDAP is unavailable.
...
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
4 years ago
Mark Felder
f7146583e5
Remove LDAP mail attribute as a requirement for registering an account
4 years ago
lain
f889400d05
Questions: Move fixes to validators.
4 years ago
lain
70522989d9
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
00c4c6a382
CommonValidations: Remove superfluous function
...
The `is_active` functionality was integrated into the presence
checker.
4 years ago
lain
19c108170e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
MK Fain
f341a8e142
Update filter_view.ex to return whole_word actual value
4 years ago
Karol Kosek
577b11167c
templates/layout/app.html.eex: fix link color
4 years ago
rinpatch
b1b6a7dfa8
Merge branch 'deactivated-user-posts' into 'develop'
...
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
4 years ago
rinpatch
fede37e4c6
Merge branch 'chore/consolidate-rich-media-http' into 'develop'
...
Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827
4 years ago
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy
4 years ago
lain
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Haelwenn (lanodan) Monnier
0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
4 years ago
lain
1a00713744
CommonValidations: Treat deactivated users as not present.
4 years ago
Mark Felder
016d8d6c56
Consolidate construction of Rich Media Parser HTTP requests
4 years ago
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
4 years ago
lain
5876d5123c
Merge branch 'object-age-fix' into 'develop'
...
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
4 years ago
lain
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
4 years ago
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
4 years ago
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
4 years ago
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
4 years ago
Haelwenn (lanodan) Monnier
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
4 years ago
Ivan Tashkinov
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
4 years ago
lain
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
4 years ago
Haelwenn
d1cf1108ac
Merge branch 'render-preview-cards-in-chats' into 'develop'
...
Render preview cards in chats
See merge request pleroma/pleroma!2816
4 years ago
Haelwenn
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
4 years ago
lain
a3c37379e9
ChatMessage schema: Add preview cards.
4 years ago
lain
781b270863
ChatMessageReferenceView: Display preview cards.
4 years ago
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain
d9bf2c58df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
Haelwenn
269b61a240
Merge branch '1996-dont-break-on-chatmessages' into 'develop'
...
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
4 years ago
lain
de5c7e20a3
Merge branch 'bugfix/remote-user-atom' into 'develop'
...
feed/user_controller: Return 404 when the user is remote
Closes #1911
See merge request pleroma/pleroma!2811
4 years ago
Haelwenn (lanodan) Monnier
2e27847573
feed/user_controller: Return 404 when the user is remote
4 years ago
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
4 years ago
lain
66974e17a0
Endpoint: Serve a dynamically configured admin interface
4 years ago
lain
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
4 years ago
lain
edf8b6abfe
EnsureRePrepended: Don't break on chat messages.
4 years ago
Alex Gleason
2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing
4 years ago
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
4 years ago
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
lain
ad5c42628a
FrontendStatic: Add plug to serve frontends based on configuration.
4 years ago
lain
e5ac9534aa
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
...
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
4 years ago
Alex Gleason
f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
lain
e1a1c8e7de
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
...
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
4 years ago
Haelwenn (lanodan) Monnier
4a6389316d
masto_fe_view: Remove @default_settings
4 years ago
lain
9e6f4694dd
Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
lain
762c9ea564
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alibek Omarov
6107440ea0
OpenAPI: remove accidentally pasted buffer data
4 years ago
Alibek Omarov
b31844d6e0
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
4 years ago
Lain Soykaf
3d13fb05f8
Side Effects: On undoing, put information about the undone object.
4 years ago
Lain Soykaf
91f3cf9bc6
Pipeline: Add embedded object federation.
4 years ago
feld
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
4 years ago
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn
6100b90209
Merge branch '1976-status-view-fixes' into 'develop'
...
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
4 years ago
lain
76aa49a0c5
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
4 years ago
Ivan Tashkinov
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
lain
b2ba70eec4
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
...
Fix #783 : Make MRF reject log as info level instead of error
Closes #783
See merge request pleroma/pleroma!2758
4 years ago
lain
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
4 years ago
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
4 years ago
Ivan Tashkinov
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
4 years ago
lain
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
4 years ago
Lain Soykaf
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
4 years ago
Mark Felder
341a8f3500
Skip the correct plug
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
Mark Felder
97c60b6a43
Merge branch 'develop' into fix/pleroma-api-emoji-packs
4 years ago
lain
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
4 years ago
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
4 years ago
Ivan Tashkinov
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
4 years ago
Alex Gleason
afa8b469ed
Allow restricting public timeline by instance
4 years ago
KokaKiwi
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
4 years ago
Alex Gleason
d0eb43b58b
Add account aliases
4 years ago
Haelwenn
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
4 years ago
Alex Gleason
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Mark Felder
20a496d2cb
Expose the post formats in /api/v1/instance
4 years ago
Mark Felder
62438530e2
TOTP length is configurable, so we can't hardcode this here.
4 years ago
Alex Gleason
5e74556703
Sanitize `reason` param in POST /api/v1/accounts
4 years ago
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder
3be64556db
Improve TOTP token and recovery input fields in OAuth login
4 years ago
Alex Gleason
9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch
0fe36b311c
Merge branch 'features/mrf-reasons' into 'develop'
...
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
4 years ago
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
Haelwenn (lanodan) Monnier
e4beff90f5
Create Question: Add context field to create
4 years ago
Haelwenn (lanodan) Monnier
bfe2dafd39
{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them
4 years ago
Haelwenn (lanodan) Monnier
c19bdc811e
Fix attachments in polls
4 years ago
Haelwenn (lanodan) Monnier
d713930ea7
Fixup for EctoType module move
4 years ago
Haelwenn (lanodan) Monnier
435a65b976
QuestionValidator: Use AttachmentValidator
4 years ago
Haelwenn (lanodan) Monnier
fe6924d00d
CreateGenericValidator: add expires_at
4 years ago
Haelwenn (lanodan) Monnier
82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
4 years ago
Haelwenn (lanodan) Monnier
4f70fd4105
question_validator: remove conversation field
4 years ago
Haelwenn (lanodan) Monnier
173f69c854
question_validator: fix for mastodon poll expiration
...
Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)
4 years ago
Haelwenn (lanodan) Monnier
47ba796f41
create_question_validator: remove validate_recipients_match
4 years ago
Haelwenn (lanodan) Monnier
4644a8bd10
Fix multiple-choice poll detection
4 years ago
Haelwenn (lanodan) Monnier
10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
4 years ago
Haelwenn (lanodan) Monnier
89a2433154
QuestionOptionsValidator: inline schema for replies
4 years ago
Haelwenn (lanodan) Monnier
c5efaf6b00
AnswerValidator: Create
4 years ago
Haelwenn (lanodan) Monnier
7bcd7a9595
QuestionValidator: Create
4 years ago
Alex Gleason
0d004a9d04
Email admins when a new unapproved account is up for review
4 years ago
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason
20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
4 years ago
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by `need_approval`
4 years ago
Alex Gleason
b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
Maksim Pechnikov
1dd767b8c7
Include port in host for signatures
4 years ago
Alex Gleason
a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
feld
3f65f2ea79
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
...
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
4 years ago
feld
2909dc873b
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
...
[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
4 years ago
Ivan Tashkinov
124b4709dc
[ #1940 ] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
feld
246f49d685
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
...
Transmogrifier: filtering weirdness in address fields
Closes #1916
See merge request pleroma/pleroma!2762
4 years ago
Haelwenn (lanodan) Monnier
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
4 years ago
Alex Gleason
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
4 years ago
=
b221b640a2
Transmogrifier: filtering weirdness in address fields
4 years ago
Mark Felder
80c21100db
Merge branch 'develop' into refactor/notification_settings
4 years ago
feld
5d215fd81f
Merge branch 'config-behaviours-runtime' into 'develop'
...
Config/Docs: Expand behaviour suggestions modules at runtime
Closes #1941
See merge request pleroma/pleroma!2755
4 years ago
Haelwenn (lanodan) Monnier
ce243b107f
Use Logger.info for {:reject, reason}
4 years ago
Haelwenn (lanodan) Monnier
2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
4 years ago
Alex Gleason
e4e5577818
Prevent unapproved users from logging in
4 years ago
Alex Gleason
51ab8d0128
Add `account_approval_required` instance setting
4 years ago
href
4347d2de5e
Config/Docs: Expand behaviour suggestions at runtime
4 years ago
Alexander Strizhakov
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
4 years ago
Maksim Pechnikov
62fc8eab0d
fix reset confirmation email in admin section
4 years ago
lain
93e494ec21
ActivityPub: Don't rename a clashing nickname with the same ap id.
4 years ago
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
d23804f191
Use the Pleroma.Config alias
4 years ago
lain
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
4 years ago
lain
f4469dc741
Merge branch 'features/favicons' into 'develop'
...
Add support for remote favicons
See merge request pleroma/pleroma!2261
4 years ago
Haelwenn
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
4 years ago
eugenijm
c2be0da79f
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago
Haelwenn
68036f5a3b
Merge branch 'follow-pipeline' into 'develop'
...
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
4 years ago
lain
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
4 years ago
lain
00e54f8fe7
ActivityPub: Remove `follow` and fix issues.
4 years ago
lain
9dda8b5427
CommonAPI: Switch to pipeline for following.
4 years ago
lain
172f4aff8e
Transmogrifier: Move following to the pipeline.
4 years ago
lain
7d0e2b3fdd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
4 years ago
lain
cdc153db31
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
4 years ago
lain
6335b32aa8
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
...
[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
4 years ago
Ivan Tashkinov
a6495f4a68
[ #1895 ] credo fix.
4 years ago
lain
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
4 years ago
Ivan Tashkinov
3f8370a285
[ #1895 ] Applied code review suggestion.
4 years ago
Maksim Pechnikov
e341f81785
fixed delete `Like` activity in remove user
4 years ago
Haelwenn (lanodan) Monnier
31fef95e35
Add changelog and documentation
4 years ago
Haelwenn (lanodan) Monnier
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
Haelwenn (lanodan) Monnier
013e2c5057
Use instances table instead of Cachex
4 years ago
Haelwenn (lanodan) Monnier
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
4 years ago
Haelwenn (lanodan) Monnier
f6d09fafee
Add support for remote favicons
4 years ago
Haelwenn
a8447c3803
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
...
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
4 years ago
Haelwenn
db13acf242
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
...
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
4 years ago
lain
8939ff39e4
Merge branch 'remove-twitter-api' into 'develop'
...
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
4 years ago
Ivan Tashkinov
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
Mark Felder
18438a9bf0
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
4 years ago
lain
c8dd973af5
AccountController: Remove unused `update_?` routes.
...
These were not documented and are also not used anymore.
4 years ago
lain
59cf78e412
AccountController: Allow removal / reset of user images.
4 years ago
lain
9ad305209a
Merge branch 'bugfix/peertube-videos' into 'develop'
...
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
4 years ago
Haelwenn
fa0fa4552f
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
...
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
4 years ago
Haelwenn (lanodan) Monnier
fbb9743a70
Fix getting videos from peertube
4 years ago
Haelwenn
d81acb5f62
Merge branch 'description-limits' into 'develop'
...
Add limits to image descriptions
See merge request pleroma/pleroma!2724
4 years ago
lain
a6a12b241f
FollowValidator: Add basic validation.
4 years ago
lain
28feba8af4
Preloaders: Remove status_net preloader
4 years ago
lain
1963e143c5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
4 years ago
lain
208baf157a
ActivityPub: Add new 'capabilities' to user.
4 years ago
lain
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain
cc8b4e48d9
InstanceView: Add chat limit, description limit
4 years ago
Alexander Strizhakov
20c27bef40
renaming back and reject nil on create
4 years ago
Sergey Suprunenko
8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Sergey Suprunenko
4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
Roman Chvanikov
fc1f34b851
Delete activity before sending response to client
4 years ago
Ivan Tashkinov
9faa632037
[ #2497 ] Fixed merge issue.
4 years ago
lain
cf56655614
Streamer: Don't filter out announce notifications.
4 years ago
lain
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
4 years ago
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain
945e75c8e8
SearchController: Trim query.
4 years ago
lain
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain
4a7b89e372
ChatMessageValidator: Additional validation.
4 years ago
lain
3ca9af1f9f
Account Schema: Add `accepts_chat_messages`
4 years ago
lain
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
4 years ago
lain
26a7cc3f00
UserView: Add acceptsChatMessages field
4 years ago
lain
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
4 years ago
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
4 years ago
Mark Felder
d44ec2bf4c
Remove camelCase from the keys
4 years ago
Ivan Tashkinov
61180ab6f4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
4 years ago
rinpatch
4c044f6225
Merge branch 'fetcher-fixes' into 'develop'
...
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
4 years ago
lain
bad08f34ca
Credo fixes.
4 years ago
lain
311b7c19d0
Streamer: Align announce streaming with polling.
4 years ago
lain
61fe94d698
SideEffects: Refactor.
4 years ago
lain
fedfe8f7d6
ActivityPub: Handle clashing nicknames for the same ap id
...
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
4 years ago
lain
ce92e6e5ce
Fetcher: Work when we can't get the OP.
4 years ago
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
4 years ago
Mark Felder
5a8e0208b1
Add fields limits to instance metadata, add tests
4 years ago
Mark Felder
0883a706dc
Merge branch 'develop' into activation-meta
4 years ago
Mark Felder
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
4 years ago
lain
8b7055e25e
Credo fixes
4 years ago
lain
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
4 years ago
lain
2382a2a151
Preload: Load the correct instance panel
4 years ago
Egor Kislitsyn
979f02ec94
Fix CastAndValidate plug
4 years ago
Egor Kislitsyn
67d92ac7b7
Remove `/statusnet/config`
4 years ago
Egor Kislitsyn
8693e01799
Fix warning
4 years ago
Egor Kislitsyn
4a306720e8
Merge branch 'develop' into remove-twitter-api
4 years ago
lain
59540131c1
Credo fixes.
4 years ago
lain
f308196b75
Token Response: Remove empty file.
4 years ago
lain
e374872fe7
AccountOperation: Correctly describe create response.
4 years ago
lain
bb168ed94a
OAuth: Extract view-type functions to a view.
4 years ago
lain
8630a6c7f5
Preloaders: Use strings as keys.
4 years ago
lain
a19f8778af
User preloader: Put user info at correct key
4 years ago
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
4 years ago
Haelwenn (lanodan) Monnier
9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
4 years ago
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
4 years ago
Mark Felder
69848d5c97
Rename notification "privacy_option" setting
4 years ago
Haelwenn
bf1c5e255a
Merge branch 'block-handling' into 'develop'
...
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
4 years ago
Haelwenn
09478c9cf7
Merge branch '1258-anti-link-spam-exemption' into 'develop'
...
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
4 years ago
Mark Felder
fd5e797379
Simplify notification filtering settings further
4 years ago
Mark Felder
b950fb01db
Merge branch 'develop' into refactor/notification_settings
4 years ago
lain
f378e93bf4
AccountController: Return scope in proper format.
4 years ago
lain
a2002ebb63
Preloading: Fix nodeinfo url.
4 years ago
lain
4a7a34ae8c
Preloading: Return correct data for statusnet stuff.
4 years ago
lain
7ed2296416
Nodeinfo: Add chat information back in.
4 years ago
lain
15a8b70318
User: Don't unfollow on block when the relevant setting is set.
4 years ago
lain
c3383d4fab
BlockValidator: Restore old behavior for incoming blocks.
4 years ago
Haelwenn (lanodan) Monnier
27c33f216a
activity_draft: Add source field
4 years ago
Haelwenn (lanodan) Monnier
d6c958b4c2
nodeinfo: Fix MRF transparency
4 years ago
feld
8288419686
Merge branch 'preload-data' into 'develop'
...
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
4 years ago
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
4 years ago
lain
04abee782b
AntiSpamLinkPolicy: Exempt local users.
4 years ago
lain
84f9ca1956
Blocking: Don't federate if the options is set.
4 years ago
lain
44bb7cfccd
ActivityPub: Remove `block`.
4 years ago
lain
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
4 years ago
lain
e38293c8f1
Transmogrifier: Switch to pipeline for Blocks.
4 years ago
lain
89e5b2046b
ObjectValidator: Basic `Block` support.
4 years ago
lain
4c5fb831b3
Status schema: Add parent_visible.
4 years ago
lain
35f6770436
StatusView: Add pleroma.parent_visible
4 years ago
lain
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
4 years ago
lain
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
4 years ago
Roman Chvanikov
1471b70ef1
Merge develop
4 years ago
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
4 years ago
lain
aee815b478
ObjectValidator: Clarify type of object.
4 years ago
lain
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Haelwenn (lanodan) Monnier
c116b6d6d6
ActivityPubController: Update upload_media @doc
...
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
4 years ago
Haelwenn
d21ef5e66b
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
...
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
4 years ago
Mark Felder
df5e048cbb
Do not need a function to provide fallback value with default defined in config.exs
4 years ago
Haelwenn
98f014d3be
Merge branch 'warning/mastofe-settings-blob' into 'develop'
...
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
4 years ago
Haelwenn (lanodan) Monnier
8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob
4 years ago
lain
46f7e51b27
Merge branch 'add-muted-to-notifications' into 'develop'
...
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
4 years ago
Egor Kislitsyn
b3a549e916
Update NotificationOperation spec
4 years ago
Egor Kislitsyn
7e6f43c0d7
Add `is_muted` to notifications
4 years ago
lain
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
4 years ago
lain
8b5bdd164e
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
...
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
4 years ago
lain
b05f795326
Credo fixes
4 years ago
lain
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
4 years ago
rinpatch
c75ba63bef
Merge branch '1865-media-only' into 'develop'
...
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
4 years ago
lain
9438f83f83
Transmogrifier: Handle `Update` with the pipeline.
4 years ago
lain
31a4d42ce0
SideEffects: Handle user updating.
4 years ago
rinpatch
282f492cd5
Merge branch '1883-mrf-chat' into 'develop'
...
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
4 years ago
lain
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
4 years ago
lain
35e9282ffd
HellthreadPolicy: Restrict to Notes and Articles.
4 years ago
Alexander Strizhakov
b5f13af7ba
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
4 years ago
Alexander Strizhakov
c5863438ba
proper error codes for error in adminFE
4 years ago
lain
31761340fe
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
...
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
4 years ago
lain
0e789bc55f
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
4 years ago
lain
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
...
conversation field is still set for outgoing federation for compatibility.
4 years ago
feld
f928267773
Merge branch 'issue/1855' into 'develop'
...
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
4 years ago
Sergey Suprunenko
ac0344dd24
Only accounts with Service actor_type are considered as bots
4 years ago
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials
4 years ago
lain
75670a99e4
UpdateValidator: Only allow updates from the user themselves.
4 years ago
lain
abdb540d45
ObjectValidators: Add basic UpdateValidator.
4 years ago
Ivan Tashkinov
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
Alexander Strizhakov
02ca8a363f
default page size for files
4 years ago
Alexander Strizhakov
3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov
4975ed86bc
emoji pagination for pack show action
4 years ago
Alexander Strizhakov
3becdafd33
emoji packs pagination
4 years ago
Maksim Pechnikov
4044f24e2e
fix test
4 years ago
Mark Felder
2731ea1334
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
4 years ago
Mark Felder
c08c9db0c1
Remove misleading is_ prefix from boolean function
4 years ago
Mark Felder
71a5d9bffb
Empty list as default
4 years ago
Mark Felder
3462d4b995
Merge branch 'develop' into issue/1855
4 years ago
lain
d772361e62
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
4 years ago
Egor Kislitsyn
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
4 years ago
Maksim
9a371bf5f6
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
4 years ago
Maksim
44ce97a9c9
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
4 years ago
Maksim
74fd761637
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
4 years ago
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
4 years ago
Alexander Strizhakov
a77b0388f4
credo fix
4 years ago
Haelwenn
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
4 years ago
href
39f7fc5b8e
Update majic & call plug before OpenApiSpex
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders
4 years ago
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
4 years ago
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
4 years ago
lain
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
stwf
faba1a6e33
fix tests
4 years ago
Maksim Pechnikov
579763126f
Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov
62b8c31b7a
added tests
4 years ago
lain
b7df7436c8
Conversations: Return last dm for conversation, not last message.
4 years ago
Maksim Pechnikov
2e8a236cef
fix invalidates media url's
4 years ago
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
4 years ago
lain
1d625c29a0
ControllerHelper: Always return id field.
4 years ago
lain
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn
520367d6fd
Fix atom leak in Rich Media Parser
4 years ago
Mark Felder
26f710b9e3
Merge branch 'develop' into preload-data
4 years ago
Haelwenn
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
4 years ago
Egor Kislitsyn
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
4 years ago
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
Maksim Pechnikov
f9dcf15ecb
added admin api for MediaProxy cache invalidation
4 years ago
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
Egor Kislitsyn
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
4 years ago
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Ivan Tashkinov
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
lain
5e44e9d698
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
rinpatch
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
4 years ago
lain
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
lain
86fec45f40
ControllerHelper: Fix wrong comparison.
4 years ago
lain
b4c50be9df
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain
be7c322865
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain
c4f267b3be
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain
1b746cfbbb
Merge branch 'add-url-to-admin-account-view' into 'develop'
...
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
4 years ago
Egor Kislitsyn
3dd1de61a7
Add `url` field to AdminAPI.AccountView
4 years ago
lain
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
4 years ago
lain
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn (lanodan) Monnier
fe1cb56fdc
transmogrifier: MIME.valid?/1 for mediaType
...
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
4 years ago
Roman Chvanikov
604a83ae3e
merge develop
4 years ago
Egor Kislitsyn
d44843e677
Restrict ActivityExpirationPolicy to Notes only
4 years ago
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
lain
d192492658
Merge branch 'openapi/admin/relay' into 'develop'
...
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
4 years ago
lain
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
89b85f6529
ChatController: Remove nonsensical pagination.
4 years ago
lain
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
fe2a5d0614
ChatController: Make last_read_id mandatory.
4 years ago
lain
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
4 years ago
lain
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
4 years ago
lain
0365053c8d
AttachmentValidator: Check if the mime type is valid.
4 years ago
lain
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
4 years ago
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
4 years ago
lain
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
4 years ago