aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-04ConnectionPool middleware: Fix connection leak on ReverseProxy redirectsrinpatch
Requires a patched Tesla due to upstream not saving opts between redirects, patch submitted at https://github.com/teamon/tesla/pull/414
2020-09-04Merge branch 'develop' into 'develop'lain
Added cmake See merge request pleroma/pleroma!2953
2020-09-04Added cmakeFarhan Khan
2020-09-04fix for ReverseProxyAlexander Strizhakov
2020-09-04temp hackney fixAlexander Strizhakov
2020-09-04Merge branch 'feat/simplify-pool-managment' into 'develop'Haelwenn
HTTP: radically simplify pool checkin/checkout See merge request pleroma/pleroma!2948
2020-09-04Merge branch 'chore/fast_html-bump' into 'develop'rinpatch
mix.lock: Bump fast_html See merge request pleroma/pleroma!2950
2020-09-04mix.lock: Bump fast_htmlHaelwenn (lanodan) Monnier
This update fixes an incorrect push to Hex that reverted the gcc-10 fix
2020-09-03HTTP: radically simplify pool checkin/checkoutrinpatch
Use a custom tesla middleware instead of adapter helper function + custom redirect middleware. This will also fix "Client died before releasing the connection" messages when the request pool is overloaded. Since the checkout is now done after passing ConcurrentLimiter. This is technically less efficient, since the connection needs to be checked in/out every time the middleware is left or entered respectively. But I don't think the nanoseconds we might lose on redirects to the same host are worth the complexity.
2020-09-03Merge branch 'bugfix/incoming-poll-emoji' into 'develop'lain
Fix emoji in Question, force generated context/context_id insertion Closes #1870 See merge request pleroma/pleroma!2915
2020-09-03Merge branch 'fix_install_fe_bug' into 'develop'lain
Fix frontend install mix task bug See merge request pleroma/pleroma!2942
2020-09-03Frontend mix task: Add tests.lain
2020-09-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
seanking/pleroma-fix_install_fe_bug
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-02Merge branch 'fix/1991-tzdata-update' into 'develop'lain
user agent if Endpoint is not started yet Closes #1991 See merge request pleroma/pleroma!2945
2020-09-02Merge branch 'bugfix/mastoapi-lists' into 'develop'lain
Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
Ensure all responses to password reset events are identical.
2020-09-02Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
Rich media improvements See merge request pleroma/pleroma!2944
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
By using a :not() selector and only extracting attributes from the first match.
2020-09-02Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch
RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941
2020-09-02Merge branch 'http-fixes' into 'develop'rinpatch
Improvements and fixes for http requests See merge request pleroma/pleroma!2904
2020-09-02timeout option moved to gun adapter helperAlexander Strizhakov
2020-09-02default pool for tz_data clientAlexander Strizhakov
2020-09-02Merge branch 'fix-searching-following' into 'develop'rinpatch
search: fix 'following' query parameter See merge request pleroma/pleroma!2943
2020-09-02correct pool and uniform headers formatAlexander Strizhakov
2020-09-02don't overwrite passed pool option in http clientsAlexander Strizhakov
2020-09-02improvements and fixes for http requestsAlexander Strizhakov
- fix for gun worker termination in some circumstances - pool for http clients (ex_aws, tzdata) - default pool timeouts for gun - gun retries on gun_down messages - s3 upload timeout if streaming enabled
2020-09-02search: fix 'following' query parameterKarol Kosek
The parameter included the accounts that are following you (followers) instead of those you are actually following. Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-09-01Fix frontend install mix task bugSean King
2020-09-01don't fail on url fetchAlexander Strizhakov
2020-09-01Fix removing an account from a listHaelwenn (lanodan) Monnier
Mastodon (Frontend) changed a different method for deletes, keeping old format as mastodon documentation is too loose
2020-09-01Merge branch 'fix/static-fe-nil-bio-crash' into 'develop'lain
User table: ensure bio is always a string Closes #2067 See merge request pleroma/pleroma!2938
2020-09-01User table: ensure bio is always a stringrinpatch
Gets rid of '|| ""' in multiple places and fixes #2067
2020-09-01fetcher: Remove fix_object call for Question activitiesHaelwenn (lanodan) Monnier
2020-09-01common_fixes: Force inserting context and context_idHaelwenn (lanodan) Monnier
2020-09-01Add new Emoji Ecto.Type and fix emoji in QuestionHaelwenn (lanodan) Monnier
2020-09-01transmogrifier: Remove mastodon emoji-format from emoji fieldHaelwenn (lanodan) Monnier
2020-09-01application.ex: disable warnings_as_errors at runtimerinpatch
see changed files for rationale
2020-08-31Merge branch 'chat-relation-constraints' into 'develop'Haelwenn
Chats: Add cascading delete on both referenced users. See merge request pleroma/pleroma!2934
2020-08-31Chats: Add cascading delete on both referenced users.lain
Also remove the now-superfluous join in the chat controller, which was only used to filter out these cases.
2020-08-31Merge branch 'issue/2068' into 'develop'lain
[#2068] marks notifications as read after mute Closes #2068 See merge request pleroma/pleroma!2930
2020-08-31Notification: Small refactor.lain
2020-08-31Merge branch 'chore/fast-sanitize-bump' into 'develop'rinpatch
mix.lock: bump fast_sanitize See merge request pleroma/pleroma!2932
2020-08-31mix.lock: bump fast_sanitizerinpatch
The update brings a better error message for when cmake isn't installed
2020-08-28marks notifications as read after muteMaksim Pechnikov
2020-08-28Merge branch 'stable-sync/2.1.0' into 'develop'lain
Merge stable in develop and bump development version Closes #1610, #1621, #1613, #1375, #1374, #1614, #1422, #1595, #1620, #1364, #1640, #1643, #1653, #1624, #764, #1687, #1698, #1670, #1677, #1727, #1559, #1746, #1313, #1810, #751, and #866 See merge request pleroma/pleroma!2928