1196 commits

Author	SHA1	Message	Date
Haelwenn (lanodan) Monnier	23161526d4	object_validators: Group common fields in CommonValidations ... Notes: - QuestionValidator didn't have a :name field but that seems like a mistake - `_fields` functions can't inherit others because of some Validators - bto/bcc fields were absent in activities, also seems like a mistake (Well IIRC we don't or barely support bto/bcc anyway)	2021-10-10 02:50:06 +02:00
Haelwenn (lanodan) Monnier	a17910a6c6	CI: Bump lint stage to elixir-1.12 ... Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`	2021-10-06 08:11:05 +02:00
Haelwenn	92a8ff59aa	Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop' ... Allow users to remove their emails if instance does not need email to register See merge request pleroma/pleroma!3522	2021-10-06 05:44:44 +00:00
Haelwenn	6b3842cf50	Merge branch 'remove/mastofe' into 'develop' ... Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392	2021-09-07 16:41:53 +00:00
Tusooa Zhu	198250dcef	Allow users to remove their emails if instance does not need email to register	2021-09-05 21:27:02 -04:00
Sean King	33f063204e	Add unit test for Pleroma API app controller	2021-08-28 23:18:12 -06:00
Ilja	20084329ea	Selecting MRF policies didn't work as intended any more ... * Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions * I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not. Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509	2021-08-28 18:27:58 +02:00
Ilja	53b0dd4ecc	List available frontends also when no static/frontends folder is present yet ... * To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array. * Installing still works since the folder is created during installation already Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510	2021-08-28 18:23:49 +02:00
Haelwenn	bc62a35282	Merge branch 'features/ingestion-no-nil' into 'develop' ... ObjectValidator.stringify_keys: filter out nil values See merge request pleroma/pleroma!3506	2021-08-28 16:07:35 +00:00
Haelwenn	6633ec816f	Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop' ... Selecting MRF policies didn't work as intended any more Closes admin-fe#198 See merge request pleroma/pleroma!3509	2021-08-28 16:06:35 +00:00
Alex Gleason	b11dbbf403	UserController: fall back to frontend when user isn't found	2021-08-17 18:32:32 -05:00
Haelwenn	84ec0fbeaa	Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop' ... List available frontends also when no static/frontends folder is present yet Closes admin-fe#201 See merge request pleroma/pleroma!3510	2021-08-14 18:42:12 +00:00
Ilja	f9bafc17fb	List available frontends also when no static/frontends folder is present yet ... * To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array. * Installing still works since the folder is created during installation already	2021-08-14 18:42:12 +00:00
Haelwenn	773708cfe8	Merge branch 'builder-note' into 'develop' ... CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1 See merge request pleroma/pleroma!3511	2021-08-14 18:32:40 +00:00
Alex Gleason	ba6049aa81	Builder.note/1: return {:ok, map(), keyword()} like other Builder functions	2021-08-14 11:24:55 -05:00
Alex Gleason	a2eacfc525	CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1	2021-08-14 11:01:06 -05:00
Ilja	5049b4272e	Selecting MRF policies didn't work as intended any more ... * Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions * I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.	2021-08-14 13:42:32 +02:00
Haelwenn (lanodan) Monnier	0e2aebd036	TwitterAPI: Make change_email require body params instead of query ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503	2021-08-13 17:57:11 +02:00
Haelwenn (lanodan) Monnier	3961422f85	TwitterAPI: Make change_password require body params instead of query ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503	2021-08-13 17:56:59 +02:00
Haelwenn (lanodan) Monnier	8baaa36a16	ObjectAgePolicy: Fix pattern matching on published ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500	2021-08-13 17:56:46 +02:00
Haelwenn (lanodan) Monnier	61d233921c	ObjectValidator.stringify_keys: filter out nil values	2021-08-11 21:38:10 +02:00
Haelwenn	7c1243178b	Merge branch 'bugfix/change_password' into 'develop' ... TwitterAPI: Make change_password require body params instead of query Closes #2740 See merge request pleroma/pleroma!3503	2021-08-10 18:40:13 +00:00
Haelwenn (lanodan) Monnier	197cdebca9	TwitterAPI: Make change_email require body params instead of query	2021-08-10 20:33:00 +02:00
Haelwenn (lanodan) Monnier	09dcb2b522	TwitterAPI: Make change_password require body params instead of query ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740	2021-08-10 20:01:11 +02:00
Haelwenn (lanodan) Monnier	c64eae40a2	ObjectAgePolicy: Fix pattern matching on published	2021-08-10 07:41:06 +02:00
Haelwenn	901204df22	Merge branch 'poll-notification' into 'develop' ... MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484	2021-08-09 10:02:37 +00:00
Sean King	1841bd8383	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe	2021-08-06 08:08:20 -06:00
Ilja	03030b47c2	quarantine instances info ... Added a new field in the nodeinfo called quarantined_instances_info This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`	2021-08-06 07:59:53 +02:00
Ilja	47fc57bbcc	Change what nodeinfo returns without breaking backwards compatibility ... * Only for SimplePolicy for now * I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info	2021-08-06 07:59:53 +02:00
Ilja	7fdc3cde06	Return maps in node_info ... It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE, but for FE maps like %{"instance": "instance", "reason", "reason"} are better. I changed it so that node_info returns maps now for simple_policy and quarantined instances.	2021-08-06 07:59:53 +02:00
Ilja	c0489f9fac	Fixed deprecation warning checks ... When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.	2021-08-06 07:59:53 +02:00
Ilja	b674ba658b	make linter happy	2021-08-06 07:59:52 +02:00
Ilja	3c5a497b19	Deprecate transparency_exclusions ... * Give deprecation message * Rewrite configs	2021-08-06 07:59:52 +02:00
Ilja	dfeb3862da	config :mrf, :transparency_exclusions works with tumples now	2021-08-06 07:59:52 +02:00
Ilja	e0c7d77197	Deprecate and rewrite settings for quarentine settings ... * This is for the settings, not yet a DB migration	2021-08-06 07:59:52 +02:00
Ilja	27fe7b0274	Make quarentine work with list of tuples instead of strings	2021-08-06 07:59:52 +02:00
Ilja	dd947d9bc8	Add tests for setting :instance, :quarantined_instances ... No test was done for quarantined instances yet. I added a factory for followers_only notes and checked * That no followers only post is send when the target server is quarantined * That a followers only post is send when the target server is not quarantined	2021-08-06 07:59:52 +02:00
Ilja	4ba0beb60c	Make mrfSimple work with tuples ... * Changed SimplePolicy * I also grepped in test/ for ':mrf_simple' to see what other things could be affected	2021-08-06 07:58:58 +02:00
Ilja	647087d7fd	Deprectate strings for SimplePolicy ... When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead	2021-08-06 05:01:44 +02:00
Alex Gleason	44ede0657f	Merge remote-tracking branch 'pleroma/develop' into staff-plug	2021-08-04 11:48:57 -05:00
Alex Gleason	62bf6d67e3	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	2021-07-18 11:49:22 -05:00
Alex Gleason	70f1496eb8	Poll notification: only notify local users	2021-07-18 11:10:23 -05:00
Alex Gleason	0b1c05ca1e	Poll notification: trigger PollWorker through common_pipeline	2021-07-18 11:10:23 -05:00
Alex Gleason	0114754db2	MastodonAPI: Support poll notification	2021-07-17 22:19:38 -05:00
Alex Gleason	3674179b26	Merge remote-tracking branch 'pleroma/develop' into instance-deletion	2021-07-17 15:03:43 -05:00
Alex Gleason	bad79f79e6	AdminAPI.InstanceController: clean up tests, rename actions	2021-07-17 15:00:15 -05:00
Alex Gleason	54dbcfe02a	AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance	2021-07-17 14:55:05 -05:00
Alex Gleason	f67d00d12b	Add Instance.delete_users_and_activities/1 to delete all content from a remote instance	2021-07-17 14:06:35 -05:00
Alex Gleason	25676c84be	Create AdminAPI.InstanceController	2021-07-17 13:05:25 -05:00
feld	3f58213646	Merge branch 'admin-api-users-sort' into 'develop' ... AdminAPI: sort new users at the top Closes #2709 See merge request pleroma/pleroma!3481	2021-07-14 14:39:14 +00:00
Alex Gleason	1a2fe96d56	Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date	2021-07-14 09:02:55 -05:00
Alex Gleason	167e14416b	AdminAPI: add date to users	2021-07-14 08:54:59 -05:00
Alex Gleason	deb3f91136	Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort	2021-07-13 22:47:47 -05:00
Alex Gleason	5e88796784	AdminAPI: sort user results by ID descending	2021-07-13 22:47:02 -05:00
Alex Gleason	1f093cb216	Moderators: reorganize :admin_api pipeline in Router	2021-07-12 22:11:32 -05:00
Alex Gleason	9bc1e79c56	Moderators: add UserIsStaffPlug	2021-07-12 21:57:52 -05:00
Haelwenn	173e977e28	Merge branch 'features/ingestion-page' into 'develop' ... Pipeline Ingestion: Page See merge request pleroma/pleroma!3097	2021-07-12 05:05:49 +00:00
Haelwenn (lanodan) Monnier	6dc78f5f6f	AP C2S: Remove restrictions and make it go through pipeline	2021-07-12 06:49:41 +02:00
Sean King	9758f636b2	Delete MastoFE Controller Test	2021-07-10 11:13:25 -06:00
Sean King	5d279a22b1	Merge develop branch upstream	2021-07-10 11:04:16 -06:00
Alex Gleason	99cc26bb02	Merge remote-tracking branch 'pleroma/develop' into remote-deletions	2021-06-30 02:02:30 -05:00
Alex Gleason	beb1c98ab5	Deletions: don't purge keys so Delete/Undo activities can be signed	2021-06-30 02:02:24 -05:00
Alex Gleason	43800d83f4	Deletions: allow deactivated users to be deleted	2021-06-30 01:32:28 -05:00
Alex Gleason	a7929c4d89	Deletions: preserve account status fields during purge, fix checks	2021-06-29 23:56:19 -05:00
Alex Gleason	be2da95c36	Correctly purge a remote user	2021-06-29 21:45:38 -05:00
Haelwenn (lanodan) Monnier	fc6ab78a84	Add test on changing [:instance, :upload_limit]	2021-06-22 12:25:25 +02:00
feld	406dadb56b	Merge branch 'fix/twittercard-video-dimensions' into 'develop' ... Generate Twittercard/OGP metadata with correct dimensions See merge request pleroma/pleroma!3456	2021-06-10 15:03:58 +00:00
Mark Felder	f37db23848	Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview Proxy	2021-06-09 11:46:31 -05:00
Mark Felder	dc8fe91dec	Metadata.Utils.attachment_url/1 was used in this test too	2021-06-09 10:06:44 -05:00
Haelwenn (lanodan) Monnier	c839078a75	ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing	2021-06-09 04:23:02 +02:00
Mark Felder	d70db63084	Set the correct height/width if the data is available when generating opengraph metadata	2021-06-08 16:58:33 -05:00
Mark Felder	d4ac9445cd	Twittercard metadata for images should also include dimensions if available	2021-06-08 16:19:12 -05:00
Mark Felder	5de65ce3e8	Set the correct height/width if the data is available when generating twittercard metadata	2021-06-08 15:59:55 -05:00
feld	1175023687	Merge branch 'metadata-for-all' into 'develop' ... Support metadata for video files too See merge request pleroma/pleroma!3441	2021-06-08 20:30:55 +00:00
Mark Felder	3121ed1325	Blurhash varies slightly by computer generating it, so just validate it wasn't nil	2021-06-08 14:53:03 -05:00
feld	939b3bfe43	Merge branch 'improve-og-embed' into 'develop' ... Improve opengraph embeds See merge request pleroma/pleroma!3442	2021-06-08 19:26:17 +00:00
Mark Felder	f1abe39f6f	Update test names and verify blurhash is correctly generated for images	2021-06-08 14:05:13 -05:00
Mark Felder	1c4c73c6a0	Add test for AnalyzeMetadata upload filter fetching dimensions from a video	2021-06-08 14:02:56 -05:00
Alex Gleason	1399b82f7b	Create WrapperAuthenticator and simplify Authenticator behaviour ... Speeds up recompilation by reducing compile-time cycles	2021-06-07 18:18:39 -05:00
Mark Felder	017f947fc1	Channel name was incorrect. We left it as chat:public for backwards compatibility.	2021-06-07 16:10:24 -05:00
Mark Felder	a5ae0432ed	Test was named incorrectly and did not execute	2021-06-07 16:09:47 -05:00
Mark Felder	f5ef7fe43b	Fix test warnings	2021-06-07 16:06:53 -05:00
Mark Felder	264458531a	Formatting	2021-06-07 15:47:50 -05:00
Sean King	dc4814f0cd	Fix merge conflicts with upstream	2021-06-04 14:42:44 -06:00
Haelwenn	0c56f9de0d	Merge branch 'tests/openapi-everywhere' into 'develop' ... Put OpenAPI ~everywhere in tests See merge request pleroma/pleroma!3324	2021-06-04 18:53:09 +00:00
Haelwenn (lanodan) Monnier	eb7313b0d3	Pipeline Ingestion: Page	2021-06-04 20:06:33 +02:00
feld	a07310888f	Merge branch 'fix/missing-deprecation' into 'develop' ... Add missing deprecation warning left out of !2842 See merge request pleroma/pleroma!3444	2021-06-04 17:37:30 +00:00
Mark Felder	f58928cf1c	Add missing deprecation warning left out of !2842	2021-06-04 12:30:10 -05:00
io	2c401dafa1	Improve opengraph embeds ... This brings them more in line with Mastodon. - Deduplicates display name from the title and content - Removes arbitrary limits on the size of the embedded image - Removes angled double quotes from embed descriptions. These would normally just indicate that the content is a quote, but that is already implied by the content being in an embed.	2021-06-04 05:33:35 +00:00
Haelwenn (lanodan) Monnier	24d66b60a0	request_builder_test: mode :read got removed	2021-06-03 19:11:17 +02:00
Mark Felder	d9513b11d3	Forgot to move migration test when rebasing	2021-06-01 11:49:47 -05:00
Mark Felder	9ce2c017c0	We want clear_config/2 in all tests now	2021-06-01 11:49:47 -05:00
Mark Felder	d6432a65da	Move shout configuration from :instance, update docs and changelog	2021-06-01 11:49:46 -05:00
Mark Felder	ff00b354fa	Rename the non-federating Chat feature to Shout	2021-06-01 11:49:14 -05:00
Alex Gleason	c435de426d	Merge remote-tracking branch 'pleroma/develop' into cycles-constants	2021-06-01 11:33:11 -05:00
feld	0ddf492c5d	Merge branch 'cycles-base-url' into 'develop' ... Deprecate Pleroma.Web.base_url/0 See merge request pleroma/pleroma!3432	2021-06-01 16:15:27 +00:00
Haelwenn	c4b4258374	Merge branch 'features/validators-note' into 'develop' ... Pipeline Ingestion: Note Closes #290 See merge request pleroma/pleroma!2984	2021-06-01 01:51:38 +00:00
Alex Gleason	f2134e605b	Merge remote-tracking branch 'pleroma/develop' into cycles-base-url	2021-05-31 16:49:46 -05:00
Alex Gleason	51a9f97e87	Deprecate Pleroma.Web.base_url/0 ... Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.	2021-05-31 16:48:03 -05:00
Alex Gleason	10dfe81479	Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0 ... Move as_local_public/0 to stop making modules depend on Web at compile-time	2021-05-31 13:39:15 -05:00
feld	8871ca5aa3	Merge branch 'cycles-router-api-routes' into 'develop' ... Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0 See merge request pleroma/pleroma!3419	2021-05-28 19:06:49 +00:00
feld	359ded086c	Merge branch 'simplepolicy-announce-leak' into 'develop' ... SimplePolicy: filter nested objects, fixes #2582 Closes #2582 See merge request pleroma/pleroma!3376	2021-05-28 19:05:13 +00:00
Alex Gleason	39127f15eb	Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes	2021-05-28 13:51:21 -05:00
Alex Gleason	c23b81e399	Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0 ... Reduce recompilation time by breaking compile-time cycles	2021-05-28 13:51:01 -05:00
Mark Felder	4694853766	Provide totalItems field for featured collections	2021-05-27 12:17:31 -05:00
Mark Felder	05d678c070	Expose user email address to user/owner; not publicly.	2021-05-20 12:50:43 -05:00
Mark Felder	9b6b5ac196	Rename upload filter to AnalyzeMetadata	2021-05-18 15:33:33 -05:00
Alex Gleason	ff02511057	Merge remote-tracking branch 'upstream/develop' into attachment-meta	2021-05-12 20:10:52 -05:00
Alex Gleason	4c060ae733	Ingest remote attachment width/height	2021-05-12 15:38:49 -05:00
Alex Gleason	ab9eabdf20	Add SetMeta filter to store uploaded image sizes	2021-05-12 15:07:31 -05:00
Alex Gleason	cea44b6b3e	Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak	2021-05-07 12:40:45 -05:00
Alex Gleason	1a45aa1278	Merge remote-tracking branch 'pleroma/develop' into notice-routes	2021-05-05 14:50:54 -05:00
Alex Gleason	50e3750758	Add notice compatibility routes for other frontends ... Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785	2021-05-05 14:50:10 -05:00
feld	745375bdcf	Merge branch 'dont-crash-email-settings' into 'develop' ... Don't crash so hard when email settings are invalid Closes #2606 See merge request pleroma/pleroma!3400	2021-05-04 13:30:00 +00:00
Alex Gleason	c186b059a7	Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings	2021-05-03 14:43:28 -05:00
Alex Gleason	c80b1aaf51	Don't crash when email settings are invalid ... Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606 Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4	2021-05-03 14:43:14 -05:00
Alex Gleason	926a233cc4	Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak	2021-04-30 14:21:17 -05:00
Alex Gleason	c16c7fdb87	SimplePolicy: filter string Objects	2021-04-30 14:20:54 -05:00
Alex Gleason	3d742c3c1a	SimplePolicy: filter nested objects	2021-04-30 14:20:37 -05:00
Alex Gleason	52fc59f125	Merge remote-tracking branch 'upstream/develop' into earmark	2021-04-30 13:17:03 -05:00
Alex Gleason	a8fa00ef66	Fix failing remote mentions test, valid TLDs	2021-04-30 12:55:43 -05:00
Alex Gleason	53760d2cda	Delete obsolete EarmarkRendereTests (moved to UtilsTest)	2021-04-30 12:51:18 -05:00
Alex Gleason	6727a3659f	Remove Pleroma.Formatter.minify/2	2021-04-30 12:27:06 -05:00
Alex Gleason	e7ac15905e	Merge remote-tracking branch 'upstream/develop' into oauth-token-id	2021-04-29 12:19:10 -05:00
Alex Gleason	762be6ce10	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-04-29 11:14:32 -05:00
rinpatch	15f87cf658	Merge branch 'features/ingestion-ecto-tag' into 'develop' ... TagValidator: New See merge request pleroma/pleroma!3244	2021-04-16 09:55:55 +00:00
rinpatch	79376b4afb	Merge branch 'feature/521-pinned-post-federation' into 'develop' ... Pinned posts federation Closes #521 See merge request pleroma/pleroma!3312	2021-04-16 09:53:47 +00:00
rinpatch	0ababdc068	Merge branch 'fix/2593-reading-exported-config-file' into 'develop' ... Reading the file, instead of config keyword in ReleaseRuntimeProvider Closes #2593 See merge request pleroma/pleroma!3381	2021-04-16 09:50:26 +00:00
Sean King	fa2e62078c	Remove MastoFE configuration stuff	2021-04-15 23:51:04 -06:00
Sean King	ca79aab0bf	Remove MastoFE settings from users table	2021-04-15 23:33:24 -06:00
Sean King	8afa3f2d1b	Remove no longer necessary unit tests for MastoFE	2021-04-15 23:12:42 -06:00
Mark Felder	f95b52255b	Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test	2021-04-14 09:39:57 -05:00
Mark Felder	905efc57e9	Initial test validating the AdminAPI issue	2021-04-13 14:39:28 -05:00
Mark Felder	cdd271b065	Fix assignment / assertion	2021-04-13 10:55:54 -05:00
Mark Felder	9fbcdc15b1	Validate custom instance thumbnail set via AdminAPI produces correct URL	2021-04-13 10:52:53 -05:00
Alexander Strizhakov	681a42c359	release runtime provider fix for paths	2021-04-08 15:45:31 +03:00
Haelwenn (lanodan) Monnier	5ef4659b37	test/pleroma/web/common_api_test.exs: Strip : around emoji key-name	2021-04-05 19:25:55 +02:00
Haelwenn (lanodan) Monnier	6d6bef64bf	fetcher_test: Remove assert on fake Create having an ap_id	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	53193b84b1	utils: Fix maybe_splice_recipient when "object" isn’t a map	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	0b88accae6	fetcher_test: Fix missing mock function	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	b0c778fde7	NoteHandlingTest: remove fix_explicit_addressing-related test	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	d1205406d9	ActivityPubControllerTest: Apply same addr changes to object	2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier	641184fc7a	recipients fixes/hardening for CreateGenericValidator	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	c944932674	Pipeline Ingestion: Note	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	e2a3365b5c	ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	e56779dd8d	Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing	2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier	5ae27c8451	pipeline_test: Fix usage of %Activity{}	2021-04-01 14:18:40 +02:00
Mark Felder	16a7ffb1ea	Fix function calls due to module name change	2021-03-30 11:10:44 -05:00
Mark Felder	bfcdcd4f69	Temp file leaked, oops	2021-03-30 11:10:44 -05:00
Mark Felder	03f38ac4eb	Prefer FollowBot naming convention vs Followbot	2021-03-30 11:10:44 -05:00
Mark Felder	fef4f3772c	More tests to validate Followbot is behaving	2021-03-30 11:10:44 -05:00
Mark Felder	f73d166785	Only need to validate a follow request is generated for now	2021-03-30 11:10:44 -05:00
Alexander Strizhakov	4d046afd27	tests for release config provider	2021-03-27 09:05:33 +03:00
Alexander Strizhakov	8857242c95	removeing corresponding add activity	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	5ae9b05600	separate test file for featured collection	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	8f0778166c	moving fixture into mastodon folder	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	3adb43cc20	refetch user on incoming add/remove activity ... if featured_address is nil	2021-03-25 13:03:41 +03:00
Alexander Strizhakov	d1d2744ee3	featured_address valition in AddRemoveValidator	2021-03-25 13:03:40 +03:00
Alexander Strizhakov	ff612750b1	validator renaming & add validation for target	2021-03-25 13:03:40 +03:00
Alexander Strizhakov	17f28c0507	mastodon pins	2021-03-25 13:03:40 +03:00
Alexander Strizhakov	3ec1dbd922	Let pins federate ... - save object ids on pin, instead of activity ids - pins federation - removed pinned_activities field from the users table - activityPub endpoint for user pins - pulling remote users pins	2021-03-25 13:03:40 +03:00
Alex Gleason	b6a69b5efd	Return token's primary key with POST /oauth/token	2021-03-24 12:50:05 -05:00
rinpatch	d3660b24d3	Copy emoji in the subject from parent post ... Sometimes people put emoji in the subject, which results in the subject looking broken if someone replies to it from a server that does not have the said emoji under the same shortcode. This patch solves the problem by extending the emoji set available in the summary to that of the parent post.	2021-03-22 21:20:47 +03:00
Alexander Strizhakov	d7e51206a2	respect content-type header in finger request	2021-03-19 18:53:55 +03:00
rinpatch	a9bc652ab9	Merge branch 'mediaproxy-decode' into 'develop' ... Simple way to decode mediaproxy URLs See merge request pleroma/pleroma!3364	2021-03-19 08:52:12 +00:00
rinpatch	f930e83fa2	Merge branch 'fix/remove_auto_nsfw' into 'develop' ... Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223	2021-03-19 08:48:22 +00:00
rinpatch	67bde35e71	Merge branch 'bugfix/bridgy-user-icon' into 'develop' ... Add support for actor icon being a list (Bridgy) See merge request pleroma/pleroma!3372	2021-03-19 08:36:26 +00:00
Haelwenn (lanodan) Monnier	55bdfb075c	OpenAPI: TwitterAPI Util Controller	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	a22c53810b	Remove deprecated /api/qvitter/statuses/notifications/read	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	e4743847a1	OpenAPI: PleromaAPI UserImport Controller	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	ef5de5eb39	OpenAPI: MastodonAPI Status Controller	2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier	0c7c6463d1	OpenAPI: MastodonAPI Account Controller, excluding OAuth	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	3a8404820d	Verify MastoFE Controller put_settings response	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	e47f83cfc8	OpenAPI: MastodonAPI Conversation Controller	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	3123ecdd6e	OpenAPI: MastodonAPI Media Controller	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	7eecc3b61d	OpenAPI: MastodonAPI Timeline Controller	2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier	b1d4b2b81e	Add support for actor icon being a list (Bridgy)	2021-03-15 06:44:05 +01:00
Ivan Tashkinov	946e0aab49	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-10 07:48:50 +03:00
Haelwenn	7f413139fb	Merge branch 'openapi/admin/user' into 'develop' ... Add OpenAPI spec for AdminAPI.UserController See merge request pleroma/pleroma!3355	2021-03-10 03:24:40 +00:00
Ivan Tashkinov	92526e0230	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-07 11:34:39 +03:00
Mark Felder	eaaa20e0f1	Make tests use it	2021-03-05 13:21:22 -06:00
Ivan Tashkinov	5856f51717	[#3213] ActivityPub hashtags filtering refactoring. Test fix.	2021-03-03 23:09:30 +03:00
lain	13aa98d689	Merge branch 'mergeback/2.3.0' into 'develop' ... Mergeback/2.3.0 See merge request pleroma/pleroma!3360	2021-03-03 15:07:50 +00:00
lain	2e296c079f	Revert "StatusController: Deactivate application support for now." ... This reverts commit 024c11c18d.	2021-03-03 15:33:06 +01:00
Mark Felder	913d53b7d7	Remove useless header on the get request	2021-03-02 14:04:50 -06:00
Mark Felder	ccbf162088	Actually test viewing status after ingestion	2021-03-02 12:33:32 -06:00
Mark Felder	f0208980e4	Test both ingestion of post in the status controller and the correct response during the view	2021-03-02 12:29:16 -06:00
Egor Kislitsyn	3aae5231b2	Add OpenAPI spec for AdminAPI.UserController	2021-03-02 20:49:17 +04:00
lain	024c11c18d	StatusController: Deactivate application support for now. ... Some more things to discuss about, so we'll remove it from 2.3.0	2021-03-02 14:40:47 +01:00
Ivan Tashkinov	882dd46843	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-02 08:26:30 +03:00
Alex Gleason	7ebbe11e75	user_agent_mock --> request_mock	2021-03-01 21:05:52 +01:00
Alex Gleason	1dc5794e29	Never forward the client's user-agent through the media proxy	2021-03-01 21:05:46 +01:00
Mark Felder	b1e1db82bc	Store application details in the object under the generator key, not application key	2021-03-01 11:29:10 -06:00
lain	e8d88a72cf	Merge branch 'fix/warning-in-test' into 'develop' ... warning fix See merge request pleroma/pleroma!3350	2021-02-28 16:53:05 +00:00
lain	4a9d3a1f28	Merge branch 'features/reports-enhancements' into 'develop' ... Enhance reports in Pleroma API: index, show See merge request pleroma/pleroma!3280	2021-02-28 16:45:15 +00:00
Alexander Strizhakov	f85ed1c521	warning fix	2021-02-28 19:41:25 +03:00
lain	050c4b1f14	Merge branch 'bugfix/peertube-mpegURL-object' into 'develop' ... Video: Handle peertube videos only stashing attachments in x-mpegURL Closes #2372 and #2535 See merge request pleroma/pleroma!3336	2021-02-28 16:18:23 +00:00
lain	e6a14e1cd1	Merge branch 'feat/client_app_details' into 'develop' ... Support application field See merge request pleroma/pleroma!3311	2021-02-28 16:17:34 +00:00
Haelwenn (lanodan) Monnier	3bc7d12271	Remove sensitive-property setting #nsfw, create HashtagPolicy	2021-02-27 21:26:17 +01:00
lain	d0823d7f1e	Merge branch 'frontendstatic-ignore-api-calls' into 'develop' ... Filter out API calls from FrontendStatic plug Closes #2261 See merge request pleroma/pleroma!3346	2021-02-27 19:40:38 +00:00
Mark Felder	d35b6254b4	Store the client application data in ActivityStreams format	2021-02-26 18:14:57 -06:00
Mark Felder	902d4e4a4a	Leave a note for future explorers	2021-02-25 13:06:43 -06:00
Mark Felder	2da71a526f	No need to filter out Mix.env() from the API routes.	2021-02-25 13:04:08 -06:00
Mark Felder	6b87dfad5d	Filter out MIX_ENV from route list and add a test	2021-02-25 09:23:10 -06:00
Ivan Tashkinov	8f88a90ca3	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex	2021-02-23 13:58:35 +03:00
Ivan Tashkinov	77f3da0358	[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.	2021-02-23 13:52:28 +03:00
Haelwenn (lanodan) Monnier	7fc9cd0974	Video: Handle peertube videos only stashing attachments in x-mpegURL ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535	2021-02-21 23:41:28 +01:00
Mark Felder	63739c5a58	Tests to validate client disclosure obeys user setting	2021-02-18 17:23:17 -06:00
Mark Felder	d5ef02c7a7	Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default	2021-02-18 16:35:03 -06:00
Alexander Strizhakov	1e6c27181e	expires_in in scheduled status params	2021-02-18 14:59:22 +03:00
rinpatch	6d66fadea7	Remove :auth, :enforce_oauth_admin_scope_usage ... `admin` scope has been required by default for more than a year now and all apps that use the API seems to request a proper scope by now.	2021-02-17 20:47:38 +03:00
Haelwenn (lanodan) Monnier	ff72ce31ca	Enhance reports in Pleroma API: index, show	2021-02-17 18:46:53 +01:00
Haelwenn	e7b1f0f5f4	Merge branch 'feat/chat-list-pagination' into 'develop' ... Chats: Introduce /api/v2/pleroma/chats which implements pagination Closes #2140 See merge request pleroma/pleroma!3325	2021-02-17 15:36:59 +00:00
rinpatch	158f9f18ee	Merge branch 'remove-conversation-api' into 'develop' ... Add API endpoint to remove a conversation Closes #2488 See merge request pleroma/pleroma!3321	2021-02-17 15:14:27 +00:00
rinpatch	264cb2c77f	Merge branch '2510-oauth-app-tokens-further-support' into 'develop' ... [#2510] Improved support for app-bound OAuth tokens Closes #2510 See merge request pleroma/pleroma!3316	2021-02-17 13:08:51 +00:00
rinpatch	d7ad288c84	Chats: Introduce /api/v2/pleroma/chats which implements pagination ... Also removes incorrect claim that /api/v1/pleroma/chats supports pagination and deprecates it. Closes #2140	2021-02-17 16:03:24 +03:00
Ivan Tashkinov	111bfdd3a0	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-16 23:23:49 +03:00
Ivan Tashkinov	1dac7d1462	[#3213] Fixed hashtags.name lookup (must use citext type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.	2021-02-15 21:13:14 +03:00
Egor Kislitsyn	cf6d3db58f	Add API endpoint to remove a conversation	2021-02-15 21:48:13 +04:00
Mark Felder	fb2a8e7ccd	Additional validation so we don't get caught off guard with a nil response ... if CommonAPI ever prevents us from injecting this data	2021-02-12 13:15:33 -06:00
Mark Felder	3554a65f45	Inject fake application metadata and validate it is stripped by transmogrifier	2021-02-12 13:05:12 -06:00
rinpatch	db716f860a	Merge branch 'not-used-mock' into 'develop' ... Not used mock See merge request pleroma/pleroma!3313	2021-02-12 08:52:04 +00:00
rinpatch	76414ad277	Merge branch 'bugfix/answer-outbox' into 'develop' ... Add test for Answer presence into an authenticated /outbox See merge request pleroma/pleroma!3269	2021-02-12 08:48:51 +00:00
Mark Felder	bd3d0e8b57	Use a custom oauth token so we can predict and validate the client_name and website	2021-02-11 15:53:10 -06:00
Mark Felder	333ff527fd	Validate client application metadata is retained in the object	2021-02-11 15:07:21 -06:00
Ivan Tashkinov	5992382cf8	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex	2021-02-11 19:31:57 +03:00
Ivan Tashkinov	df89b5019b	[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.	2021-02-11 15:02:50 +03:00
Alexander Strizhakov	b5d001fc8c	not used mock	2021-02-10 18:44:49 +03:00
rinpatch	a853218701	Merge branch 'features/ap_id-c2s-authentication' into 'develop' ... activity_pub_controller: Add authentication to object & activity endpoints See merge request pleroma/pleroma!3295	2021-02-09 19:29:43 +00:00
feld	593c0851d9	Merge branch 'develop' into 'new-user-emails'	2021-02-08 16:01:50 -06:00
Haelwenn	a5bee1bf35	Merge branch 'feat/mrf-noemptypolicy' into 'develop' ... MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. See merge request pleroma/pleroma!3309	2021-02-08 21:49:20 +00:00
Mark Felder	55a13fc360	MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. ... Helps prevent accidental button mashes from submitting incomplete posts	2021-02-08 15:32:47 -06:00
Haelwenn (lanodan) Monnier	8c7b3b20d8	activity_pub_controller: Add authentication to object & activity endpoints	2021-02-08 20:00:47 +01:00
Ivan Tashkinov	d1c6dd97aa	[#3213] Partially addressed code review points. ... migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).	2021-02-07 22:24:12 +03:00
Mark Felder	6a3e75c8e6	Lint	2021-02-05 09:00:17 -06:00
Mark Felder	c361440396	Add basic test to validate the registration email is dispatched when the others are disabled ... Also only check for subject as the body is a mess of html and we don't really need to prove its contents if the subject matches.	2021-02-04 17:56:46 -06:00
Mark Felder	d047372291	Merge branch 'develop' into fix/reports-from-admins	2021-02-04 12:37:20 -06:00
feld	7b67bf4e97	Merge branch 'fix/configdb-error' into 'develop' ... Improve error message for ConfigDB See merge request pleroma/pleroma!3289	2021-02-04 14:33:59 +00:00
Haelwenn	ea5469961a	Merge branch 'bugfix/notice-external-redirect' into 'develop' ... Redirect non-local activities when /notice/:id is used See merge request pleroma/pleroma!3300	2021-02-04 14:26:03 +00:00
Haelwenn (lanodan) Monnier	ecff027418	Redirect non-local activities when /notice/:id is used ... Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496	2021-02-04 15:17:40 +01:00
Mark Felder	5bb5949048	Validate admin making report doesn't get their own report notification, but other admins do	2021-02-03 12:54:53 -06:00
feld	008499f65a	Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md	2021-02-03 14:23:23 +00:00
feld	c3dd860a02	Merge branch 'fix/2449-scheduled-poll-bug' into 'develop' ... Fix for scheduled post with poll Closes #2449 See merge request pleroma/pleroma!3294	2021-02-03 14:22:23 +00:00
feld	8d2ea95402	Merge branch 'feature/2438-users-posts-total-count' into 'develop' ... Feature/2438 users/instances posts total count Closes #2438 See merge request pleroma/pleroma!3270	2021-02-03 14:21:57 +00:00
Haelwenn (lanodan) Monnier	fb25231fbe	Add test for Answer presence into an authenticated /outbox	2021-02-03 12:07:18 +01:00
Ivan Tashkinov	4e14945670	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/activity_pub/activity_pub.ex	2021-02-03 09:31:38 +03:00
feld	f1f773f2c7	Merge branch 'email-stub-in-verify-credentials' into 'develop' ... Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike) See merge request pleroma/pleroma!3286	2021-02-02 18:35:08 +00:00
feld	d37d4106c6	Merge branch 'fix/majic-nits' into 'develop' ... Majic: don't fix extensions See merge request pleroma/pleroma!3287	2021-02-02 18:15:00 +00:00
Mark Felder	28d2917c3a	Merge branch 'develop' into fix/majic-nits	2021-02-02 12:01:48 -06:00
feld	d289ad8579	Merge branch 'develop' into 'fix/2411-mutes-api' ... # Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md	2021-02-02 17:57:58 +00:00
feld	cd5ff7a943	Merge branch 'develop' into 'feature/2164-unify-api-arguments' ... # Conflicts: # CHANGELOG.md	2021-02-02 17:11:38 +00:00
Alexander Strizhakov	aacd1c90b7	fix for test warnings	2021-02-01 19:33:40 +03:00
Alexander Strizhakov	0dc68c157f	fix for scheduled post with poll	2021-02-01 18:22:26 +03:00
Alexander Strizhakov	fdf1dfed56	only_remote -> remote renaming	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	77f0a0af7d	more tests and update for docs and changelog	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	2cb6dc5a3a	list timeline filtration by params	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	b6a72680e2	added only_media flag to home timeline	2021-02-01 14:11:11 +03:00
Alexander Strizhakov	c3110c46f3	expanding filtration for home timeline ... added local & remote statuses filtration for home timeline	2021-02-01 14:11:11 +03:00
Ivan Tashkinov	cf4765af40	[#3213] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.	2021-01-31 23:06:38 +03:00
Ivan Tashkinov	1b49b8efe5	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	2021-01-31 20:38:58 +03:00
Ivan Tashkinov	6fd4163ab6	[#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.	2021-01-31 20:37:33 +03:00
Alexander Strizhakov	c369d2b930	support for with_relationships parameter ... in /api/v1/mutes and /api/v1/accounts/:id endpoints	2021-01-29 08:41:21 +03:00
Ivan Tashkinov	380d0cce6b	[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.	2021-01-29 00:17:33 +03:00
Mark Felder	5fcab23aa3	Improve error message for ConfigDB	2021-01-28 14:59:23 -06:00
Mark Felder	9272cef500	Switch to a build of Majic that does not try to fix extensions by default	2021-01-28 14:03:29 -06:00
Egor Kislitsyn	a51d903e0c	Make sure active_user_count/1 counts only local users	2021-01-28 22:23:10 +04:00
Ivan Tashkinov	60b4654038	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). ... Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.	2021-01-28 19:49:43 +03:00
Egor Kislitsyn	bddb01bded	Add tests	2021-01-27 18:20:07 +04:00
Egor Kislitsyn	793fc77b16	Add active user count	2021-01-27 18:20:06 +04:00
lain	7f07871639	Merge branch 'chore/tests-use-clear_config' into 'develop' ... Convert tests to all use clear_config instead of Pleroma.Config.put See merge request pleroma/pleroma!3282	2021-01-27 11:33:27 +00:00
Alexander Strizhakov	d4158e8bf0	added total ... to the instance adminAPI endpoint	2021-01-27 07:45:06 +03:00
Alexander Strizhakov	6806c03e85	added total ... to the user statuses adminAPI endpoint	2021-01-27 07:45:02 +03:00
feld	d7af0294e6	Merge branch 'service-worker-allowed-header' into 'develop' ... Ability to set custom HTTP headers per each frontend See merge request pleroma/pleroma!3247	2021-01-26 18:14:01 +00:00
Mark Felder	e854c35e65	Convert tests to all use clear_config instead of Pleroma.Config.put	2021-01-26 11:58:43 -06:00
lain	229acae6c3	Merge branch 'develop' into '2435-list-multiple-users' ... # Conflicts: # CHANGELOG.md	2021-01-26 14:24:32 +00:00
Alexander Strizhakov	875fbaae35	support for expires_in/expires_at in filters	2021-01-26 08:27:45 +03:00
Haelwenn	250e202098	Merge branch 'fix/missing-own_votes' into 'develop' ... Include own_votes in the poll data See merge request pleroma/pleroma!3274	2021-01-26 00:55:05 +00:00
Mark Felder	0b19534475	Merge branch 'develop' into docs/apache-config	2021-01-25 17:00:26 -06:00
Ivan Tashkinov	694d98be55	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-25 21:24:07 +03:00
Alexander Strizhakov	3f3d64acbf	little refactor and tests ... for voted & own_votes fields in polls	2021-01-25 19:46:36 +03:00
Mark Felder	537ba1c5e0	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-25 09:45:06 -06:00
Mark Felder	6bfd497f4a	Include own_votes in the poll data	2021-01-22 09:47:59 -06:00
Ivan Tashkinov	218c519606	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # test/pleroma/web/mastodon_api/views/status_view_test.exs	2021-01-22 10:05:28 +03:00
Mark Felder	80ccdb56f6	Make tag urls absolute	2021-01-21 16:49:19 -06:00
Mark Felder	42e49529c2	Test URL formatting	2021-01-21 14:42:16 -06:00
Mark Felder	0c485d5555	Improve description	2021-01-21 14:42:08 -06:00
eugenijm	7fcaa188a0	Allow to define custom HTTP headers per each frontend	2021-01-21 21:55:23 +03:00
eugenijm	133644dfa2	Ability to set the Service-Worker-Allowed header	2021-01-21 21:55:11 +03:00
Ivan Tashkinov	ca7f240643	[#3213] Ignoring of blank elements from objects.data->tag.	2021-01-21 20:50:06 +03:00
Ivan Tashkinov	c041e9c630	[#3213] HashtagsTableMigrator: failures handling fix, retry function. ... Changed default hashtags filtering strategy to non-aggregate approach.	2021-01-21 20:23:08 +03:00
Ivan Tashkinov	2634a16b4c	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	2021-01-21 20:20:35 +03:00
lain	ba40af054c	Merge branch 'test-cases-mox-setup' into 'develop' ... Mox mode setup tweak; refactoring See merge request pleroma/pleroma!3263	2021-01-21 09:03:26 +00:00
feld	2926713fe5	Merge branch 'deprecate-public_endpoint' into 'develop' ... Deprecate Uploaders.S3, :public_endpoint See merge request pleroma/pleroma!3251	2021-01-20 22:48:48 +00:00
Mark Felder	9988d9261c	Add bucket_namespace to be extra certain truncated_namespace works	2021-01-20 16:33:00 -06:00
Mark Felder	dfc4cb6ebd	Special handling for unconfirmed users based on instance config no longer needed.	2021-01-20 11:30:29 -06:00
Mark Felder	5d344e5c79	Only need to test if unconfirmed users are successfully deleted ... It's no longer possible to have an active user account with User.is_confirmed == false	2021-01-20 11:26:14 -06:00
Mark Felder	3cb4d40ebf	This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.	2021-01-20 11:17:13 -06:00
Ivan Tashkinov	318d6dde1c	Mox mode setup tweak; refactoring.	2021-01-19 00:23:39 +03:00
feld	958a7f6ed0	Merge branch 'fix/reblog-api' into 'develop' ... Fix Reblog API Closes #2423 See merge request pleroma/pleroma!3261	2021-01-18 21:19:14 +00:00
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
Mark Felder	44a86951a3	Merge branch 'develop' into refactor/approval_pending_user_field	2021-01-18 12:05:05 -06:00
Egor Kislitsyn	51d5951c02	Test that only author can reblog a private status	2021-01-18 21:01:00 +04:00
Egor Kislitsyn	1b79dce7bc	Fix Reblog API ... Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.	2021-01-18 20:15:57 +04:00
Lain Soykaf	bdfd72630f	ListController: Fix being unable to add / remove users.	2021-01-18 16:28:36 +01:00
Ivan Tashkinov	3f88e33a71	[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to clear_config/_ to minimize such issues in future.	2021-01-16 23:05:31 +03:00
Ivan Tashkinov	48b399cedb	[#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).	2021-01-16 20:22:14 +03:00
Mark Felder	2c0fe2ea9e	Remove toggle_confirmation; require explicit state change ... Also cosmetic changes to make the code clearer	2021-01-15 13:11:51 -06:00
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	2021-01-15 12:44:41 -06:00
Mark Felder	ebd7d1365b	Make setting user activation status explicit	2021-01-15 11:37:17 -06:00
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
Mark Felder	f7e59c28ed	Change user.approval_pending field to user.is_approved	2021-01-15 10:42:02 -06:00
Mark Felder	0b725f5d21	Lint	2021-01-14 16:00:32 -06:00
Mark Felder	12c8ce481c	Bump Copyright year	2021-01-14 13:58:52 -06:00
Mark Felder	fb47e83adc	Add ConfigDB migration	2021-01-14 13:53:55 -06:00
Lain Soykaf	fd9a0ac329	BackupTest: Fix s3 test.	2021-01-14 20:18:45 +01:00
Lain Soykaf	c4b74c9c3f	Linting.	2021-01-14 16:01:14 +01:00
Lain Soykaf	39f3683a06	Pbkdf2: Use it everywhere.	2021-01-14 15:06:16 +01:00
Lain Soykaf	87a31c5c9b	Password -> Password.Pbkdf2	2021-01-14 14:49:39 +01:00
Ivan Tashkinov	e350898828	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-13 22:11:16 +03:00
Mark Felder	ba234d3c73	Unnecessary duplication here	2021-01-13 12:01:01 -06:00
Mark Felder	94e5180846	Consistent style	2021-01-13 12:00:48 -06:00
Lain Soykaf	aff83eb7c1	Linting	2021-01-13 16:00:12 +01:00
lain	9106048c61	Password: Replace Pbkdf2 with Password.	2021-01-13 15:11:11 +01:00
lain	c7cd9bd591	Password: Add password module ... Replaces Pbkdf2.	2021-01-13 15:09:01 +01:00
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	2021-01-13 07:49:50 +01:00
Mark Felder	67e888498c	Switch another test to Upload.base_url/0	2021-01-12 16:42:43 -06:00
Mark Felder	e87cca97e6	Fix tests relying on old behavior. Use the Upload.base_url, Luke.	2021-01-12 16:35:10 -06:00
Mark Felder	8b28dce82a	Deprecate Pleroma.Uploaders.S3, :public_endpoint	2021-01-12 16:31:35 -06:00
feld	5453038ce9	Merge branch 'fix/backup-url-on-s3' into 'develop' ... Standardize base url for uploads See merge request pleroma/pleroma!3246	2021-01-12 20:54:30 +00:00
lain	e1a547d7d3	ChatMessages: Fix pagination headers. ... They used to contain the path parameter `id` as query param, which would break the link.	2021-01-11 15:30:40 +01:00
Mark Felder	3c936061d5	Apply Upload.base_url for S3	2021-01-08 17:32:42 -06:00
lain	5822338f3a	Merge branch 'guppe-example' into 'develop' ... ActivtityPub Test: Add example for guppe actor See merge request pleroma/pleroma!3243	2021-01-08 15:55:48 +00:00
Alex Gleason	e73c7fa7e5	Merge remote-tracking branch 'upstream/develop' into confirm-users	2021-01-08 07:48:19 -06:00
Alex Gleason	1b98cd8610	Remove ConfirmUserPlug	2021-01-08 07:47:55 -06:00
lain	80167e62dd	Merge branch 'fix/missing_emoji_steal_dir' into 'develop' ... Create dir for EmojiStealPolicy automatically See merge request pleroma/pleroma!3218	2021-01-08 13:10:49 +00:00
Alex Gleason	3342f6a7ef	Backups: render ID in API	2021-01-07 13:06:22 -06:00
lain	bd788c0939	ActivtityPub Test: Add example for guppe actor	2021-01-07 16:20:30 +01:00
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' ... Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	2021-01-07 11:09:18 +00:00
lain	4d56aca904	Merge branch 'adminapi-user-email' into 'develop' ... AdminAPI: return user email See merge request pleroma/pleroma!3240	2021-01-07 10:08:02 +00:00
Alex Gleason	cc09079aea	Exclude blockers from notifications when blockers_visible: false	2021-01-06 15:39:14 -06:00
Alex Gleason	1438fd9583	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-01-06 15:22:35 -06:00
Alex Gleason	9f6fa5877f	Add AdminAPI.AccountViewTest	2021-01-06 11:43:07 -06:00
Alex Gleason	20af025c65	AdminAPI: return user email	2021-01-06 11:30:32 -06:00
Roger Braun	48cd336a72	allow external emoji	2021-01-06 10:13:01 -06:00
lain	07bf36142b	Resilience Test: Add notification check for killing likes.	2021-01-06 12:49:18 +01:00
lain	a24b2bc38a	Resilience Test: Add tests for killing likes.	2021-01-06 12:33:09 +01:00
Mark Felder	f9090e00e6	Add test to validate URLs to custom emojis are properly encoded	2021-01-05 13:58:49 -06:00
lain	20a269ed69	Merge branch 'fix/pagination-regression' into 'develop' ... Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230	2021-01-05 12:40:45 +00:00
lain	fee0c6a2cb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users	2021-01-05 13:33:57 +01:00
lain	e802b48d55	User: Use ObjectID type to validate also-known-as field	2021-01-05 13:10:14 +01:00
lain	f0e6cff583	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases	2021-01-05 12:42:30 +01:00
lain	bea69853a2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff	2021-01-05 12:19:39 +01:00
lain	95a0ae8a35	AccountControllerTest: Fix test logic	2021-01-05 11:48:40 +01:00
lain	d44850d7a5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor	2021-01-05 10:48:32 +01:00
lain	8e5904daa5	SideEffects.DeleteTest: asyncify. ... Replace Mock with Mox, mock out Logger.	2021-01-04 18:40:59 +01:00
Mark Felder	0e93775ed0	Add test to validate profile pagination works with keyset	2021-01-04 11:04:58 -06:00
lain	e1e7e4d379	Object: Rework how Object.normalize works ... Now it defaults to not fetching, and the option is named.	2021-01-04 13:38:31 +01:00
Alex Gleason	0ec7e9b8e9	AdminAPI: return id for moderation log entries	2021-01-01 11:59:48 -06:00
Alex Gleason	7b44605cb8	Migration to confirm previously-logged-in users	2020-12-31 14:04:51 -06:00
feld	afe9c152ab	Merge branch 'fix/reports-ordering' into 'develop' ... Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225	2020-12-31 19:24:49 +00:00
Mark Felder	e4791258d4	Ensure newest report is returned first in the list	2020-12-31 12:40:42 -06:00
Alex Gleason	64f0e96ff6	Automatically confirm logged-in users	2020-12-31 12:13:08 -06:00
Alex Gleason	11d40e92b7	Render AKAs in Actor endpoints	2020-12-30 18:53:27 -06:00
Alex Gleason	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	2020-12-30 17:10:02 -06:00
Mark Felder	4c5f75f4e9	Support pagination in AdminAPI for user statuses	2020-12-30 15:18:54 -06:00
Haelwenn	3966add048	Revert "Merge branch 'features/hashtag-column' into 'develop'" ... This reverts merge request !2824	2020-12-28 12:02:16 +00:00
Haelwenn	b122b6ffa3	Merge branch 'features/hashtag-column' into 'develop' ... Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824	2020-12-28 10:14:58 +00:00
Ivan Tashkinov	14fae94c0e	[#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.	2020-12-28 00:08:09 +03:00
Alexander Strizhakov	7bfb041658	insreasing test coverage for StealEmojiPolicy	2020-12-27 21:53:30 +03:00
Ivan Tashkinov	4134abef63	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2020-12-26 22:23:05 +03:00
Ivan Tashkinov	cbb19d0e18	[#3213] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to hashtags table.	2020-12-26 22:20:55 +03:00
lain	e4f1d8f48c	Merge branch 'cachex-test' into 'develop' ... Test framework overhaul (speed, reliability) See merge request pleroma/pleroma!3209	2020-12-26 10:26:35 +00:00
Mary Kate	590a10af33	Adds tests for breaking tag and mention links after text is converted from markdown to html	2020-12-24 16:40:08 -06:00
Ivan Tashkinov	e369b1306b	Added Hashtag entity and objects-hashtags association with auto-sync with data.tag on Object update.	2020-12-22 22:04:33 +03:00
Haelwenn (lanodan) Monnier	acb03d591b	Insert text representation of hashtags into object["hashtags"] ... Includes a new mix task: pleroma.database fill_old_hashtags	2020-12-22 05:15:34 +01:00
Ivan Tashkinov	ee221277b0	Encapsulation of tags / hashtags fetching from objects.	2020-12-21 22:54:26 +03:00
lain	ab633e51ab	Linting	2020-12-21 16:48:35 +01:00
lain	5db1e6c8d3	Pipeline test: Switch from Mock to Mox. ... Speeds up the test and makes it possible to run async.	2020-12-21 16:35:12 +01:00
lain	0ef0aed205	Tests: Add a helper method to reduce sleeping times in test. ... This will 'time travel', i.e. change the inserted_at and update_at fields of the object in question. This is used to backdate things were we used sleeping before to ensure time differences.	2020-12-21 16:31:23 +01:00
lain	ba19975838	Linting	2020-12-21 16:22:36 +01:00
lain	9d5ce82221	Test: More async/sync tweaks.	2020-12-21 15:05:56 +01:00
lain	b17c36c45a	Tests: More test fixes.	2020-12-21 12:59:11 +01:00
lain	2f8ec8a9cc	XMLBuidlder test: Make async.	2020-12-21 12:35:04 +01:00
lain	9ba60f70d2	Tests: Make as many tests as possible async. ... In general, tests that match these criteria can be made async: - Doesn't use real Cachex. - Doesn't write to the Config / Application Environment. - Uses Mock. Using Mox is fine. - Uses the streamer.	2020-12-21 12:21:40 +01:00
Kaizhe Huang	509f82e4d6	Add test for subscribe_address in JSON WebFinger response	2020-12-19 22:11:47 +11:00
lain	95a9bdfc37	Tests: Use NullCache for async tests. ... Caching can't work in async tests, so for them it is mocked to a null cache that is always empty. Synchronous tests are stubbed with the real Cachex, which is emptied after every test.	2020-12-18 19:53:19 +01:00
lain	b4b68b71fc	Tests: Remove unneeded explicit cachex use. ... Only use cachex when we're actually testing it.	2020-12-18 13:18:17 +01:00
Alex Gleason	80891e83d8	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-12-17 09:05:36 -06:00
lain	8b8c317c0f	Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop' ... Fix mastoapi ws posts dropping Closes #2336 See merge request pleroma/pleroma!3198	2020-12-16 11:35:45 +00:00
lain	6bb4f4e172	Merge branch 'support/2255_posix_errors' into 'develop' ... [#2255] added error messages for posix error code See merge request pleroma/pleroma!3138	2020-12-15 15:16:03 +00:00
Alexander Strizhakov	cebe3c7def	Fix for dropping posts/notifs in WS when mix task is executed ... - start oban in mix tasks with empty queues, plugins and crontab - fix for update_users_following_followers_counts - fix for removed logo.png - typo in resend confirmation emails mix task docs - fix for uploads mix task (start Majic.Pool) - fix for creating user mix task (start :fast_html app)	2020-12-14 11:02:32 -06:00
Mark Felder	f318d8e56d	Use Pleroma.Formatter.markdown_to_html/1 in the tests	2020-12-11 17:28:00 -06:00
Alex Gleason	f1c67115d8	Upgrade linkify, test URL issues, fixes #2026 #1942	2020-12-11 17:22:48 -06:00
Alex Gleason	f8c93246d6	Refactor Earmark code, fix tests	2020-12-11 17:22:42 -06:00
Alex Gleason	c4f4e48e57	Remove some N/A tests	2020-12-11 17:22:30 -06:00
Alex Gleason	e9e17e5df3	Upgrade Earmark to v1.4.10	2020-12-11 17:22:17 -06:00
Ivan Tashkinov	7fff9c1bee	Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).	2020-12-09 21:14:39 +03:00
lain	477c6c8e55	Merge branch 'auth-improvements' into 'develop' ... Cookie auth rework / Auth subsystem refactoring and tweaks Closes pleroma/secteam/pleroma#3 See merge request pleroma/pleroma!3112	2020-12-09 15:55:45 +00:00
lain	1436a2fa2d	Merge branch 'stream-follow-updates' into 'develop' ... Stream follow updates Closes #2299 See merge request pleroma/pleroma!3183	2020-12-09 15:52:31 +00:00
lain	e73d878b38	Merge branch 'feat/warn-large-pool-size' into 'develop' ... Add a startup error for modified Repo pool_size See merge request pleroma/pleroma!3190	2020-12-08 16:36:51 +00:00
lain	50d16a9e27	ApplicationRequirements: Add test, more text for pool size.	2020-12-08 17:30:10 +01:00
Haelwenn (lanodan) Monnier	1403798820	instance.reachable?: Limit to binary input	2020-12-07 21:20:44 +01:00
Haelwenn (lanodan) Monnier	e1a2e8b17c	instance: Do not fetch unreachable instances ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346	2020-12-07 20:11:47 +01:00
Ivan Tashkinov	c8e7ace812	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements ... # Conflicts: # CHANGELOG.md	2020-12-07 21:45:04 +03:00
lain	ed76323776	Merge branch 'feature/configdb-mix-tasks' into 'develop' ... Add mix tasks to give additional ConfigDB recovery and debugging options See merge request pleroma/pleroma!3174	2020-12-07 18:06:06 +00:00
Ivan Tashkinov	e00c667145	[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests. ... Minor fixes.	2020-12-06 18:02:30 +03:00
Ivan Tashkinov	a010c5b16a	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-12-06 13:59:35 +03:00
Ivan Tashkinov	e9859b68fc	[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.	2020-12-06 13:59:10 +03:00
feld	6adad96c79	Merge branch 'issue/2256' into 'develop' ... [#2256] added subject actor to moderation log See merge request pleroma/pleroma!3164	2020-12-04 17:49:05 +00:00
rinpatch	1d04bd0894	Merge branch 'supported-emojos' into 'develop' ... Update Emoji support to unicode 13.1, support all RGI emoji. See merge request pleroma/pleroma!3186	2020-12-03 18:29:42 +00:00
lain	fa0d0b602f	Emoji: Also accept regional indicators	2020-12-03 16:17:39 +01:00
Haelwenn	05879a3b3e	Merge branch '2339-local-remote-mixup' into 'develop' ... User: Don't allow local users in remote changesets Closes #2339 See merge request pleroma/pleroma!3185	2020-12-03 01:28:54 +00:00
Mark Felder	126d236455	We no longer expect mentions to link if they are prefixed with too many @'s	2020-12-02 10:27:55 -06:00
lain	8fb259e739	Emoji: Only accept RGI emoji. ... "recommended for general interchange"	2020-12-02 16:46:19 +01:00
lain	3b3cf63118	Emoji: Add test for ZWJ sequence emoji	2020-12-02 16:18:08 +01:00
Egor Kislitsyn	c9afb350e7	Document follow relationship updates and cleanup	2020-12-02 19:16:36 +04:00
lain	1adee08321	Emoji: Update to Unicode 13.1, switch base file, allow multichar.	2020-12-02 16:15:03 +01:00
lain	5d15486098	SideEffects: fix test	2020-12-02 14:48:11 +01:00
lain	222312900e	User: Don't allow local users in remote changesets	2020-12-02 12:18:43 +01:00
Egor Kislitsyn	35ba48494f	Stream follow updates	2020-12-02 00:18:58 +04:00
rinpatch	fc9ebe5073	Search tests: Use on_exit for restoring persistent_term state ... Otherwise if the assertion failed, the code below which resets the state would never be reached	2020-12-01 19:45:25 +03:00
Ivan Tashkinov	d50a3345ae	[#3112] Allowed revoking same-user token from any apps. Added tests.	2020-11-30 21:55:48 +03:00
Ivan Tashkinov	50e47a215f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-28 21:51:27 +03:00
Ivan Tashkinov	f1b07a2b2b	OAuth form user remembering feature. Local MastoFE login / logout fixes.	2020-11-28 21:51:06 +03:00
Alexander Strizhakov	6aadb1cb40	digest algorithm is taken from header	2020-11-27 08:10:52 +03:00
Maksim Pechnikov	fb72f2034a	fix spec	2020-11-25 22:44:27 +03:00
Ivan Tashkinov	62993db499	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-25 21:48:18 +03:00
Ivan Tashkinov	12a5981cc3	Session token setting on token exchange. Auth-related refactoring.	2020-11-25 21:47:23 +03:00
Mark Felder	3283d0805f	Use Jason instead of Poison in tests	2020-11-23 13:28:55 -06:00
lain	67b15cc033	Search: Save detected pg version in a persistent term.	2020-11-23 15:29:55 +01:00
lain	f9a4cf2097	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	2020-11-23 15:18:19 +01:00
Ivan Tashkinov	489b12cde4	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-21 19:47:46 +03:00
Ivan Tashkinov	ccc2cf0e87	Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.	2020-11-21 19:47:25 +03:00
Alex Gleason	30ed7b502f	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-11-21 10:23:53 -06:00
feld	ecd1ef8cb5	Merge branch 'fix/2302-report-duplicates' into 'develop' ... Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146	2020-11-20 18:40:15 +00:00
lain	8532325d65	SearchController Test: Fix test.	2020-11-20 16:29:11 +01:00
lain	9a1e5f5d48	Search: Change search method based on detected pg version	2020-11-20 16:26:43 +01:00
feld	79a509ee61	Merge branch '2301-users-search-discoverability-fix' into 'develop' ... [#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162	2020-11-19 20:33:52 +00:00
feld	cd1b4155d5	Merge branch 'oban-jobs-to-simple-tasks' into 'develop' ... Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129	2020-11-19 20:32:32 +00:00
Maksim Pechnikov	66f411fba0	added subject actor to moderation log	2020-11-19 22:13:45 +03:00
Ivan Tashkinov	b27d8f7437	Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix ... # Conflicts: # CHANGELOG.md	2020-11-19 19:35:44 +03:00
lain	5e04f4156c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	2020-11-19 17:32:57 +01:00
Ivan Tashkinov	e164c37139	[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.	2020-11-19 19:30:02 +03:00
Haelwenn	c8d11c3064	Merge branch '2317-old-reset-tokens' into 'develop' ... Resolve "Don't allow old password reset tokens" Closes #2317 See merge request pleroma/pleroma!3160	2020-11-19 16:22:14 +00:00
lain	783fa797bb	SearchController Test: Fix test	2020-11-19 16:53:26 +01:00
lain	81b6f02a5e	Search Test: linting	2020-11-19 16:48:51 +01:00
lain	a60242464e	Search: Add option to search with the websearch function	2020-11-19 16:12:01 +01:00
Ivan Tashkinov	fcad3e716a	[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.	2020-11-19 18:08:22 +03:00
Alexander Strizhakov	46dab37351	little fix	2020-11-19 15:29:26 +03:00
lain	11e0d5f9ac	Password Resets: Don't accept tokens above a certain age. ... By default, one day	2020-11-19 12:27:06 +01:00
Alexander Strizhakov	4aaffe3a10	log capture	2020-11-19 09:58:32 +03:00
Alexander Strizhakov	be0b874e1d	fix for mastodon forwarded reports	2020-11-19 09:53:14 +03:00
Alexander Strizhakov	a840aefda8	formatting	2020-11-19 09:53:13 +03:00
Alexander Strizhakov	e2bf6b1f7e	fix for forwarded reports	2020-11-19 09:53:13 +03:00
minibikini	6669ac5bf7	Merge branch 'develop' into 'hide-muted-reactions' ... # Conflicts: # CHANGELOG.md	2020-11-18 20:22:40 +00:00
lain	aae669d05e	Merge branch 'fix/webpush-and-emojireact' into 'develop' ... Push notifications: add pleroma:emoji_reaction, improve tests Closes #2185 See merge request pleroma/pleroma!3141	2020-11-18 18:33:48 +00:00
lain	6b32e1de23	Merge branch 'frontend-admin-api' into 'develop' ... Add an API to manage frontends Closes #2238 See merge request pleroma/pleroma!3108	2020-11-18 17:51:57 +00:00
Maksim Pechnikov	9c5d1cb9ed	fix tests	2020-11-18 09:58:51 +03:00
Mark Felder	415481a4d9	Add test for POST when push is disabled ... Also group together the tests verifiying failure when disabled	2020-11-17 22:18:22 +00:00
Mark Felder	3eaa5335c9	Revert adding extra alert types here	2020-11-17 21:37:17 +00:00
Mark Felder	d9732fb7d3	Fix incorrect test description	2020-11-17 21:34:18 +00:00
Mark Felder	ff7a4b6aa2	Test that we ignore invalid subscription alert types separately.	2020-11-17 20:22:25 +00:00
Mark Felder	30f140e570	Ensure all supported push notification subscription alert types are tested	2020-11-17 20:22:25 +00:00
Mark Felder	499faa82f6	Synchronize reaction notification text with PleromaFE's style	2020-11-17 20:22:24 +00:00
Mark Felder	67a6abd071	Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions	2020-11-17 20:20:00 +00:00
Mark Felder	3ce11b830e	Add capability for emoji reaction push notifications	2020-11-17 20:20:00 +00:00
lain	bb9650f3c2	FrontendController: Return error on installation error.	2020-11-17 16:43:07 +01:00
feld	d33b9e7b33	Merge branch 'remove/fedsockets' into 'develop' ... Remove FedSockets See merge request pleroma/pleroma!3155	2020-11-17 14:58:33 +00:00
Egor Kislitsyn	f69fe36ebf	Merge branch 'develop' into frontend-admin-api	2020-11-17 18:34:04 +04:00
Egor Kislitsyn	d48dbfab2b	Merge remote-tracking branch 'origin/develop' into hide-muted-reactions	2020-11-17 18:30:10 +04:00
Egor Kislitsyn	79d2d3f609	Merge branch 'develop' into hide-muted-reactions	2020-11-17 18:29:52 +04:00
rinpatch	2c55f7d7cb	Remove FedSockets ... Current FedSocket implementation has a bunch of problems. It doesn't have proper error handling (in case of an error the server just doesn't respond until the connection is closed, while the client doesn't match any error messages and just assumes there has been an error after 15s) and the code is full of bad descisions (see: fetch registry which uses uuids for no reason and waits for a response by recursively querying a ets table until the value changes, or double JSON encoding). Sometime ago I almost completed rewriting fedsockets from scrach to adress these issues. However, while doing so, I realized that fedsockets are just too overkill for what they were trying to accomplish, which is reduce the overhead of federation by not signing every message. This could be done without reimplementing failure states and endpoint logic we already have with HTTP by, for example, using TLS cert auth, or switching to a more performant signature algorithm. I opened https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further discussion on alternatives to fedsockets. From discussions I had with other Pleroma developers it seems like they would approve the descision to remove them as well, therefore I am submitting this patch.	2020-11-17 17:28:30 +03:00
lain	61f86774d1	Merge branch 'chores/note-handling-move' into 'develop' ... Chores/note handling move See merge request pleroma/pleroma!3122	2020-11-17 14:16:53 +00:00
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	2020-11-17 15:01:38 +01:00
lain	81293e5aad	ActivityPubController: Don't return local only objects	2020-11-17 13:11:39 +01:00
Mark Felder	b1466661eb	Use absolute URLs to thumbnail and background in /api/v1/instance	2020-11-16 21:29:15 +00:00
Maksim Pechnikov	e4b202d905	added test	2020-11-16 22:23:28 +03:00
Egor Kislitsyn	fb41bd1a85	Hide reactions from muted and blocked users	2020-11-16 22:50:14 +04:00
Maksim Pechnikov	e1d25bad0c	fix tests	2020-11-16 21:45:37 +03:00
Alex Gleason	9546c1444c	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-11-14 19:48:47 -06:00
Maksim Pechnikov	36ec604521	added test	2020-11-14 08:30:22 +03:00
lain	0d149502fe	Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' ... fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912	2020-11-13 13:35:47 +00:00
Ilja	70e4b86250	Make notifs view work for reports ... * These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)	2020-11-13 13:35:46 +00:00
rinpatch	6ca709816f	Fix object spoofing vulnerability in attachments ... Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948	2020-11-12 15:25:33 +03:00
Haelwenn	99bc175f02	Merge branch 'title-injection-change' into 'develop' ... Title injection change See merge request pleroma/pleroma!3132	2020-11-12 08:50:26 +00:00
Mark Felder	966663c3f8	Fix tests for other attachment types	2020-11-11 16:17:35 -06:00
Mark Felder	2254e5e595	Render blurhashes in Mastodon API	2020-11-11 12:51:13 -06:00
Mark Felder	6fd72e9e85	Ingest blurhash for attachments if they were federated	2020-11-11 12:27:51 -06:00
Egor Kislitsyn	d26a449396	Change endpoint path	2020-11-11 20:39:57 +04:00
Egor Kislitsyn	435bf1f945	Remove FrontendInstallerWorker	2020-11-11 20:12:35 +04:00
lain	631def2df2	RedirectController: Don't replace title, but inject into the meta	2020-11-11 17:10:59 +01:00
Egor Kislitsyn	08cbd655d1	Merge branch 'develop' into frontend-admin-api	2020-11-11 19:53:40 +04:00
Egor Kislitsyn	0118ccb53c	Add local visibility	2020-11-11 18:54:01 +04:00
feld	3cd7ea693f	Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop' ... Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128	2020-11-11 13:48:03 +00:00
Alexander Strizhakov	8d218ebaf5	Moving some background jobs into simple tasks ... - fetching activity data - attachment prefetching - using limiter to prevent overload	2020-11-11 13:39:49 +03:00
Alexander Strizhakov	f97f24b067	making credo happy and test fix	2020-11-11 10:48:03 +03:00
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	2020-11-10 19:20:14 +03:00
lain	88f6b61a5e	Merge branch '2260-wrong-report-link' into 'develop' ... Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121	2020-11-10 11:04:19 +00:00
Alexander Strizhakov	0c68b9ac13	escaping summary and other fields in xml templates	2020-11-10 10:46:57 +03:00
Haelwenn (lanodan) Monnier	e010bb292b	NoteHandlingTest: Poison → Jason	2020-11-06 14:04:03 +01:00
Haelwenn (lanodan) Monnier	fa1f5d4442	Move TransmogrifierTest for Note to NoteHandlingTest	2020-11-06 08:57:16 +01:00
lain	6d850c46dc	AdminEmail: Use AP id as user url.	2020-11-04 17:12:47 +01:00
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	2020-11-04 16:51:42 +01:00
lain	bae48c98e3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-11-04 16:18:11 +01:00
lain	4800ee656b	Merge branch 'features/federation-status' into 'develop' ... Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086	2020-11-04 15:00:52 +00:00
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' ... View a remote server's timeline See merge request pleroma/pleroma!2713	2020-11-04 14:54:53 +00:00
Ivan Tashkinov	73e66fd31f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-04 17:48:10 +03:00
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' ... Always return voters_count in polls See merge request pleroma/pleroma!3120	2020-11-04 14:44:45 +00:00
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	2020-11-04 15:38:10 +01:00
lain	cb3cd3a761	TopicsTest: Small addition.	2020-11-04 15:24:10 +01:00
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	2020-11-04 15:05:01 +01:00
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' ... Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	2020-11-04 13:48:15 +00:00
Egor Kislitsyn	ca95cbe0b4	Add with_muted param to ChatController.index/2	2020-11-04 16:40:12 +04:00
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	2020-11-04 13:23:18 +01:00
lain	c7bcbfbc1d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	2020-11-04 11:47:41 +01:00
lain	1cfc3278c0	Poll View: Always return voters_count.	2020-11-04 10:14:00 +01:00
lain	c37118e6f2	Conversations: A few refactors	2020-11-03 13:56:12 +01:00
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	2020-11-03 13:45:09 +01:00
Mark Felder	53dd048590	Test the note is returned when fetching a single report	2020-11-02 15:49:07 -06:00
Egor Kislitsyn	be52819a11	Hide chats from muted users	2020-11-02 17:51:54 +04:00
lain	24ce324973	Merge branch 'bugfix/poll_replies_count' into 'develop' ... side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114	2020-11-02 12:08:20 +00:00
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	2020-11-02 10:43:45 +00:00
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	2020-11-02 05:56:17 +01:00
feld	38b481d112	Merge branch 'feature/account-export' into 'develop' ... Add account export Closes #847 See merge request pleroma/pleroma!2918	2020-10-31 17:03:40 +00:00
Ivan Tashkinov	04f6b48ac1	Auth subsystem refactoring and tweaks. ... Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.	2020-10-31 13:38:35 +03:00
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	2020-10-31 05:50:59 +03:00
Egor Kislitsyn	a2a7a1f2ff	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-31 00:17:33 +04:00
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-30 19:34:02 +04:00
Egor Kislitsyn	1a98476f48	Remove unused aliases	2020-10-30 18:42:43 +04:00
Alibek Omarov	1042c30fa5	ConversationViewTest: fix test	2020-10-30 13:59:53 +01:00
Alibek Omarov	0552a08dfd	ConversationControllerTest: fix test, fix formatting	2020-10-30 13:59:53 +01:00
Alibek Omarov	9b93eef715	ConversationView: fix last_status.account being empty, fix current user being included in group conversations	2020-10-30 13:59:53 +01:00
Alibek Omarov	630eb0f939	ConversationViewTest: fix test #2	2020-10-30 12:58:51 +01:00
Alibek Omarov	149589c842	ConversationViewTest: fix test	2020-10-30 12:58:51 +01:00
Alibek Omarov	390a12d4c8	ConversationControllerTest: fix test	2020-10-30 12:58:51 +01:00
minibikini	1cc8e94506	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	2020-10-30 11:18:55 +00:00
Haelwenn	131f3219e6	Merge branch 'issue/2069' into 'develop' ... [#2069] unread_conversation_count See merge request pleroma/pleroma!2939	2020-10-29 23:39:15 +00:00
feld	1cce1bd729	Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' ... [#2137] admin/users filters See merge request pleroma/pleroma!3016	2020-10-29 21:06:15 +00:00
Egor Kislitsyn	d83c2bd330	Add support for install via file and build_url params	2020-10-29 16:37:50 +04:00
Egor Kislitsyn	fa902867c0	Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination	2020-10-29 15:35:42 +04:00
Egor Kislitsyn	8542d2efee	Merge remote-tracking branch 'origin/develop' into feature/local-only-scope	2020-10-29 14:51:23 +04:00
Ivan Tashkinov	ba50dc05a8	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # CHANGELOG.md	2020-10-28 19:03:40 +03:00
Mark Felder	d2b140a525	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261	2020-10-28 08:48:26 -05:00
Egor Kislitsyn	4a2d7a7a5d	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-28 15:33:36 +04:00
Egor Kislitsyn	4f90077767	Fix warning	2020-10-28 15:32:44 +04:00
feld	1204aaa2e3	Merge branch 'feature/autofollowing' into 'develop' ... autofollowing_nicknames See merge request pleroma/pleroma!3087	2020-10-27 22:55:31 +00:00
Haelwenn	d8d4bd15d0	Merge branch '2236-no-name' into 'develop' ... Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101	2020-10-27 22:44:31 +00:00
feld	03a318af9a	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	2020-10-27 22:13:50 +00:00
Mark Felder	f2b74f60f0	Merge branch 'develop' into feature/account-export	2020-10-27 15:16:22 -05:00
Maksim Pechnikov	d28f72a55a	FrontStatic plug: excluded invalid url	2020-10-27 22:59:27 +03:00
Mark Felder	cbe41408e4	phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+	2020-10-27 14:37:48 -05:00
minibikini	1bfd8528bb	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	2020-10-27 18:59:19 +00:00
Mark Felder	291189357b	Merge branch 'develop' into feature/account-export	2020-10-27 12:54:33 -05:00
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	2020-10-27 12:51:31 -05:00
feld	5aff479951	Merge branch '1668-prometheus-access-restrictions' into 'develop' ... [#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093	2020-10-27 17:47:56 +00:00
feld	e062329a17	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	2020-10-27 17:42:24 +00:00
Egor Kislitsyn	03e306785b	Add an API endpoint to install a new frontend	2020-10-27 19:20:21 +04:00
lain	04b7505c75	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-10-26 17:50:34 +01:00
lain	9542c5d0f4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name	2020-10-26 16:30:48 +01:00
rinpatch	df61071422	Merge branch '2242-nsfw-case' into 'develop' ... Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094	2020-10-23 19:39:42 +00:00
lain	60e379ce0b	User: Correctly handle whitespace names.	2020-10-23 13:53:01 +02:00
feld	d6907e6e0c	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	2020-10-22 20:33:52 +00:00
lain	8d251096fe	SideEffects: Correctly handle chat messages sent to yourself	2020-10-22 12:22:08 +02:00
Maksim Pechnikov	ef627b9391	fix module name	2020-10-22 12:04:23 +03:00
Maksim Pechnikov	60663150b5	admin user search: added filter by actor_type	2020-10-22 11:53:28 +03:00
Maksim Pechnikov	46b420aa60	need_confirmed -> unconfirmed	2020-10-22 11:50:49 +03:00
Maksim Pechnikov	cf4f393794	added AdminApi.UserController	2020-10-22 11:50:49 +03:00
Maksim Pechnikov	9ef46ce410	added 'unconfirmed' filter to admin/users	2020-10-22 11:50:49 +03:00
Egor Kislitsyn	034ac43f3a	Fix credo warnings	2020-10-20 17:47:04 +04:00
Egor Kislitsyn	e87901c424	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-20 17:27:29 +04:00
Egor Kislitsyn	ad605e3e16	Rename Pleroma.Backup to Pleroma.User.Backup	2020-10-20 17:16:58 +04:00
Egor Kislitsyn	c1976d5b19	Fix credo warnings	2020-10-19 18:14:49 +04:00
lain	39fd4d7639	Transmogrifier: Downcase incoming Hashtags ... Also, set sensitive to true if we have an nsfw hashtag present.	2020-10-19 15:40:50 +02:00
Egor Kislitsyn	76c4e80e5a	Merge branch 'develop' into mutes-blocks-pagination	2020-10-19 15:40:03 +04:00
Egor Kislitsyn	18a91d85e5	Merge branch 'develop' into feature/local-only-scope	2020-10-19 15:31:56 +04:00
Haelwenn	0495a07dc7	Merge branch '2239-mute-fixes' into 'develop' ... ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084	2020-10-19 04:26:35 +00:00
Ivan Tashkinov	524fb0e4c2	[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. ... Added tests and documentation.	2020-10-18 21:22:21 +03:00
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	2020-10-17 17:53:47 +03:00
Ivan Tashkinov	049ece1ef3	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex	2020-10-17 13:12:39 +03:00
Mark Felder	1b8fd7e65a	Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts	2020-10-16 17:36:02 +00:00
Haelwenn (lanodan) Monnier	aafdc975bd	federation_status: Add ApiSpec	2020-10-16 01:14:15 +02:00
Haelwenn (lanodan) Monnier	3b5a7a6b14	federation_status: New endpoint showing unreachable instances	2020-10-16 01:14:04 +02:00
Mark Felder	fb056ce05b	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-15 16:39:01 -05:00
Egor Kislitsyn	2a475622ee	Add Pleroma.Constants.as_local_public/0	2020-10-15 19:07:00 +04:00
Egor Kislitsyn	4f79bbbc31	Add local-only statuses	2020-10-15 18:37:44 +04:00
Egor Kislitsyn	3985c1b450	Fix warnings	2020-10-15 16:54:59 +04:00
lain	7a2f100061	ActivityPub: Show own replies to muted users. ... Aligns mute with block behavior.	2020-10-15 12:28:25 +02:00
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	2020-10-14 15:27:15 -05:00
Alex Gleason	83770b7b39	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-14 12:33:24 -05:00
feld	2013705690	Merge branch 'feature/gen-magic' into 'develop' ... Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534	2020-10-14 17:31:45 +00:00
Mark Felder	ed61002815	Undo API breaking changes	2020-10-14 11:03:17 -05:00
Mark Felder	b001237b79	Finish undoing API breakage	2020-10-14 10:44:18 -05:00
Mark Felder	3242cfef20	Undo API breaking changes	2020-10-14 09:54:07 -05:00
Alex Gleason	dc38dc8472	Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235	2020-10-13 22:01:27 -05:00
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	2020-10-13 19:26:04 -05:00
Alex Gleason	7d8f610720	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-13 19:25:18 -05:00
Alex Gleason	b3d6cf9022	Merge remote-tracking branch 'upstream/develop' into block-behavior	2020-10-13 19:22:32 -05:00
Alex Gleason	c3112fd13a	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-10-13 19:20:00 -05:00
Mark Felder	8b20c4d275	Missed tests	2020-10-13 16:15:28 -05:00
Egor Kislitsyn	6734abcbd4	Add pagination for Mutes	2020-10-13 21:58:18 +04:00