rinpatch
bb407edce4
RichMedia: fix a compilation error due to nonexistent variable
...
No idea why this passed Gitlab CI
2020-09-14 15:46:00 +03:00
rinpatch
4d543fcb75
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
2020-09-14 12:38:00 +00:00
rinpatch
738685a629
Apply 1 suggestion(s) to 1 file(s)
2020-09-14 11:56:00 +00:00
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).
2020-09-14 14:45:58 +03:00
rinpatch
f66a15c4a5
RichMedia parser: do not set a cache TTL for unchanging errors
2020-09-14 14:44:25 +03:00
Maksim Pechnikov
3e53ab4e98
added notification constraints
2020-09-14 14:08:12 +03:00
rinpatch
2937e3095a
Merge branch 'fix/2139-oban-migration' into 'develop'
...
Remove old workers in oban migrations
Closes #2139
See merge request pleroma/pleroma!2994
2020-09-14 07:54:06 +00:00
Maksim
489a107cf4
Apply 1 suggestion(s) to 1 file(s)
2020-09-13 11:54:15 +00:00
Alexander Strizhakov
65f4e37ee1
remove old workers in oban migrations
2020-09-13 10:04:50 +03:00
Haelwenn
88fe0a262e
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!2991
2020-09-12 08:26:41 +00:00
Ivan Tashkinov
cd234a5321
[ #2497 ] Media preview proxy: preview bypass for small images
...
(basing on Content-Length and Content-Type).
2020-09-12 11:20:41 +03:00
Ivan Tashkinov
32831f371f
[ #2497 ] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.
2020-09-12 10:33:42 +03:00
Mark Felder
c0b36621f1
Ensure we only apply NSFW Simple policy on parsable objects
2020-09-11 23:22:14 -05:00
tarteka
6877bad44c
Translated using Weblate (Spanish)
...
Currently translated at 20.7% (22 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
2020-09-11 23:15:02 +00:00
2b06805ad5
Merge branch 'chore/docs-spelling' into 'develop'
...
Spelling nit
See merge request pleroma/pleroma!2993
2020-09-11 23:14:54 +00:00
Mark Felder
40c847dc2a
Spelling
...
Reported by: trevoke
2020-09-11 17:42:39 -05:00
Alex Gleason
c4061f06ba
Merge branch 'chat-moderation-stable' into chat-moderation
2020-09-11 14:30:28 -05:00
Alex Gleason
bc86d0a906
Chat moderation: fix formatting
2020-09-11 14:29:56 -05:00
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
Alex Gleason
dfb831ca39
Chat moderation: add tests for unauthorized access
2020-09-11 14:11:07 -05:00
Alex Gleason
e229536e5c
Chat Moderation: use explicit sender and recipient fields
2020-09-11 14:11:00 -05:00
Alex Gleason
67726453f8
Credo fix
2020-09-11 14:10:52 -05:00
Alex Gleason
c361df11b4
Docs: AdminAPI chat moderation
2020-09-11 14:10:45 -05:00
Alex Gleason
02d70228b5
AdminAPI: fix delete chat message
2020-09-11 14:10:35 -05:00
Alex Gleason
9dd0b23da4
AdminAPI: show chat
2020-09-11 14:10:28 -05:00
Alex Gleason
f13b52a703
AdminAPI: list messages in a chat
2020-09-11 14:10:19 -05:00
Alex Gleason
c41430b23e
Refactor with Chat.for_user_query/1
2020-09-11 14:10:13 -05:00
Alex Gleason
fb0de07343
AdminAPI: list chats for a user
2020-09-11 14:10:05 -05:00
Alex Gleason
b40a627ab0
AdminAPI: delete a chat message
2020-09-11 14:09:58 -05:00
Alex Gleason
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-09-11 14:09:50 -05:00
Haelwenn (lanodan) Monnier
f1f44069ae
Fetcher: Correctly return MRF reject reason
2020-09-11 20:00:41 +02:00
Ivan Tashkinov
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
rinpatch
9fb88c814d
Merge branch 'feat/log-possible-hol' into 'develop'
...
ConnectionPool: Log possible HTTP1 blocks
See merge request pleroma/pleroma!2989
2020-09-11 12:50:05 +00:00
rinpatch
89a7efab69
ConnectionPool: Log possible HTTP1 blocks
2020-09-11 15:37:39 +03:00
Haelwenn
36c9197ac3
Apply 1 suggestion(s) to 1 file(s)
2020-09-11 10:46:16 +00:00
rinpatch
53dc61ba90
Merge branch 'bugfix/favicon-none-found' into 'develop'
...
instance: Handle not getting a favicon
See merge request pleroma/pleroma!2988
2020-09-11 10:42:25 +00:00
Haelwenn (lanodan) Monnier
dbc013f24c
instance: Handle not getting a favicon
2020-09-11 11:37:46 +02:00
Haelwenn
03d1730f30
Merge branch 'fix/2134-old-cron-jobs' into 'develop'
...
Migration to remove old cron jobs
Closes #2134
See merge request pleroma/pleroma!2987
2020-09-11 08:58:01 +00:00
Alexander Strizhakov
e3ca0a7e2d
migration to remove old cron jobs
2020-09-11 09:09:28 +03:00
Haelwenn (lanodan) Monnier
f18178cb09
AttachmentValidator: directly embed url schema and pass it fix_media_type
2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier
1b3d5956b1
Pipeline Ingestion: Article
2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier
2132b24a9d
object_validators: likes & announcements as [ObjectID]
2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier
846b59ccb0
Pipeline Ingestion: Video
2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier
b73e9ef686
transmogrifier: Call strip_internal_fields on pipeline ingestion
2020-09-11 01:39:38 +02:00
Haelwenn (lanodan) Monnier
da876d09e8
federator: normalize only actor, catch actor error
2020-09-11 00:56:21 +02:00
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
rinpatch
6316350918
Merge branch 'oban-overuse' into 'develop'
...
Expired activities as scheduled jobs in Oban
See merge request pleroma/pleroma!2916
2020-09-10 19:17:15 +00:00
Ivan Tashkinov
4d18a50f3c
[ #2497 ] Formatting fix.
2020-09-10 21:54:26 +03:00
rinpatch
82b56cdb9b
CHANGELOG.md: clarify that the functionality is not removed, just the config options
2020-09-10 21:53:58 +03:00
Alexander Strizhakov
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
