summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-09-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-expl...matrix-explorationslain
2020-09-07Merge branch 'temp-hackney-fix' into 'develop'rinpatch
2020-09-07Merge branch 'chore/back-to-upstream-tesla' into 'develop'rinpatch
2020-09-07switch back to upstream teslarinpatch
2020-09-07Add a changelog entry for hackney downgraderinpatch
2020-09-07Merge branch 'bugfix/favicon-too-long' into 'develop'rinpatch
2020-09-07Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
2020-09-07Merge branch 'fix/no-rich-media-error' into 'develop'Haelwenn
2020-09-07Merge branch 'chore/add-cc-by-4' into 'develop'Haelwenn
2020-09-07instance: Log catch favicon errors as warningsHaelwenn (lanodan) Monnier
2020-09-06Add a copy of CC-BY-4.0 to the reporinpatch
2020-09-05RichMedia: do not log webpages missing metadata as errorsrinpatch
2020-09-05Merge branch 'hotfix-the-hotfix' into 'develop'rinpatch
2020-09-05ConnectionPool middleware: handle connection opening errorsrinpatch
2020-09-05ConnectionPool: fix the previous hotfixrinpatch
2020-09-05Merge branch 'hotfix/tesla-env-no-access' into 'develop'rinpatch
2020-09-05ConnectionPool middleware: fix a crash due to unimplemented behaviourrinpatch
2020-09-05Rich Media: Do not cache URLs for preview statusesrinpatch
2020-09-05Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'rinpatch
2020-09-05use override flag for hackney dependencyAlexander Strizhakov
2020-09-05Prevent AccountView and instance.get_or_update_favicon failsHaelwenn (lanodan) Monnier
2020-09-05Merge branch 'use-https-in-dockerfile' into 'develop'Haelwenn
2020-09-04Use TLS when adding Alpine community repository in DockerfileJames Alseth
2020-09-04ConnectionPool middleware: Fix connection leak on ReverseProxy redirectsrinpatch
2020-09-04Merge branch 'develop' into 'develop'lain
2020-09-04Added cmakeFarhan Khan
2020-09-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-expl...lain
2020-09-04fix for ReverseProxyAlexander Strizhakov
2020-09-04temp hackney fixAlexander Strizhakov
2020-09-04Merge branch 'feat/simplify-pool-managment' into 'develop'Haelwenn
2020-09-04Merge branch 'chore/fast_html-bump' into 'develop'rinpatch
2020-09-04mix.lock: Bump fast_htmlHaelwenn (lanodan) Monnier
2020-09-03HTTP: radically simplify pool checkin/checkoutrinpatch
2020-09-03Merge branch 'bugfix/incoming-poll-emoji' into 'develop'lain
2020-09-03Merge branch 'fix_install_fe_bug' into 'develop'lain
2020-09-03Frontend mix task: Add tests.lain
2020-09-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pl...lain
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-02Merge branch 'fix/1991-tzdata-update' into 'develop'lain
2020-09-02Merge branch 'bugfix/mastoapi-lists' into 'develop'lain
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
2020-09-02Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
2020-09-02StatusView: Start fetching rich media cards as soon as possiblerinpatch
2020-09-02user agent if Endpoint is not started yetAlexander Strizhakov
2020-09-02Rich media: Add failure trackingrinpatch
2020-09-02html.ex: optimize external url extractionrinpatch
2020-09-02Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch
2020-09-02Merge branch 'http-fixes' into 'develop'rinpatch
2020-09-02timeout option moved to gun adapter helperAlexander Strizhakov