7849 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maxim Filippov	404a9ccb9a	Stats: return status counts by scope	2019-12-18 23:17:34 +03:00
Haelwenn	38ad407395	Merge branch 'hide-followers-count' into 'develop' ... Hide follower counter when hiding is activated Closes #1450 See merge request pleroma/pleroma!2072	2019-12-17 06:43:15 +00:00
Egor Kislitsyn	8f79f433bc	Hide follower counter when hiding is activated	2019-12-17 13:34:07 +07:00
lain	804b961d3c	Merge branch 'fix/remove-useless-sleep' into 'develop' ... Remove useless sleeping/reduce it See merge request pleroma/pleroma!2069	2019-12-16 17:07:13 +00:00
rinpatch	e659fbfbf9	Merge branch 'kocaptcha-default-endpoint' into 'develop' ... Add default endpoint to Pleroma.Captcha.Kocaptcha See merge request pleroma/pleroma!2070	2019-12-16 13:08:00 +00:00
Egor Kislitsyn	fc484e5ce6	Add Kocaptcha endpoint to config.exs	2019-12-16 19:35:10 +07:00
Egor Kislitsyn	8d242f52d4	Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" ... This reverts commit 82c62c5028.	2019-12-16 19:33:51 +07:00
Egor Kislitsyn	82c62c5028	Add default endpoint to Pleroma.Captcha.Kocaptcha	2019-12-16 15:32:33 +07:00
rinpatch	eae65e3216	formatting	2019-12-16 01:37:33 +03:00
rinpatch	6ffbfdeeb2	tests: significantly reduce streamer timeout ... there is no reason IPC between two processes on the same node should take 4 seconds	2019-12-16 01:22:01 +03:00
rinpatch	54029fe212	tests: remove a useless sleep in rate limiter tests ... It was used to check that authenticated and unauthenticated users have different limits. Instead of sleeping a super low limit for unauthenticated users was set, preventing them from doing 5 requests in the first place.	2019-12-16 01:03:13 +03:00
rinpatch	137a3d220b	tests: remove a useless 1 second sleep ... there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.	2019-12-16 00:51:59 +03:00
rinpatch	814a99c80f	tests: remove a useless 3 second sleep ... the ids favs use are accurate down to a microsecond, there is no need for it	2019-12-16 00:50:39 +03:00
rinpatch	c8046e1080	tests: Replace 2 second sleep with offseting updated_at	2019-12-16 00:50:15 +03:00
Haelwenn	8efacfed67	Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop' ... Publisher: check out a connection for inserting publish_one jobs See merge request pleroma/pleroma!2063	2019-12-13 14:58:35 +00:00
rinpatch	bcd16676a7	Publisher: check out a connection for inserting publish_one jobs ... Related to #1474, federation of one post on my istance creates in best-case 360 jobs, so if they for some reason take a while to insert, it will exhaust the connection pool. This fixes it by checking out one dedicated connection for inserting them.	2019-12-13 14:27:10 +03:00
lain	2f31cef71f	Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060	2019-12-12 18:43:21 +00:00
lain	8ad6d2784c	Merge branch 'uguu' into 'develop' ... Update frontend See merge request pleroma/pleroma!2062	2019-12-12 16:40:39 +00:00
lain	756a029edf	Update frontend	2019-12-12 17:05:22 +01:00
lain	f44794d273	Merge branch '1427-oauth-graceful-admin-scope' into 'develop' ... [#1427] Graceful clearance of OAuth admin scopes for non-admin users Closes #1427 See merge request pleroma/pleroma!2061	2019-12-12 13:26:39 +00:00
Ivan Tashkinov	81b05340e9	[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). ... PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.	2019-12-12 16:00:06 +03:00
Egor Kislitsyn	470a3a678d	Add Kocaptcha endpoint to the test config	2019-12-12 18:04:52 +07:00
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	2019-12-12 17:39:39 +07:00
lain	79532a7f7c	Merge branch 'revert-bca1512d' into 'develop' ... Revert "Merge branch 'admin-scope-support-code' into 'develop'" See merge request pleroma/pleroma!2059	2019-12-12 09:46:16 +00:00
lain	2792672793	Revert "Merge branch 'admin-scope-support-code' into 'develop'" ... This reverts merge request !2055	2019-12-12 09:37:02 +00:00
lain	68a667a465	Merge branch 'test-timeout' into 'develop' ... Fix intermittent failures in federated testing See merge request pleroma/pleroma!2058	2019-12-12 09:31:50 +00:00
lain	8cb852523a	Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' ... AdminAPI: Merge account views for list instance statuses See merge request pleroma/pleroma!2054	2019-12-12 09:28:27 +00:00
feld	2aa609db8a	Merge branch 'feature/report-notes' into 'develop' ... AdminAPI: Add report notes See merge request pleroma/pleroma!2031	2019-12-11 23:45:44 +00:00
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	2019-12-12 02:16:23 +03:00
feld	fd697cf209	Merge branch 'issue/1411' into 'develop' ... [#1411] /api/v1/favourites: added sorting for activites by adds to favorites See merge request pleroma/pleroma!1991	2019-12-11 22:37:16 +00:00
Mark Felder	0867064441	Document the favorites timeline order change	2019-12-11 15:03:54 -06:00
Mark Felder	9ef912aecf	Merge branch 'develop' into issue/1411	2019-12-11 15:02:53 -06:00
stwf	63ffa0e3ed	try local sheduling	2019-12-11 14:57:33 -05:00
rinpatch	92b4a1aa1b	Merge branch 'chore/fast_sanitize_bump' into 'develop' ... mix.lock: update fast_sanitize See merge request pleroma/pleroma!2056	2019-12-11 17:57:41 +00:00
rinpatch	c01b39579d	mix.lock: update fast_sanitize ... the new version uses html-spec compliant fragment parsing instead of just wrapping the fragment in the <body> tag.	2019-12-11 20:44:45 +03:00
rinpatch	bca1512dae	Merge branch 'admin-scope-support-code' into 'develop' ... FE bundle updates: admin-fe and pleroma-fe See merge request pleroma/pleroma!2055	2019-12-11 17:38:16 +00:00
Ivan Tashkinov	84f0aec9aa	Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.	2019-12-11 19:48:00 +03:00
Maxim Filippov	82fae3e23f	AdminAPI: Merge account views for list instance statuses	2019-12-11 18:57:36 +03:00
rinpatch	72f3b22134	Merge branch 'domain-block-precedence' into 'develop' ... make follows take precedence over domain blocks See merge request pleroma/pleroma!2019	2019-12-11 09:57:00 +00:00
Sadposter	1ad96d667a	remove single-step pipe	2019-12-11 09:08:20 +00:00
lain	1f498ba2bb	Merge branch '1427-oauth-admin-scopes' into 'develop' ... [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests Closes #1427 See merge request pleroma/pleroma!2053	2019-12-11 08:50:43 +00:00
Ivan Tashkinov	3920244be5	[#1427] Fixed :admin option handling in OAuthScopesPlug, added tests.	2019-12-11 11:42:02 +03:00
Sadposter	457821adb0	Apply suggestion to lib/pleroma/user.ex	2019-12-10 18:49:41 +00:00
feld	67a478d709	Merge branch 'fix/unsubscribe-route' into 'develop' ... Do not apply http signature pipeline to the unsubscribe route See merge request pleroma/pleroma!2052	2019-12-10 17:25:56 +00:00
Sadposter	8cfaab8f04	Merge branch 'develop' into 'domain-block-precedence' ... # Conflicts: # lib/pleroma/user.ex	2019-12-10 16:54:25 +00:00
Sadposter	5abee19b63	make analysis happy	2019-12-10 16:50:58 +00:00
Sadposter	25f774f7c1	format activity_pub.ex	2019-12-10 16:41:43 +00:00
Sadposter	19d228cc58	modify SQL to include followed-but-domain-blocked activities	2019-12-10 16:40:12 +00:00
Egor Kislitsyn	75b419d7c8	Do not apply http signature pipeline to the unsubscribe route	2019-12-10 22:36:03 +07:00
lain	aac0187ec1	Merge branch '1427-oauth-admin-scopes' into 'develop' ... [#1427] OAuth admin scopes Closes #1427 See merge request pleroma/pleroma!2025	2019-12-10 13:44:06 +00:00