5435 commits

Author	SHA1	Message	Date
Tusooa Zhu	72bdb0640f	Allow user to register with custom language	2022-06-29 20:46:51 +01:00
Tusooa Zhu	7726148472	Send emails i18n'd using backend-stored user language	2022-06-29 20:45:19 +01:00
Tusooa Zhu	4ed0a780b7	Fix digest test	2022-06-29 20:45:05 +01:00
Tusooa Zhu	775f997c40	Prefer userLanguage cookie over Accept-Language header in detecting locale ... https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60	2022-06-29 20:43:41 +01:00
Ilja	1048bc1bb9	Delete report notifs when demoting from superuser ... When someone isn't a superuser any more, they shouldn't see the reporsts any more either. Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.	2022-06-29 20:43:41 +01:00
Ilja	8b843be03e	Fix test get_user_apps/1 ... For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added. When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy. The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing. AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62	2022-06-29 20:43:41 +01:00
Sam Therapy	8de65de3b9	Add unicode 14 support ... and add a test with a unicode 14 emoji	2022-06-29 20:43:41 +01:00
floatingghost	2342fface1	Add visibility check in context path (#26) ... Reviewed-on: #26	2022-06-29 09:33:57 +00:00
floatingghost	e6cd61619f	Purge SSH frontend (#23) ... Reviewed-on: #23	2022-06-27 11:32:06 +00:00
FloatingGhost	cac39ef817	Bugfix: standardise scheme for emoji reactions	2022-06-25 15:27:46 +01:00
FloatingGhost	cad4ba2ab3	mix format	2022-06-22 17:20:55 +01:00
FloatingGhost	3928cecf6b	ensure local statuses are not visible remotely	2022-06-22 17:06:40 +01:00
FloatingGhost	502382da45	cherry-pick security from upstream	2022-06-22 16:25:05 +01:00
sn0w	f2f8b81fc4	Use mediaproxy for emoji notifications if enabled	2022-06-17 14:27:22 +02:00
FloatingGhost	af1bd3af59	mix format	2022-06-14 17:43:45 +01:00
FloatingGhost	6e1d9c63da	allow %{source} dict in no_empty	2022-06-14 17:41:25 +01:00
FloatingGhost	abefbcec64	Merge branch 'mfm' into develop	2022-06-14 16:25:47 +01:00
FloatingGhost	829ae13572	ensure tests pass	2022-06-14 16:24:03 +01:00
sn0w	60bfaed368	Allow reacting with emojis containing a number	2022-06-14 11:47:09 +02:00
FloatingGhost	0f5bea2465	Add emoji_url to notifications to allow rendering ... Ref #5	2022-06-12 13:35:14 +01:00
FloatingGhost	2abf8c982e	fix secret key failure	2022-06-11 16:48:04 +01:00
FloatingGhost	24bf8c3977	mix format	2022-06-11 16:14:31 +01:00
FloatingGhost	32fbd2e4e3	fix all tests	2022-06-11 16:14:22 +01:00
FloatingGhost	c3ed86cd1e	fix emoji controller tests	2022-06-11 14:21:50 +01:00
FloatingGhost	142646426e	fix emoji tests	2022-06-11 14:08:54 +01:00
FloatingGhost	0f6bece60d	Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop	2022-01-08 21:45:12 +00:00
FloatingGhost	0d012ebea1	Revert "Merge branch 'remove/mastofe' into 'develop'" ... This reverts commit 6b3842cf50, reversing changes made to 6b1282a829.	2022-01-08 21:44:37 +00:00
FloatingGhost	8cc6359a85	Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop	2022-01-07 20:23:53 +00:00
FloatingGhost	25b4395830	just drop unknown tags	2022-01-07 20:14:04 +00:00
FloatingGhost	92d3742072	Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop	2022-01-07 17:21:44 +00:00
FloatingGhost	9ee27fb5ec	add bookwyrm entity tests	2022-01-07 17:17:18 +00:00
FloatingGhost	680c5d8d89	Add compatibility with bookwyrm's weird entities	2022-01-07 16:51:04 +00:00
Alex Gleason	2ae867842b	StreamerTest: tag erratic test	2021-12-31 10:29:50 -06:00
FloatingGhost	12a171844b	Merge remote-tracking branch 'upstream/develop' into develop	2021-12-30 18:05:22 +00:00
marcin mikołajczak	746c9daa62	Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 16:27:27 +01:00
marcin mikołajczak	f734579965	MastoAPI: Add GET /api/v1/accounts/lookup ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 16:11:17 +01:00
Alex Gleason	5c80d4087d	PleromaAPI.AppView: add test	2021-12-27 18:52:34 -06:00
Alex Gleason	cb2a072e62	Apps: add test for get_user_apps/1	2021-12-27 18:29:03 -06:00
Alex Gleason	2e4a1c56c3	AppController: test creating with and without a user	2021-12-27 18:14:15 -06:00
Alex Gleason	f5c3d45120	Merge remote-tracking branch 'origin/develop' into apps-api-endpoint	2021-12-27 18:01:25 -06:00
Alex Gleason	d61a5515e6	ConnectionPoolTest: tag erratic test	2021-12-27 11:27:25 -06:00
Alex Gleason	479fc5fff8	EnsureStaffPrivilegedPlug: add tests	2021-12-27 10:39:59 -06:00
Alex Gleason	913141379c	Merge branch 'profile-directory' into 'develop' ... MastoAPI: Profile directory See merge request pleroma/pleroma!3573	2021-12-26 02:35:17 +00:00
marcin mikołajczak	de006443f0	MastoAPI: Profile directory	2021-12-26 02:35:17 +00:00
Alex Gleason	2c06eff519	Pleroma.Web.base_url() --> Endpoint.url()	2021-12-25 20:11:14 -06:00
Alex Gleason	db2bf55e9b	Merge remote-tracking branch 'origin/develop' into notice-routes	2021-12-25 19:57:53 -06:00
Alex Gleason	73609211a4	Merge branch 'account-notes' into 'develop' ... MastoAPI: Add user notes on accounts See merge request pleroma/pleroma!3540	2021-12-25 01:41:12 +00:00
Alex Gleason	b96a58ff28	Merge branch 'account-subscriptions' into 'develop' ... MastoAPI: accept notify param in follow request See merge request pleroma/pleroma!3555	2021-12-25 01:34:27 +00:00
Alex Gleason	d9746ae4cb	Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' ... Handle Reject for already-accepted Follows properly Closes #2766 and #2802 See merge request pleroma/pleroma!3568	2021-12-23 16:00:16 +00:00
Alex Gleason	9c1cb87eff	Merge branch 'erratic-tests' into 'develop' ... Skip erratic tests See merge request pleroma/pleroma!3572	2021-12-22 04:14:31 +00:00
Alex Gleason	2ce7dae6de	Skip erratic tests	2021-12-21 22:04:15 -06:00
Alex Gleason	b0d2b53934	Merge branch 'manifest' into 'develop' ... Expose /manifest.json for PWA Closes #882 See merge request pleroma/pleroma!3544	2021-12-19 18:18:59 +00:00
Alex Gleason	1ff9ffed83	Merge branch 'live-dashboard' into 'develop' ... Add Phoenix LiveDashboard See merge request pleroma/pleroma!3566	2021-12-19 17:35:14 +00:00
Alex Gleason	e4f9cb1c1b	Merge remote-tracking branch 'origin/develop' into manifest	2021-12-19 11:33:10 -06:00
Alex Gleason	bd853199d9	Merge branch 'v2-suggestions' into 'develop' ... V2 suggestions See merge request pleroma/pleroma!3547	2021-12-19 17:31:17 +00:00
Tusooa Zhu	8376e83f61	Lint	2021-12-17 16:52:50 -05:00
Tusooa Zhu	951d1592c7	Add test to ensure removed follower cease to have relationship with ex-followee ... https://git.pleroma.social/pleroma/pleroma/-/issues/2802	2021-12-17 16:44:22 -05:00
Tusooa Zhu	bfd870380c	Add test to ensure the blocked cease to have follow relationship to the blocker ... https://git.pleroma.social/pleroma/pleroma/-/issues/2766	2021-12-17 14:44:28 -05:00
Tusooa Zhu	3d41ccc47b	Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2 ... Mastodon uses the Reject activity also for the purpose of removing a follower, in addition to reject a follow request. We should also update the original Follow activity in this case.	2021-12-17 14:17:51 -05:00
FloatingGhost	0c0ea169d4	Merge remote-tracking branch 'upstream/develop' into develop	2021-12-16 16:10:08 +00:00
Alex Gleason	e1b89fe3aa	Merge remote-tracking branch 'origin/develop' into live-dashboard	2021-12-15 19:05:36 -05:00
Alex Gleason	29d80b39f2	Add Phoenix LiveDashboard ... Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>	2021-12-15 19:05:27 -05:00
lain	6eb7d69e60	Merge branch 'delete-account-fix' into 'develop' ... TwitterAPI: allow deleting one's own account with request body Closes #2799 and #2746 See merge request pleroma/pleroma!3564	2021-12-15 21:26:45 +00:00
Alex Gleason	8672ad6b00	TwitterAPI: allow deleting one's own account with request body	2021-12-13 17:07:29 -05:00
FloatingGhost	de60b1f3c1	make search provider configurable	2021-12-12 17:35:35 +00:00
Alex Gleason	938c95d75d	VideoHandlingTest: remove nil values	2021-12-12 17:35:35 +00:00
Haelwenn	ecab82dea7	Apply alexgleason's suggestion(s) to 1 file(s)	2021-12-12 17:35:35 +00:00
Alex Gleason	2936adbbce	Fix VideoHandlingTest	2021-12-12 17:35:34 +00:00
Alex Gleason	da83839dc1	AttachmentValidator: ingest width and height	2021-12-12 17:35:02 +00:00
Alex Gleason	494149f173	Transmogrifier: test fix_attachments/1	2021-12-12 17:35:02 +00:00
FloatingGhost	0fab887eee	make linter happy	2021-12-12 17:35:02 +00:00
FloatingGhost	429407ba0a	Make deactivated user check into a subquery ... Fixes #2792	2021-12-12 17:35:02 +00:00
Alex Gleason	01cc099c8e	VideoHandlingTest: remove nil values	2021-12-07 21:55:54 -05:00
Haelwenn	992d9287d0	Apply alexgleason's suggestion(s) to 1 file(s)	2021-12-07 22:53:36 +00:00
Alex Gleason	2c96668a2c	Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions	2021-12-07 13:41:54 -05:00
Alex Gleason	335684182a	Fix VideoHandlingTest	2021-12-07 13:35:34 -05:00
Alex Gleason	3f03d71ea6	AttachmentValidator: ingest width and height	2021-12-07 12:59:03 -05:00
Alex Gleason	d9349bc52f	Transmogrifier: test fix_attachments/1	2021-12-07 01:10:47 -05:00
marcin mikołajczak	c96e52b88c	Add 'notifying' to relationship for compatibility with Mastodon ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 21:24:12 +01:00
marcin mikołajczak	3892bd353b	Add test for following with subscription ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 21:15:03 +01:00
FloatingGhost	db46913dcc	make linter happy	2021-12-06 11:50:51 +00:00
FloatingGhost	cd8bdbc761	Make deactivated user check into a subquery ... Fixes #2792	2021-12-06 11:44:17 +00:00
Alex Gleason	ba2ed3c255	Fix frontend_status_plug_test.exs	2021-12-03 07:56:26 -06:00
Alex Gleason	8286ceb465	Merge remote-tracking branch 'origin/develop' into password-reset	2021-12-03 00:11:38 -06:00
Alex Gleason	5da4f33bf1	Restore POST /auth/password	2021-12-03 00:10:57 -06:00
Alex Gleason	6519f59d91	v2 Suggestions: return is_suggested through the API	2021-11-26 23:10:01 -06:00
Alex Gleason	e5a7547fbe	v2 Suggestions: also filter out users you follow	2021-11-26 21:46:08 -06:00
Alex Gleason	437c1a5a52	v2 Suggestions: actually flter out dismissed suggestions	2021-11-26 21:09:37 -06:00
Alex Gleason	aee55b9a8b	v2 Suggestions: dismiss a suggestion	2021-11-26 20:19:29 -06:00
Alex Gleason	6c0484d571	AdminAPI: suggest a user through the API	2021-11-26 15:19:01 -06:00
Alex Gleason	b17360cd7c	v2 Suggestions: rudimentary API response	2021-11-26 14:34:10 -06:00
Alex Gleason	7e1caddc58	v2 Suggestions: return empty array	2021-11-25 14:57:36 -06:00
Alex Gleason	720198d569	Merge remote-tracking branch 'pleroma/develop' into manifest	2021-11-24 17:58:58 -06:00
Alex Gleason	cb9359335f	Expose /manifest.json for PWA	2021-11-24 17:50:55 -06:00
marcin mikołajczak	cb76faece9	Update test ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 17:51:00 +01:00
marcin mikołajczak	40414bf177	MastoAPI: Add user notes on accounts ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 16:56:26 +01:00
Alibek Omarov	04aca335aa	nodeinfo: report activeMonth and activeHalfyear users fields	2021-11-15 17:01:30 +01:00
lain	4d341f51e1	Merge branch 'fix-tests' into 'develop' ... Test fixes See merge request pleroma/pleroma!3532	2021-11-15 14:31:27 +00:00
lain	e2772d6bf1	Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242	2021-11-15 14:27:59 +00:00
lain	6e3df11693	Merge branch 'instance-deletion' into 'develop' ... AdminAPI: endpoint to delete all content from a remote instance See merge request pleroma/pleroma!3483	2021-11-15 14:24:13 +00:00