5542 commits

Author	SHA1	Message	Date
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
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
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
Alexander Strizhakov	538af14d52	possibility to run rollback in test env	2020-12-22 17:55:30 +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	1a3da01a65	Tests: Stub the pipeline in all tests. ... Restores the old un-moxed behavior.	2020-12-21 16:38:34 +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
lain	ee81a94ab2	Caching: Add caching behavior, add null implementation.	2020-12-21 11:42:53 +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	713612c377	Cachex: Make caching provider switchable at runtime. ... Defaults to Cachex.	2020-12-18 17:44:46 +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
lain	c1129ff674	Tests: Reset all cachex caches between synchronous tests ... Don't bother in the async case, it doesn't make sense there.	2020-12-18 11:53:43 +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
Mark Felder	e3dd0d45b7	Slip in a test to ensure we can use the atom syntax in mix task arguments	2020-12-07 11:21:06 -06: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
Mark Felder	657002e738	Answer new prompt interactively	2020-12-04 12:07:23 -06: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	e379ab8277	Add --force flag for delete and reset commands ... Bunch of reorganization and consolidation	2020-12-02 16:24:32 -06:00
Mark Felder	13947999ad	Use a callback strategy to short circuit the functions and print a nice error	2020-12-02 12:33:34 -06:00
Mark Felder	3e6d9187a7	Add tests for config dumping	2020-12-02 10:43:22 -06: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	54df44d380	Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters	2020-11-23 14:48:14 -06: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
Haelwenn	28da36975d	Merge branch 'bugfix/instance-gen_exiftool' into 'develop' ... pleroma.instance: Fix Exiftool module name See merge request pleroma/pleroma!3143	2020-11-14 21:43:07 +00:00
Haelwenn (lanodan) Monnier	e2f573d68b	pleroma.instance: Fix Exiftool module name	2020-11-14 22:31:01 +01: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
rinpatch	cc45c69fff	Remove release_env ... While taking a final look at instance.gen before releasing I noticed that the release_env task outputs messages in broken english. Upon further inspection it seems to have even more severe issues which, in my opinion, warrant it's at least temporary removal: - We do not explain what it actually does, anywhere. Neither the task docs nor instance.gen, nor installation instructions. - It does not respect FHS on OTP releases (uses /opt/pleroma/config even though we store the config in /etc/pleroma/config.exs). - It doesn't work on OTP releases, which is the main reason it exists. Neither systemd nor openrc service files for OTP include it. - It is not mentioned in install guides other than the ones for Debian and OTP releases.	2020-11-08 11:56:09 +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	add26817e3	update changelog	2020-10-22 11:54:32 +03:00
Maksim Pechnikov	44e5a57d1a	admin api: added user filters by actor_types	2020-10-22 11:53:28 +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	98f32cf820	Fix tests	2020-10-19 17:19:45 +04: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
Maksim Pechnikov	2030ffd490	fix test	2020-10-15 22:31:52 +03:00
Maksim Pechnikov	20e68b30f0	added generated pleroma.env	2020-10-15 22:28:26 +03: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
Haelwenn	9a85ec0da0	Merge branch 'refactor/locked_user_field' into 'develop' ... Change user.locked field to user.is_locked See merge request pleroma/pleroma!3077	2020-10-14 16:17:32 +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
Haelwenn (lanodan) Monnier	f5d8af1db1	Move Consistency.FileLocation to ./test ... This fixes a compilation fail because of Credo's absence in MIX_ENV=prod	2020-10-13 19:57:45 +02:00
Mark Felder	09be8cb336	Credo	2020-10-13 12:49:43 -05:00
Egor Kislitsyn	33f4f39b1c	Add pagination for Blocks	2020-10-13 21:39:41 +04:00
Mark Felder	40f3cdc030	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	2020-10-13 10:08:38 -05:00
Mark Felder	64553ebae2	Merge branch 'develop' into chore/elixir-1.11	2020-10-13 09:54:53 -05:00
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
Mark Felder	4ead0d564f	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
Mark Felder	8bacdc3680	Change user.discoverable field to user.is_discoverable	2020-10-13 09:45:08 -05:00
Mark Felder	9968b7efed	Change user.locked field to user.is_locked	2020-10-13 09:31:13 -05:00
Alexander Strizhakov	4c4ea9a348	changes after rebase	2020-10-13 17:10:34 +03:00
Alexander Strizhakov	5f2071c458	changes after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	bb111465a1	credo fix after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	7f5dbb0201	changes after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	b081080dd9	fixes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	f679486540	rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	c4c5caedd8	changes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	c8418e2d1f	fix after rebase	2020-10-13 16:44:01 +03:00
Alexander Strizhakov	b720ad2264	files consistency after rebase	2020-10-13 16:44:01 +03:00
Alexander Strizhakov	c5efded5fd	files consistency for new files	2020-10-13 16:44:00 +03:00
Alexander Strizhakov	207211a2b3	update files consistency after rebase	2020-10-13 16:44:00 +03:00
Alexander Strizhakov	e33782455d	updates after rebase	2020-10-13 16:43:59 +03:00
Alexander Strizhakov	9f4fe5485b	alias alphabetically order	2020-10-13 16:43:59 +03:00
Alexander Strizhakov	3ef4e9d170	AdminSecretAuthenticationPlug module name	2020-10-13 16:43:58 +03:00
Alexander Strizhakov	c497558d43	AuthenticationPlug module name	2020-10-13 16:43:58 +03:00
Alexander Strizhakov	c1777e7479	BasicAuthDecoderPlug module name	2020-10-13 16:43:58 +03:00
Alexander Strizhakov	66e0b0065b	Cache plug module name	2020-10-13 16:43:57 +03:00
Alexander Strizhakov	c6baa811d6	EnsureAuthenticatedPlug module name	2020-10-13 16:43:57 +03:00
Alexander Strizhakov	011525a3d1	EnsurePublicOrAuthenticatedPlug module name	2020-10-13 16:43:57 +03:00
Alexander Strizhakov	8e301a4c37	EnsureUserKeyPlug module name	2020-10-13 16:43:56 +03:00
Alexander Strizhakov	d6cb1a3b46	ExpectAuthenticatedCheckPlug module name	2020-10-13 16:43:56 +03:00
Alexander Strizhakov	99e4ed21b1	ExpectPublicOrAuthenticatedCheckPlug module name	2020-10-13 16:43:56 +03:00
Alexander Strizhakov	8c993c5f63	FederatingPlug module name	2020-10-13 16:43:55 +03:00
Alexander Strizhakov	5cd7030076	IdempotencyPlug module name	2020-10-13 16:43:55 +03:00
Alexander Strizhakov	e2332d92ce	LegacyAuthenticationPlug module name	2020-10-13 16:43:54 +03:00
Alexander Strizhakov	96d320bdfe	OAuthPlug module name	2020-10-13 16:43:54 +03:00
Alexander Strizhakov	a6d8cef33e	OAuthScopesPlug module name	2020-10-13 16:43:54 +03:00
Alexander Strizhakov	15772fda57	PlugHelper module name	2020-10-13 16:43:53 +03:00
Alexander Strizhakov	4b1863ca4e	RateLimiter module name	2020-10-13 16:43:53 +03:00
Alexander Strizhakov	3be8ab5103	RemoteIp module name	2020-10-13 16:43:50 +03:00
Alexander Strizhakov	4b4c0eef36	SessionAuthenticationPlug module name	2020-10-13 16:42:53 +03:00
Alexander Strizhakov	8249b75761	SetFormatPlug module name	2020-10-13 16:42:53 +03:00
Alexander Strizhakov	c97c7d982f	SetLocalePlug module name	2020-10-13 16:42:52 +03:00
Alexander Strizhakov	f7614d4718	SetUserSessionIdPlug module name	2020-10-13 16:42:52 +03:00
Alexander Strizhakov	ebd6dd7c53	UserEnabledPlug module name	2020-10-13 16:42:51 +03:00
Alexander Strizhakov	61c609884c	UserFetcherPlug module name	2020-10-13 16:42:51 +03:00
Alexander Strizhakov	1d16cd0c3d	UserIsAdminPlug module name	2020-10-13 16:42:50 +03:00
Alexander Strizhakov	0374df1d12	other files consistency	2020-10-13 16:38:19 +03:00
Alexander Strizhakov	7acf09beb8	more tests	2020-10-13 16:38:18 +03:00
Alexander Strizhakov	103f3dcb9e	rich media parser ttl files consistency	2020-10-13 16:38:15 +03:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00
Alexander Strizhakov	6bf85440b3	mix tasks consistency	2020-10-13 16:33:24 +03:00
Alex Gleason	83ae45b000	Preload /api/pleroma/frontend_configurations, fixes #1932	2020-10-12 18:49:37 -05:00
Alex Gleason	cb29769a22	Make User.confirm/1 and User.approve/1 idempotent	2020-10-12 16:42:59 -05:00
Alex Gleason	6ebec50df6	Refactor User.confirm/1, add more tests	2020-10-12 16:32:34 -05:00
Alex Gleason	9ddc292ca8	TwitterAPI: test pending approval user email	2020-10-12 15:25:14 -05:00
feld	03855f9789	Merge branch 'improve/instance-gen' into 'develop' ... #2159 Support enabling upload filters during instance gen See merge request pleroma/pleroma!3070	2020-10-12 17:24:24 +00:00
Mark Felder	8539e386c3	Add missing Copyright headers	2020-10-12 12:00:50 -05:00
Mark Felder	6c61ef14c3	Support enabling upload filters during instance gen	2020-10-12 11:19:48 -05:00
Alex Gleason	521e965884	Registration tests	2020-10-11 21:38:01 -05:00
Alex Gleason	28005563f0	Send approval pending email during registration	2020-10-11 20:50:09 -05:00
Ivan Tashkinov	2498e569f1	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-11 22:34:48 +03:00
Ivan Tashkinov	89c595b772	[#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.	2020-10-11 22:34:28 +03:00
Alex Gleason	7c2d0e378c	Blocks: make blockers_visible config work	2020-10-10 03:41:35 -05:00
Alex Gleason	d2364276a1	Blocks: always see your own posts	2020-10-10 01:58:48 -05:00
Mark Felder	3ca98878d2	Deep link to the user account in AdminFE in account confirmation emails	2020-10-09 17:08:05 -05:00
Mark Felder	04b514c567	Merge branch 'develop' into feature/gen-magic	2020-10-09 11:26:10 -05:00
Alex Gleason	9c672ecbb5	Remote Timeline: add Streaming support	2020-10-08 20:07:03 -05:00
Alex Gleason	3f9263fb16	Merge remote-tracking branch 'upstream/develop' into restrict-origin	2020-10-08 17:24:09 -05:00
Alex Gleason	77b1ea68a7	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-08 15:44:48 -05:00
Haelwenn	74be4de3f6	Merge branch 'fix/2209-remoteip' into 'develop' ... #2209 RemoteIP CIDR helper, config and doc improvements See merge request pleroma/pleroma!3057	2020-10-08 17:29:00 +00:00
Mark Felder	a702f9fb5b	Lint	2020-10-07 15:07:03 -05:00
Maksim	6ee20eb328	Apply 1 suggestion(s) to 1 file(s)	2020-10-07 19:32:42 +00:00
Maksim	8bfc5d9a0c	Apply 1 suggestion(s) to 1 file(s)	2020-10-07 19:32:09 +00:00
feld	d0eca5b125	Apply 2 suggestion(s) to 2 file(s)	2020-10-07 19:16:53 +00:00
Mark Felder	8156940a49	Compatibility with phoenix_pubsub 2.0.0	2020-10-07 13:28:39 -05:00
Mark Felder	570a406b7a	use Phoenix.ConnTest is deprecated	2020-10-07 10:31:08 -05:00
Egor Kislitsyn	bc3db72403	Use ModerationLog instead of Logger	2020-10-07 18:35:29 +04:00
Egor Kislitsyn	f1e4333dd7	Fix test	2020-10-07 18:35:28 +04:00
Egor Kislitsyn	e4792ce76a	Do not limit admins	2020-10-07 18:35:27 +04:00
Egor Kislitsyn	17562bf414	Move API endpoints to /api/v1/pleroma/backups	2020-10-07 18:35:27 +04:00
Egor Kislitsyn	7c22c9afb4	Allow admins request user backups	2020-10-07 18:34:31 +04:00
Egor Kislitsyn	7fdd81d000	Add "Your backup is ready" email	2020-10-07 18:34:30 +04:00
Egor Kislitsyn	27bc121ec0	Require email	2020-10-07 18:34:30 +04:00
Egor Kislitsyn	86ce4afd93	Improve backup urls	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	2c73bfe122	Add API endpoints for Backups	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	abdffc6b8c	Fix Credo warning	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	739cb1463b	Add backups deletion	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	3ad7492f9d	Add config for Pleroma.Backup	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	a0ad9bd734	Add BackupWorker	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	4f3a633745	Add backups table	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	75e07ba206	Fix tests	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	be42ab70dc	Add backup upload	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	c82f912959	Fix credo warning	2020-10-07 18:34:27 +04:00
Egor Kislitsyn	c01a818048	Add tests	2020-10-07 18:34:27 +04:00
Mark Felder	9783e9cd80	Add test for an entry without CIDR format	2020-10-06 17:08:26 -05:00
Mark Felder	d43d05005a	Move hardcoded default configuration into config.exs	2020-10-06 17:02:46 -05:00
Mark Felder	cddca85c84	Merge branch 'develop' into revert/rich-media-censorship	2020-10-06 14:25:20 -05:00
rinpatch	2698bbc9f6	Merge branch 'filtering-following' into 'develop' ... ActivityPub: Return Announces when filtering by `following`. See merge request pleroma/pleroma!3022	2020-10-06 18:11:34 +00:00
Ivan Tashkinov	6c2264af24	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-05 23:50:08 +03:00
Ivan Tashkinov	094edde7c4	[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.	2020-10-05 23:48:00 +03:00
Mark Felder	346cc3ac24	Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination	2020-10-05 12:40:53 -05:00
Ivan Tashkinov	f6024252ae	[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.	2020-10-02 22:18:02 +03:00
Alexander Strizhakov	cbdaabad34	web push http_client fix	2020-10-01 13:32:11 +03:00
lain	90fee49c52	User search: Once again, change uri handling. ... They can indeed be non-unique.	2020-09-30 14:14:41 +02:00
lain	2a11068a11	Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop' ... `ffmpeg` / `ImageMagick` handling as optional dependencies See merge request pleroma/pleroma!3031	2020-09-29 14:48:30 +00:00
lain	aa170caa76	Merge branch 'issue/2170' into 'develop' ... [#2170] Can't remove dead relay See merge request pleroma/pleroma!3041	2020-09-29 14:37:49 +00:00
Mark Felder	ba7f9459b4	Revert Rich Media censorship for sensitive statuses ... The #NSFW hashtag test was broken anyway.	2020-09-28 18:22:59 -05:00
rinpatch	7bc561127d	Revert citext user URI migration ... URI paths are not actually case-insesitive, which caused migration issues on a number of databases. Closes #2188	2020-09-28 18:34:03 +03:00
Maksim Pechnikov	de993b856b	added force option to the unfollow operation	2020-09-28 09:16:42 +03:00
Ivan Tashkinov	4e4f771082	Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update. ... Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).	2020-09-26 19:32:16 +03:00
Mark Felder	d1c724ef34	Merge branch 'develop' into fix/deprecation-warning-welcome-message	2020-09-25 13:08:33 -05:00
Mark Felder	93b674b66d	Fix test failures for NoOpPolicy describe/0	2020-09-25 12:46:49 -05:00
Mark Felder	4a30598b9e	Config settings leak and break configdb migration tests when async	2020-09-25 12:20:52 -05:00
Mark Felder	dcdf75fbac	Merge branch 'develop' into fix/deprecation-warning-welcome-message	2020-09-25 11:45:51 -05:00
feld	1672d8b37c	Merge branch 'feature/bulk-confirmation' into 'develop' ... Bulk account confirmation actions Closes #2085 See merge request pleroma/pleroma!2975	2020-09-25 16:15:01 +00:00
Mark Felder	2bf2c68dee	Merge branch 'develop' into fix/deprecation-warning-welcome-message	2020-09-25 10:48:01 -05:00
rinpatch	5cd71208d9	Merge branch 'search-even-more' into 'develop' ... More user search improvements See merge request pleroma/pleroma!3032	2020-09-25 12:56:21 +00:00
rinpatch	f67c967c4a	Merge branch 'features/incoming-create-exists' into 'develop' ... transmogrifier: Drop incoming create early if it already exists See merge request pleroma/pleroma!3026	2020-09-25 12:44:33 +00:00
lain	1e0f3f8514	User search: Make uri matches case insensitive.	2020-09-25 08:56:58 +02:00
lain	a8c17ea25a	User Search: Also find user by uri	2020-09-25 08:46:14 +02:00
Mark Felder	3bf3db39f5	Validate emails are sent to the appropriate unconfirmed actors	2020-09-24 18:24:44 -05:00
lain	d0078bc404	User Search: Boost resolved results and exact ap_id matches.	2020-09-24 15:54:55 +02:00
rinpatch	151df9fc17	Merge branch 'fix/test-fix' into 'develop' ... Fix for test on mac See merge request pleroma/pleroma!3027	2020-09-24 09:50:39 +00:00
lain	47cd59342f	Merge branch 'smol-test' into 'develop' ... CommonAPI test: Add test for polls See merge request pleroma/pleroma!3028	2020-09-24 09:41:28 +00:00
lain	35d62a4a56	CommonAPI test: Add test for polls	2020-09-24 11:12:03 +02:00
Alexander Strizhakov	165961f56d	don't run in async mode	2020-09-24 12:00:39 +03:00
Alexander Strizhakov	aa1f97a5b6	fix for test on mac	2020-09-24 10:46:09 +03:00
Alexander Strizhakov	727a0556a9	fix	2020-09-24 09:47:23 +03:00
Alexander Strizhakov	5d7ec00bed	fixes after rebase	2020-09-24 09:42:30 +03:00
Alexander Strizhakov	8c6ec4c111	pack routes change	2020-09-24 09:16:14 +03:00
Alexander Strizhakov	dbbc801667	pagination for remote emoji packs	2020-09-24 09:12:39 +03:00
Alexander Strizhakov	9b6d89ff8c	support for special chars in pack name	2020-09-24 09:12:37 +03:00
Mark Felder	f3a1f9c3bb	Merge branch 'develop' into feature/bulk-confirmation	2020-09-23 11:56:22 -05:00
lain	e02101e15c	Merge branch 'issue/2115' into 'develop' ... [#2115] added paginate links to headers for /chats/:id/messages See merge request pleroma/pleroma!2981	2020-09-23 12:09:38 +00:00
lain	4dadb7c433	Merge branch 'user-query/filter-out-internal' into 'develop' ... Filter out internal users by default Closes #2147 See merge request pleroma/pleroma!3024	2020-09-23 11:51:04 +00:00
lain	436d1a3c41	Merge branch 'develop' into 'issue/2115' ... # Conflicts: # CHANGELOG.md	2020-09-23 11:49:19 +00:00
Haelwenn (lanodan) Monnier	5e86a2809e	transmogrifier: Drop incoming create early if it already exists	2020-09-23 13:40:45 +02:00
Roman Chvanikov	8f5589cf66	Merge develop	2020-09-23 13:56:50 +03:00
lain	a6c14041c4	Merge branch 'develop' into 'issue/1975' ... # Conflicts: # CHANGELOG.md	2020-09-23 09:16:00 +00:00
Maksim Pechnikov	8e4f043ac7	finland-emojis.zip -> emojis.zip	2020-09-22 21:58:30 +03:00
Maksim Pechnikov	72d2b34d3b	Merge branch 'develop' into issue/1975	2020-09-22 21:42:10 +03:00
Alex Gleason	3104367931	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	2020-09-22 13:37:02 -05:00
Mark Felder	88653c01c9	Add test for check_activity_expiration_config/0	2020-09-22 11:34:51 -05:00
Mark Felder	7775b1540f	Add deprecation warning test for check_hellthread_threshold/0	2020-09-22 11:22:15 -05:00
Mark Felder	25bdf0d0d9	Add test for welcome message format	2020-09-22 11:19:29 -05:00
Mark Felder	e2dcf039d2	Fix gun_pool_options deprecation warning message	2020-09-22 11:15:40 -05:00
lain	c95859e45b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115	2020-09-22 17:13:46 +02:00
Egor Kislitsyn	0e0ece251a	Filter out internal users by default	2020-09-22 16:56:11 +04:00
lain	ee3052a2d8	ActivityPub: Return Announces when filtering by following.	2020-09-22 14:20:19 +02:00
Alex Gleason	bf181ca968	Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()	2020-09-21 16:03:22 -05:00
Alex Gleason	0b728ccc44	Pass hackney tls config into email tests, #2101	2020-09-21 15:26:10 -05:00
lain	9108e27c2f	Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop' ... [#2074] OAuth scope checking in Streaming API Closes #2074 See merge request pleroma/pleroma!3013	2020-09-21 17:15:54 +00:00
lain	b36b6259d8	Merge branch 'issue/2099' into 'develop' ... [#2099] Import/export mutes [BE] See merge request pleroma/pleroma!2965	2020-09-21 16:25:17 +00:00
lain	f2f0a0260f	ActivityPub: Don't block-filter your own posts ... We are filtering out replies to people you block, but that should not include your own posts.	2020-09-21 16:08:38 +02:00
Roman Chvanikov	28d0986f83	Refactor mutes removing in CommonAPI and User	2020-09-20 20:58:17 +03:00
Roman Chvanikov	4987ee6256	Merge branch 'develop' into feature/expire-mutes	2020-09-20 19:27:27 +03:00
Ivan Tashkinov	60b025b782	[#2074] OAuth scope checking in Streaming API.	2020-09-19 19:16:55 +03:00
Maksim Pechnikov	ed3bc53fa1	Merge branch 'develop' into issue/2099	2020-09-18 22:13:05 +03:00
feld	6c052bd5b6	Merge branch 'media-preview-proxy-nostream' into 'develop' ... Media preview proxy See merge request pleroma/pleroma!3001	2020-09-18 18:38:20 +00:00
lain	7e02f4ed3b	Merge branch 'feature/2118-web-push-encryption-http' into 'develop' ... Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Closes #2118 See merge request pleroma/pleroma!3008	2020-09-18 12:25:10 +00:00
Steven Fuchs	f2ef9735c5	Federate data through persistent websocket connections	2020-09-18 11:58:22 +00:00
Maksim Pechnikov	2ec0dcf001	Merge branch 'develop' into issue/2099	2020-09-18 07:08:37 +03:00
Sergey Suprunenko	226fa3e486	Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter	2020-09-17 22:10:55 +02:00
Ivan Tashkinov	a428800405	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream ... # Conflicts: # CHANGELOG.md	2020-09-17 22:22:59 +03:00
Haelwenn (lanodan) Monnier	7bf269fe83	Fix MRF reject for ChatMessage	2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier	abf25e5d52	Create MRF.filter_pipeline to inject :object_data when present	2020-09-17 22:07:54 +03:00
Haelwenn	beefc022dd	Merge branch 'omit-nondiscoverable-from-search' into 'develop' ... User search should respect discoverable flag See merge request pleroma/pleroma!2997	2020-09-17 17:59:38 +00:00
feld	608824b97e	Merge branch 'instance-docs' into 'develop' ... AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931	2020-09-17 16:54:53 +00:00
rinpatch	608017b7df	Merge branch 'fix/streaming-termination-errors' into 'develop' ... Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982	2020-09-17 19:50:51 +03:00
Haelwenn	0465bdbd49	Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' ... Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992	2020-09-17 19:50:23 +03:00
lain	bb70b231d0	Merge branch 'reply-visibility-user-guard' into 'develop' ... Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user See merge request pleroma/pleroma!2999	2020-09-17 19:49:08 +03:00
rinpatch	22d49993d9	Merge branch 'bugfix/mrf-ingestion' into 'develop' ... Bugfix: MRF and Pipeline Ingestion See merge request pleroma/secteam/pleroma!15	2020-09-17 19:48:33 +03:00
stwf	9d77f4abf8	adapt to new user factory behavior	2020-09-17 12:32:40 -04:00
stwf	dfc621a529	add test and changelog entry	2020-09-17 12:18:07 -04:00
stwf	41939e3175	User search respect discoverable flag	2020-09-17 12:15:50 -04:00
rinpatch	dee4639dbb	Merge branch 'feat/rich-media-head' into 'develop' ... RichMedia: Do a HEAD request to check content type/length See merge request pleroma/pleroma!2995	2020-09-17 19:04:50 +03:00
Mark Felder	f7e40f7ef1	Deny ConfigDB migration when deprecated settings found	2020-09-17 09:32:50 -05:00
Ivan Tashkinov	d9fb5bc08a	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	2020-09-17 17:14:20 +03:00
Ivan Tashkinov	7cdbd91d83	[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.	2020-09-17 17:13:40 +03:00
lain	7c60789ba5	Merge branch 'develop' into 'nondiscoverable-user-metadata' ... # Conflicts: # CHANGELOG.md	2020-09-17 14:09:01 +00:00
eugenijm	c711a2b157	Return the file content for GET /api/pleroma/admin/instance_document/:document_name	2020-09-17 16:55:53 +03:00
eugenijm	582ad5d4e1	AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API	2020-09-17 16:48:07 +03:00
Roman Chvanikov	44e8b6037a	Merge branch 'develop' into feature/expire-mutes	2020-09-17 14:54:00 +03:00
lain	5e3c70afa5	AdminAPI Chat tests: Remove factory. ... The factory system doesn't work too well with how the chats are done. Instead of tempting people to use it, let's rather use the CommonAPI system for now.	2020-09-17 13:37:25 +02:00
lain	e39ff2616b	Admin chat api tests: Small additions.	2020-09-17 13:29:26 +02:00
lain	7a73850928	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation	2020-09-17 13:26:04 +02:00
Maksim Pechnikov	b867f9d7ae	Merge branch 'develop' into issue/2099	2020-09-17 08:41:35 +03:00
Mark Felder	73e0e6a8a2	Remove unused import	2020-09-16 10:56:42 -05:00
lain	7a88b726bf	User: Remote users don't need to be confirmed or approved	2020-09-16 17:29:16 +02:00
rinpatch	eca8d26784	Merge branch 'chores/mrf-loglevel' into 'develop' ... Fetcher: Correctly return MRF reject reason See merge request pleroma/pleroma!2990	2020-09-16 13:37:04 +00:00
rinpatch	adbd0032fa	Merge branch 'features/validators-video' into 'develop' ... Pipeline Ingestion: Video and Article See merge request pleroma/pleroma!2908	2020-09-16 13:36:27 +00:00
lain	6b088ed76a	Merge branch 'issue/2089' into 'develop' ... [#2089] fix notifications See merge request pleroma/pleroma!3000	2020-09-16 12:22:48 +00:00
Maksim Pechnikov	599f8bb152	RepoStreamer.chunk_stream -> Repo.chunk_stream	2020-09-16 09:47:18 +03:00
Ivan Tashkinov	2f155fb89f	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	2020-09-15 20:29:39 +03:00
Maksim Pechnikov	f879d07fa1	fixed tests	2020-09-15 15:32:49 +03:00
eugenijm	3ab59a6f3c	Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user	2020-09-15 13:00:56 +03:00
Haelwenn	5c4ff5c73c	Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' ... Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992	2020-09-15 08:25:10 +00:00
stwf	f900a40d5d	fix credo warning	2020-09-14 13:55:49 -04:00
stwf	38b2db297b	search indexing metadata respects discoverable flag	2020-09-14 13:18:11 -04:00
Mark Felder	d31f0393bf	Validate Welcome Chat message works with Simple policy applied to local instance	2020-09-14 12:06:08 -05:00
rinpatch	738685a629	Apply 1 suggestion(s) to 1 file(s)	2020-09-14 11:56:00 +00:00
rinpatch	f70335002d	RichMedia: Do a HEAD request to check content type/length ... This shouldn't be too expensive, since the connections are pooled, but it should save us some bandwidth since we won't fetch non-html files and files that are too large for us to process (especially since you can't cancel a request without closing the connection with HTTP1).	2020-09-14 14:45:58 +03:00
Roman Chvanikov	c5830ac037	Merge develop	2020-09-13 12:24:57 +03:00
Alex Gleason	c4061f06ba	Merge branch 'chat-moderation-stable' into chat-moderation	2020-09-11 14:30:28 -05:00
Alex Gleason	bc86d0a906	Chat moderation: fix formatting	2020-09-11 14:29:56 -05:00
Alex Gleason	9733c9d065	Merge remote-tracking branch 'upstream/develop' into chat-moderation	2020-09-11 14:13:38 -05:00
Alex Gleason	dfb831ca39	Chat moderation: add tests for unauthorized access	2020-09-11 14:11:07 -05:00
Alex Gleason	e229536e5c	Chat Moderation: use explicit sender and recipient fields	2020-09-11 14:11:00 -05:00
Alex Gleason	67726453f8	Credo fix	2020-09-11 14:10:52 -05:00
Alex Gleason	02d70228b5	AdminAPI: fix delete chat message	2020-09-11 14:10:35 -05:00
Alex Gleason	9dd0b23da4	AdminAPI: show chat	2020-09-11 14:10:28 -05:00
Alex Gleason	f13b52a703	AdminAPI: list messages in a chat	2020-09-11 14:10:19 -05:00
Alex Gleason	fb0de07343	AdminAPI: list chats for a user	2020-09-11 14:10:05 -05:00
Alex Gleason	b40a627ab0	AdminAPI: delete a chat message	2020-09-11 14:09:58 -05:00
Alex Gleason	f88dc1937e	MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1	2020-09-11 14:09:50 -05:00
Haelwenn (lanodan) Monnier	f1f44069ae	Fetcher: Correctly return MRF reject reason	2020-09-11 20:00:41 +02:00
Ivan Tashkinov	0bda85857e	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex	2020-09-11 17:19:58 +03:00
Haelwenn (lanodan) Monnier	dbc013f24c	instance: Handle not getting a favicon	2020-09-11 11:37:46 +02:00
Haelwenn (lanodan) Monnier	1b3d5956b1	Pipeline Ingestion: Article	2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier	846b59ccb0	Pipeline Ingestion: Video	2020-09-11 01:39:39 +02:00
Mark Felder	55562ca936	Merge branch 'develop' into feature/gen-magic	2020-09-10 16:05:22 -05:00
Alexander Strizhakov	15aece7238	remove validate_expires_at from enqueue method	2020-09-10 21:52:31 +03:00
Alexander Strizhakov	2c2094d4b2	configurable lifetime for ephemeral activities	2020-09-10 21:51:59 +03:00
Alexander Strizhakov	eb5ff715f7	pin/unpin for activities with expires_at option	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	93e1c8df9d	reject activity creation ... if passed expires_at option and expiring activities are not configured	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	de4c935071	don't expire pinned posts	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	9bf1065a06	schedule activity expiration in Oban	2020-09-10 21:50:40 +03:00
rinpatch	0254696e30	Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop' ... Feature/1790 removing expired tokens through Oban scheduled jobs See merge request pleroma/pleroma!2957	2020-09-10 18:45:04 +00:00
rinpatch	541a3eede2	Merge branch 'chores/remove-ostatus-fixtures' into 'develop' ... Remove OStatus in testsuite See merge request pleroma/pleroma!2968	2020-09-10 18:41:00 +00:00
rinpatch	275602daa7	Streaming integration tests: remove unexpected error assumption ... For some reason instead of fixing unexpected errors, we made tests assert they indeed trigger... Now that the errors are fixed these were failing	2020-09-10 21:28:47 +03:00
Alexander Strizhakov	7dd986a563	expire mfa tokens through Oban	2020-09-10 16:01:19 +03:00
Alexander Strizhakov	3ce658b930	schedule expired oauth tokens deletion with Oban	2020-09-10 16:01:19 +03:00
Maksim Pechnikov	9853c90abb	added paginate links to headers for /chats/:id/messages	2020-09-10 12:39:29 +03:00
Ivan Tashkinov	68a74d6659	[#2497] Added missing alias, removed legacy :adapter option specification for HTTP.get/_.	2020-09-09 19:30:42 +03:00
Mark Felder	4ee99dafcc	Merge branch 'develop' into media-preview-proxy	2020-09-09 11:11:36 -05:00
Mark Felder	b900c06d4e	Add tests for the bulk confirm/unconfirm tasks	2020-09-09 09:02:07 -05:00
Mark Felder	6c79a60649	Add test for pleroma.user set --confirmed ... Order now matters because of testing shell_info	2020-09-09 08:44:01 -05:00
rinpatch	0d2814ec8e	Metadata: Move restriction check from Feed provider to activated_providers	2020-09-08 20:21:34 +03:00
Mark Felder	a85ed6defb	Do not serve RSS/Atom feeds when instance is private	2020-09-08 20:21:34 +03:00
Mark Felder	44ced17634	Fix test so setting doesn't leak	2020-09-08 20:21:34 +03:00
Mark Felder	ff07014b26	Disable providers of user and status metadata when instance is private	2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier	10ef532c63	AP C2S: Restrict character limit on Note	2020-09-08 20:21:34 +03:00
Haelwenn	073f5490ec	Merge branch 'bugfix/mock' into 'develop' ... mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973	2020-09-08 19:46:23 +03:00
rinpatch	7490b76bbf	Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' ... Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924	2020-09-08 19:45:44 +03:00
Haelwenn (lanodan) Monnier	921f926e96	Remove OStatus in testsuite	2020-09-08 18:43:57 +02:00
Haelwenn (lanodan) Monnier	ee0e05f930	Drop unused "inReplyToAtomUri" in objects	2020-09-08 18:43:57 +02:00
Alexander Strizhakov	fd7e9bdd25	don't run async tests, which use Mock	2020-09-08 17:40:23 +02:00
feld	bf048ab72f	Merge branch 'develop' into 'develop' ... ForceBotUnlistedPolicy See merge request pleroma/pleroma!2967	2020-09-08 14:52:51 +00:00
Haelwenn (lanodan) Monnier	f6723dc9bd	account_view_test: Remove empty test	2020-09-08 16:33:22 +02:00
Haelwenn (lanodan) Monnier	788dececff	test: remove extraneous :instances_favicons config bits	2020-09-08 16:32:54 +02:00
Mark Felder	21efda2edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted	2020-09-08 09:31:26 -05:00
rinpatch	0a05670b44	Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' ... Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924	2020-09-08 12:21:33 +00:00
Roman Chvanikov	880a92ccc7	Merge branch 'develop' into feature/expire-mutes	2020-09-08 15:16:43 +03:00
Roman Chvanikov	e3f845b243	Add expiring mutes for activities	2020-09-08 15:13:50 +03:00
rinpatch	ce3474f4d3	Disable favicon scraping in tests	2020-09-08 15:09:10 +03:00
Roman Chvanikov	f6b250fb8d	Add test for expiring mutes	2020-09-08 14:11:00 +03:00
lain	9b85592b8b	Merge branch 'fix/rich-media-fake-statuses' into 'develop' ... Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956	2020-09-08 13:56:42 +03:00
rinpatch	964bc8e2e8	Merge branch 'bugfix/favicon-too-long' into 'develop' ... instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949	2020-09-08 13:55:52 +03:00
feld	43b07c31cb	Merge branch 'fix/2095-deactivated-account-reset' into 'develop' ... Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935	2020-09-08 13:53:47 +03:00
rinpatch	dccbed856d	Merge branch 'http-fixes' into 'develop' ... Improvements and fixes for http requests See merge request pleroma/pleroma!2904	2020-09-08 13:53:16 +03:00
Roman Chvanikov	c56e3d4f3b	Add expires_in param for account mutes	2020-09-08 13:26:44 +03:00
rinpatch	ea4b6c64d6	Merge branch 'feat/rich-media-improvements' into 'develop' ... Rich media improvements See merge request pleroma/pleroma!2944	2020-09-08 13:00:49 +03:00
rinpatch	8c3241df44	Merge branch 'fix/2047-rich-media-parser' into 'develop' ... RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941	2020-09-08 13:00:15 +03:00
rinpatch	13e606941c	Merge branch 'fix/2087-metadata' into 'develop' ... Fix/2087 metadata See merge request pleroma/secteam/pleroma!11	2020-09-08 12:55:30 +03:00
rinpatch	84acfab156	Merge branch 'fix-searching-following' into 'develop' ... search: fix 'following' query parameter See merge request pleroma/pleroma!2943	2020-09-08 12:53:02 +03:00
rinpatch	718c7cc847	Merge branch 'fix/apc2s-limits' into 'develop' ... AP C2S: Restrict character limit on Note Closes #2 See merge request pleroma/secteam/pleroma!9	2020-09-08 12:51:38 +03:00
Mark Felder	4ea07f74e9	Revert/simplify. ... We only need to check the content-type. There's no chance a webp file will get mismatched as another image type.	2020-09-08 12:29:38 +03:00
Mark Felder	216c84a8f4	Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.	2020-09-08 12:29:38 +03:00
Mark Felder	3a98960c26	Verify webp files are not processed with exiftool	2020-09-08 12:29:38 +03:00
Mark Felder	2165a24974	Improve upload filter return values so we can identify when filters make no changes to the input	2020-09-08 12:29:38 +03:00
Alibek Omarov	d074e54013	ForceBotUnlistedPolicy: try to fix test 2	2020-09-07 23:28:29 +02:00
Alibek Omarov	0a25c92cfa	ForceBotUnlistedPolicy: try to fix test	2020-09-07 23:18:36 +02:00
Alibek Omarov	d2fd1d3481	ForceBotUnlistedPolicy: fix test extension	2020-09-07 23:04:07 +02:00
Alibek Omarov	8b695c3eeb	ForceBotUnlistedPolicy: format	2020-09-07 22:53:45 +02:00
Alibek Omarov	57cf0cc3b3	ForceBotUnlistedPolicy: add test	2020-09-07 22:50:57 +02:00
Alexander Strizhakov	18d21aed00	deprecation warnings	2020-09-07 19:59:17 +03:00
Alexander Strizhakov	696bf09433	passing adapter options directly without adapter key	2020-09-07 19:59:17 +03:00
Alexander Strizhakov	ee67c98e55	removing Stats worker from Oban cron jobs	2020-09-07 19:16:14 +03:00
rinpatch	d5c286b802	Merge branch 'bugfix/favicon-too-long' into 'develop' ... instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949	2020-09-07 11:12:30 +00:00
lain	fdab01ab56	Merge branch 'fix/rich-media-fake-statuses' into 'develop' ... Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956	2020-09-07 10:19:19 +00:00
Haelwenn (lanodan) Monnier	08aef7dd4e	instance: Log catch favicon errors as warnings	2020-09-07 08:40:52 +02:00
Maksim Pechnikov	917d325972	added api spec	2020-09-07 07:17:30 +03:00
Maksim Pechnikov	5ae56aafb2	added import mutes	2020-09-06 21:42:51 +03:00
Ivan Tashkinov	759f8bc3ae	[#2497] Fixed MediaProxyWarmingPolicyTest.	2020-09-06 15:30:11 +03:00
rinpatch	170599c390	RichMedia: do not log webpages missing metadata as errors ... Also fixes the return value of Parser.parse on errors, previously was just `:ok` due to the logger call in the end	2020-09-05 22:05:35 +03:00
rinpatch	e198ba492e	Rich Media: Do not cache URLs for preview statuses ... Closes #1987	2020-09-05 20:53:46 +03:00
Ivan Tashkinov	c3b02341bf	[#2497] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.	2020-09-05 16:16:35 +03:00
Mark Felder	85446cc30c	Merge branch 'develop' into media-preview-proxy	2020-09-03 10:34:06 -05:00
lain	9433311923	Merge branch 'bugfix/incoming-poll-emoji' into 'develop' ... Fix emoji in Question, force generated context/context_id insertion Closes #1870 See merge request pleroma/pleroma!2915	2020-09-03 11:50:30 +00:00
lain	5da3677607	Frontend mix task: Add tests.	2020-09-03 11:40:17 +02:00
feld	d1a6f67b1d	Merge branch 'fix/2095-deactivated-account-reset' into 'develop' ... Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935	2020-09-02 17:11:24 +00:00
lain	119e11f455	Merge branch 'bugfix/mastoapi-lists' into 'develop' ... Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940	2020-09-02 17:03:45 +00:00
Mark Felder	cbf7f0e029	Disallow password resets for deactivated accounts. ... Ensure all responses to password reset events are identical.	2020-09-02 09:09:13 -05:00
rinpatch	19691389b9	Rich media: Add failure tracking	2020-09-02 14:59:52 +03:00
rinpatch	47ff425cfd	Merge branch 'fix/2047-rich-media-parser' into 'develop' ... RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941	2020-09-02 09:38:43 +00:00
rinpatch	b2d776d77d	Merge branch 'http-fixes' into 'develop' ... Improvements and fixes for http requests See merge request pleroma/pleroma!2904	2020-09-02 09:36:56 +00:00
Alexander Strizhakov	79f65b4374	correct pool and uniform headers format	2020-09-02 09:16:51 +03:00
Karol Kosek	868057871a	search: fix 'following' query parameter ... The parameter included the accounts that are following you (followers) instead of those you are actually following. Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>	2020-09-02 02:08:43 +02:00
Alexander Strizhakov	03d06062ab	don't fail on url fetch	2020-09-01 19:39:07 +03:00
Haelwenn (lanodan) Monnier	d872858046	Fix removing an account from a list ... Mastodon (Frontend) changed a different method for deletes, keeping old format as mastodon documentation is too loose	2020-09-01 12:49:32 +02:00
rinpatch	126461942b	User table: ensure bio is always a string ... Gets rid of '|| ""' in multiple places and fixes #2067	2020-09-01 10:45:42 +03:00
Maksim Pechnikov	0d5088c2b8	remove unread_conversation_count from User	2020-09-01 09:37:08 +03:00
Haelwenn (lanodan) Monnier	a142da3e4f	Add new Emoji Ecto.Type and fix emoji in Question	2020-09-01 08:34:57 +02:00
Haelwenn	9d63b2c9db	Merge branch 'chat-relation-constraints' into 'develop' ... Chats: Add cascading delete on both referenced users. See merge request pleroma/pleroma!2934	2020-08-31 20:55:05 +00:00
lain	0b621a834a	Chats: Add cascading delete on both referenced users. ... Also remove the now-superfluous join in the chat controller, which was only used to filter out these cases.	2020-08-31 16:48:17 +02:00
Mark Felder	3737f38432	Merge branch 'develop' into feld-2168-media-preview-proxy	2020-08-30 11:28:45 -05:00
Maksim Pechnikov	f0fefc4f5c	marks notifications as read after mute	2020-08-28 18:17:44 +03:00
Haelwenn	6b01a09a08	Merge branch '2078-list-fixes' into 'develop' ... Resolve "List timeline returns incorrectly assigned Account for replies and repeats" Closes #2070 and #2078 See merge request pleroma/pleroma!2923	2020-08-27 17:05:53 +00:00
lain	78939c1d16	ChatController: Don't die if the recipient is gone.	2020-08-27 12:13:18 +02:00
Mark Felder	2cfe2dc81b	Merge branch 'develop' into feld-2168-media-preview-proxy	2020-08-26 16:37:57 -05:00
lain	cfc99fe05c	TimelineController: Keys are atoms now. ... Closes #2078 Closes #2070	2020-08-26 15:37:30 +02:00
feld	fb33321fa2	Merge branch 'feature/1952-read-muted-notifications' into 'develop' ... Automatically mark notifications about statuses from muted users and threads as read Closes #1952 See merge request pleroma/pleroma!2893	2020-08-25 21:32:32 +00:00
Mark Felder	479578b148	Merge branch 'develop' into feld-2168-media-preview-proxy	2020-08-25 11:57:23 -05:00
lain	112bec5225	Webfinger: Handle bogus ids better.	2020-08-25 17:35:59 +02:00
lain	c1d51944c7	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	2020-08-25 11:44:51 +02:00
feld	d39abd02ac	Merge branch 'relay-fix-admin-fe' into 'develop' ... Relay fix for admin-fe See merge request pleroma/pleroma!2902	2020-08-24 17:03:18 +00:00
Maksim Pechnikov	14ec12ac95	added tests	2020-08-24 15:01:45 +03:00
Maksim Pechnikov	f5845ff033	upload emoji zip file	2020-08-22 10:42:02 +03:00
lain	e1c8c599ff	Merge branch 'features/validators-event' into 'develop' ... Pipeline Ingestion: Event See merge request pleroma/pleroma!2909	2020-08-21 16:10:30 +00:00
Alexander Strizhakov	1f8c32b773	adding actor type in user show	2020-08-21 10:38:56 +03:00
Haelwenn (lanodan) Monnier	36c125a071	Pipeline Ingestion: Event	2020-08-20 21:49:26 +02:00
lain	c1277be041	AudioHandlingTest: Make mock explicit	2020-08-19 14:36:42 +02:00
lain	9aae342e7a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2	2020-08-19 14:10:11 +02:00
Alexander Strizhakov	c68bcae362	fix for sometimes failing tests	2020-08-19 12:57:29 +03:00
Alexander Strizhakov	7dc275b69b	relay fix for admin-fe	2020-08-19 08:41:39 +03:00
Maksim Pechnikov	7794d7c694	added Pleroma.Web.PleromaAPI.EmojiFileController	2020-08-19 06:50:20 +03:00
Haelwenn (lanodan) Monnier	5316e231b0	Pipeline Ingestion: Audio (Part 2)	2020-08-19 00:06:31 +02:00
Haelwenn	3d5d8c05c9	Merge branch '2064-image-blanking' into 'develop' ... Resolve "Make default image description blank" Closes #2064 See merge request pleroma/pleroma!2899	2020-08-18 19:02:33 +00:00
Ivan Tashkinov	da116d81fb	[#2497] Added video preview proxy. Switched from exexec to Port.	2020-08-18 18:23:27 +03:00
Ivan Tashkinov	27e7999a15	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-08-18 18:02:09 +03:00
lain	f0a8d723bb	Transmogrifier Test: Extract audio tests.	2020-08-18 13:37:28 +02:00
lain	aabc26a573	Pleroma.Upload: Set default upload name / description based on config.	2020-08-18 13:21:30 +02:00
Alex Gleason	a0f5eb1a55	Test that POST /api/pleroma/delete_account purges the user	2020-08-18 00:24:28 -05:00
Alex Gleason	dcc8926ff1	Test purging a user with User.delete/1	2020-08-18 00:10:09 -05:00
Alex Gleason	c12c576ee2	Also purge bio and display name	2020-08-17 22:11:45 -05:00
Alex Gleason	d55faa2f8f	Purge a local user upon deletion, fixes #2062	2020-08-17 21:52:28 -05:00
lain	34b099fffa	Merge branch 'issue/1936' into 'develop' ... [#1936] Ability to search for banned MediaProxy URLs  See merge request pleroma/pleroma!2873	2020-08-17 13:05:20 +00:00
Sergey Suprunenko	25c69e271a	Make notifications about new statuses from muted threads read	2020-08-17 00:11:33 +02:00
Maksim Pechnikov	f6da12f45d	fix search media proxy urls	2020-08-16 06:54:48 +03:00
Ivan Tashkinov	60ac83a4c1	[#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.	2020-08-15 18:30:20 +03:00
Sergey Suprunenko	0865f36965	Mark notifications about statuses from muted users as read automatically	2020-08-15 15:27:41 +02:00
Ivan Tashkinov	95529ab709	[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).	2020-08-14 20:55:45 +03:00
feld	14a06e63f6	Merge branch 'fix/activity-expirations-again' into 'develop' ... Fix activity expirations again See merge request pleroma/pleroma!2866	2020-08-13 17:38:19 +00:00
Haelwenn	f99b8a25eb	Merge branch 'reject' into 'develop' ... Move Accepts and Rejects to the Pipeline See merge request pleroma/pleroma!2878	2020-08-13 16:04:43 +00:00
lain	5be25b3e38	Merge branch '1152-deletion' into 'develop' ... User deletion issue exploration See merge request pleroma/pleroma!2879	2020-08-13 09:06:33 +00:00
Maksim Pechnikov	56470647de	Merge branch 'develop' into issue/1936	2020-08-13 09:00:25 +03:00
Alexander Strizhakov	3ab83f837e	don't load pinned activities in due_expirations	2020-08-12 19:46:47 +03:00
feld	dfc56de167	Merge branch 'feature/update-welcome-setting-in-description' into 'develop' ... Update :welcome settings in description.exs Closes #2024 See merge request pleroma/pleroma!2843	2020-08-12 16:18:40 +00:00
lain	05ff666f99	AdminApiControllerTest: Add test that deleted users get deactivated.	2020-08-12 16:31:00 +02:00