11597 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Farhan Khan	173b04df48	Added cmake	2020-09-04 18:03:58 +00:00
Alexander Strizhakov	473458b0fb	fix for ReverseProxy	2020-09-04 14:45:30 +03:00
Alexander Strizhakov	8bd2b6eb13	temp hackney fix	2020-09-04 14:24:15 +03:00
Haelwenn	2b04cdf407	Merge branch 'feat/simplify-pool-managment' into 'develop' ... HTTP: radically simplify pool checkin/checkout See merge request pleroma/pleroma!2948	2020-09-04 10:27:46 +00:00
rinpatch	5dde1fdae2	Merge branch 'chore/fast_html-bump' into 'develop' ... mix.lock: Bump fast_html See merge request pleroma/pleroma!2950	2020-09-04 07:17:10 +00:00
Haelwenn (lanodan) Monnier	bce22937dc	mix.lock: Bump fast_html ... This update fixes an incorrect push to Hex that reverted the gcc-10 fix	2020-09-04 09:15:58 +02:00
rinpatch	d34fe2840d	HTTP: radically simplify pool checkin/checkout ... 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-03 23:44:13 +03:00
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	2020-09-03 11:50:30 +00:00
lain	1d743ca829	Merge branch 'fix_install_fe_bug' into 'develop' ... Fix frontend install mix task bug See merge request pleroma/pleroma!2942	2020-09-03 09:56:17 +00:00
lain	5da3677607	Frontend mix task: Add tests.	2020-09-03 11:40:17 +02:00
lain	f26b580e80	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug	2020-09-03 11:29:39 +02:00
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	2020-09-02 17:11:24 +00:00
lain	0ab03e8564	Merge branch 'fix/1991-tzdata-update' into 'develop' ... user agent if Endpoint is not started yet Closes #1991 See merge request pleroma/pleroma!2945	2020-09-02 17:09:55 +00:00
lain	119e11f455	Merge branch 'bugfix/mastoapi-lists' into 'develop' ... Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940	2020-09-02 17:03:45 +00:00
lain	581f382e71	ListController: DRY up stuff.	2020-09-02 18:32:00 +02:00
Mark Felder	cbf7f0e029	Disallow password resets for deactivated accounts. ... Ensure all responses to password reset events are identical.	2020-09-02 09:09:13 -05:00
rinpatch	d6e979aebe	Merge branch 'feat/rich-media-improvements' into 'develop' ... Rich media improvements See merge request pleroma/pleroma!2944	2020-09-02 13:46:11 +00:00
rinpatch	d48fc90978	StatusView: Start fetching rich media cards as soon as possible	2020-09-02 16:45:54 +03:00
Alexander Strizhakov	a11f23c130	user agent if Endpoint is not started yet	2020-09-02 15:45:47 +03:00
rinpatch	19691389b9	Rich media: Add failure tracking	2020-09-02 14:59:52 +03:00
rinpatch	46236d1d87	html.ex: optimize external url extraction ... By using a :not() selector and only extracting attributes from the first match.	2020-09-02 12:45:20 +03:00
rinpatch	47ff425cfd	Merge branch 'fix/2047-rich-media-parser' into 'develop' ... RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941	2020-09-02 09:38:43 +00:00
rinpatch	b2d776d77d	Merge branch 'http-fixes' into 'develop' ... Improvements and fixes for http requests See merge request pleroma/pleroma!2904	2020-09-02 09:36:56 +00:00
Alexander Strizhakov	84fbf16161	timeout option moved to gun adapter helper	2020-09-02 10:50:51 +03:00
Alexander Strizhakov	1c57ef4498	default pool for tz_data client	2020-09-02 10:33:43 +03:00
rinpatch	96de4bfbca	Merge branch 'fix-searching-following' into 'develop' ... search: fix 'following' query parameter See merge request pleroma/pleroma!2943	2020-09-02 06:55:58 +00:00
Alexander Strizhakov	79f65b4374	correct pool and uniform headers format	2020-09-02 09:16:51 +03:00
Alexander Strizhakov	5e8adf91b4	don't overwrite passed pool option in http clients	2020-09-02 09:04:23 +03:00
Alexander Strizhakov	c17d83cd73	improvements and fixes for http requests ... - 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-02 09:04:23 +03:00
Karol Kosek	868057871a	search: fix 'following' query parameter ... 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-02 02:08:43 +02:00
Sean King	0a9c63fb43	Fix frontend install mix task bug	2020-09-01 12:20:32 -06:00
Alexander Strizhakov	03d06062ab	don't fail on url fetch	2020-09-01 19:39:07 +03:00
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	2020-09-01 12:49:32 +02:00
lain	d48755791d	Merge branch 'fix/static-fe-nil-bio-crash' into 'develop' ... User table: ensure bio is always a string Closes #2067 See merge request pleroma/pleroma!2938	2020-09-01 09:32:01 +00:00
rinpatch	126461942b	User table: ensure bio is always a string ... Gets rid of '|| ""' in multiple places and fixes #2067	2020-09-01 10:45:42 +03:00
Haelwenn (lanodan) Monnier	d9a21e4784	fetcher: Remove fix_object call for Question activities	2020-09-01 08:35:00 +02:00
Haelwenn (lanodan) Monnier	b960cede9a	common_fixes: Force inserting context and context_id	2020-09-01 08:35:00 +02:00
Haelwenn (lanodan) Monnier	a142da3e4f	Add new Emoji Ecto.Type and fix emoji in Question	2020-09-01 08:34:57 +02:00
Haelwenn (lanodan) Monnier	2ecc7d9230	transmogrifier: Remove mastodon emoji-format from emoji field	2020-09-01 08:29:53 +02:00
rinpatch	dc3a418c27	application.ex: disable warnings_as_errors at runtime ... see changed files for rationale	2020-09-01 09:08:54 +03:00
Haelwenn	9d63b2c9db	Merge branch 'chat-relation-constraints' into 'develop' ... Chats: Add cascading delete on both referenced users. See merge request pleroma/pleroma!2934	2020-08-31 20:55:05 +00:00
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.	2020-08-31 16:48:17 +02:00
lain	e0eb90f62a	Merge branch 'issue/2068' into 'develop' ... [#2068] marks notifications as read after mute Closes #2068 See merge request pleroma/pleroma!2930	2020-08-31 09:21:02 +00:00
lain	d91c4feebe	Notification: Small refactor.	2020-08-31 11:02:54 +02:00
rinpatch	0417b2f649	Merge branch 'chore/fast-sanitize-bump' into 'develop' ... mix.lock: bump fast_sanitize See merge request pleroma/pleroma!2932	2020-08-31 07:22:35 +00:00
rinpatch	858e9a59ed	mix.lock: bump fast_sanitize ... The update brings a better error message for when cmake isn't installed	2020-08-31 09:54:16 +03:00
Maksim Pechnikov	f0fefc4f5c	marks notifications as read after mute	2020-08-28 18:17:44 +03:00
lain	51844b1e42	Merge branch 'stable-sync/2.1.0' into 'develop' ... 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	2020-08-28 14:40:26 +00:00
lain	b41c8cff18	Merge branch 'mention-sudo-pleroma-when-updating' into 'develop' ... Add mention of sudo -Hu pleroma to update docs See merge request pleroma/pleroma!2929	2020-08-28 14:12:23 +00:00
Shpuld Shpludson	35da3be9dd	Add mention of sudo -Hu pleroma to docs	2020-08-28 13:50:21 +00:00