summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-14Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxymedia-preview-proxyIvan Tashkinov
2020-09-14[#2497] Prototype of video streaming for media preview proxy (WIP).Ivan Tashkinov
2020-09-14Merge branch 'remove/managed-config-option' into 'develop'rinpatch
Remove `:managed_config` option. Closes #2086 See merge request pleroma/pleroma!2983
2020-09-14Remove `:managed_config` option.rinpatch
In practice, it was already removed half a year ago, but the description and cheatsheet entries were still there. The migration intentionally does not use ConfigDB.get_by_params, since this will break migration code as soon as we add a new field is added to ConfigDB. Closes #2086
2020-09-14Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch
RichMedia: fix a compilation error due to nonexistent variable See merge request pleroma/pleroma!2996
2020-09-14RichMedia: fix a compilation error due to nonexistent variablerinpatch
No idea why this passed Gitlab CI
2020-09-14Merge branch 'feat/rich-media-head' into 'develop'rinpatch
RichMedia: Do a HEAD request to check content type/length See merge request pleroma/pleroma!2995
2020-09-14Apply 1 suggestion(s) to 1 file(s)rinpatch
2020-09-14RichMedia: Do a HEAD request to check content type/lengthrinpatch
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-14RichMedia parser: do not set a cache TTL for unchanging errorsrinpatch
2020-09-14Merge branch 'fix/2139-oban-migration' into 'develop'rinpatch
Remove old workers in oban migrations Closes #2139 See merge request pleroma/pleroma!2994
2020-09-13remove old workers in oban migrationsAlexander Strizhakov
2020-09-12Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!2991
2020-09-12[#2497] Media preview proxy: preview bypass for small imagesIvan Tashkinov
(basing on Content-Length and Content-Type).
2020-09-12[#2497] Media preview proxy: redirecting to media proxy url in case of ↵Ivan Tashkinov
preview error or unsupported content type.
2020-09-11Translated using Weblate (Spanish)tarteka
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-11Merge branch 'chore/docs-spelling' into 'develop'feld
Spelling nit See merge request pleroma/pleroma!2993
2020-09-11SpellingMark Felder
Reported by: trevoke
2020-09-11Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxyIvan Tashkinov
# Conflicts: # lib/pleroma/instances/instance.ex
2020-09-11Merge branch 'feat/log-possible-hol' into 'develop'rinpatch
ConnectionPool: Log possible HTTP1 blocks See merge request pleroma/pleroma!2989
2020-09-11ConnectionPool: Log possible HTTP1 blocksrinpatch
2020-09-11Merge branch 'bugfix/favicon-none-found' into 'develop'rinpatch
instance: Handle not getting a favicon See merge request pleroma/pleroma!2988
2020-09-11instance: Handle not getting a faviconHaelwenn (lanodan) Monnier
2020-09-11Merge branch 'fix/2134-old-cron-jobs' into 'develop'Haelwenn
Migration to remove old cron jobs Closes #2134 See merge request pleroma/pleroma!2987
2020-09-11migration to remove old cron jobsAlexander Strizhakov
2020-09-10Merge branch 'oban-overuse' into 'develop'rinpatch
Expired activities as scheduled jobs in Oban See merge request pleroma/pleroma!2916
2020-09-10[#2497] Formatting fix.Ivan Tashkinov
2020-09-10CHANGELOG.md: clarify that the functionality is not removed, just the config ↵rinpatch
options
2020-09-10remove validate_expires_at from enqueue methodAlexander Strizhakov
2020-09-10Document ephemeral activity changes betterrinpatch
Also remove the example from the cheatsheet, there is no need for it when the types are simple
2020-09-10configurable lifetime for ephemeral activitiesAlexander Strizhakov
2020-09-10changelogAlexander Strizhakov
2020-09-10oban warningAlexander Strizhakov
2020-09-10migration fixAlexander Strizhakov
2020-09-10pin/unpin for activities with expires_at optionAlexander Strizhakov
2020-09-10little clean upAlexander Strizhakov
2020-09-10use another stream function in migrationAlexander Strizhakov
2020-09-10expiration for new pipelineAlexander Strizhakov
2020-09-10reject activity creationAlexander Strizhakov
if passed expires_at option and expiring activities are not configured
2020-09-10copyright headerAlexander Strizhakov
2020-09-10drop activity_expirations tableAlexander Strizhakov
2020-09-10move old expirations into ObanAlexander Strizhakov
2020-09-10deprecation warningAlexander Strizhakov
changed namespace for activity expiration configuration
2020-09-10don't expire pinned postsAlexander Strizhakov
2020-09-10schedule activity expiration in ObanAlexander Strizhakov
2020-09-10Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'rinpatch
Feature/1790 removing expired tokens through Oban scheduled jobs See merge request pleroma/pleroma!2957
2020-09-10Merge branch 'chores/remove-ostatus-fixtures' into 'develop'rinpatch
Remove OStatus in testsuite See merge request pleroma/pleroma!2968
2020-09-10Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982
2020-09-10Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'rinpatch
[#2130] Fixed OAuth OOB authentication for users with enabled MFA Closes #2130 See merge request pleroma/pleroma!2979
2020-09-10Streaming integration tests: remove unexpected error assumptionrinpatch
For some reason instead of fixing unexpected errors, we made tests assert they indeed trigger... Now that the errors are fixed these were failing