3028 Commits (6c0d869d9d46af12b2977842e4e1381871c49118)

Author	SHA1	Message	Date
Maksim Pechnikov	70410dfafd	fix create service actor	5 years ago
eugenijm	0b6d1292d2	Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list	5 years ago
Maksim Pechnikov	fa7d8e77e6	fixed Metadata.Utils.scrub_html_and_truncate	5 years ago
Ivan Tashkinov	badd0a96ea	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	5 years ago
Maksim Pechnikov	933dc12043	added code of mr#2067	5 years ago
Maksim Pechnikov	385356aad0	fix oauth scopes for AdminApi#reports_update	5 years ago
Maksim Pechnikov	969769730e	update tests	5 years ago
Maksim Pechnikov	bdd71669da	update test	5 years ago
Maksim Pechnikov	5b84156013	moved remote follow in separate controller	5 years ago
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	c51e93978e	Merge branch 'feature/custom-runtime-modules' into 'develop' ... Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039	5 years ago
Maxim Filippov	e71a13ad57	Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" ... This reverts merge request !2076	5 years ago
Mark Felder	06ae56a3ae	Posts without media attachments should get the Summary TwitterCard	5 years ago
feld	a54aa5af43	Merge branch 'feature/status-counts-by-scope' into 'develop' ... Stats: return status counts by scope See merge request pleroma/pleroma!2076	5 years ago
Maxim Filippov	4079d66f00	Expose issue via failing test	5 years ago
Ivan Tashkinov	ead2d18826	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	5 years ago
Ivan Tashkinov	455e072d27	[#2068] Introduced proper OAuth tokens usage to controller tests.	5 years ago
Egor Kislitsyn	34d85f8a54	Return 404 if account to filter notifications from is not found	5 years ago
Egor Kislitsyn	775212121c	Verify HTTP signatures only when request accepts "activity+json" type	5 years ago
Egor Kislitsyn	432b3067d4	Do not crash when remote user follower and following counters are hidden	5 years ago
Maxim Filippov	404a9ccb9a	Stats: return status counts by scope	5 years ago
Maksim Pechnikov	b53573a837	add tag feeds	5 years ago
Thomas Citharel	d2f1c4f658	Add ActivityPub Object Event type support ... Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>	5 years ago
Egor Kislitsyn	6c39fa20b1	Add support for `account_id` param to filter notifications by the account	5 years ago
Maxim Filippov	45180d4c60	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	5 years ago
Egor Kislitsyn	8f79f433bc	Hide follower counter when hiding is activated	5 years ago
Maksim Pechnikov	a879c396bb	Merge branch 'develop' into feature/tag_feed	5 years ago
minibikini	e1fa8c11a9	Apply suggestion to test/plugs/http_signature_plug_test.exs	5 years ago
Egor Kislitsyn	a12b6454bb	Add an option to require fetches to be signed	5 years ago
rinpatch	eae65e3216	formatting	5 years ago
rinpatch	6ffbfdeeb2	tests: significantly reduce streamer timeout ... there is no reason IPC between two processes on the same node should take 4 seconds	5 years ago
rinpatch	54029fe212	tests: remove a useless sleep in rate limiter tests ... It was used to check that authenticated and unauthenticated users have different limits. Instead of sleeping a super low limit for unauthenticated users was set, preventing them from doing 5 requests in the first place.	5 years ago
rinpatch	137a3d220b	tests: remove a useless 1 second sleep ... there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.	5 years ago
rinpatch	814a99c80f	tests: remove a useless 3 second sleep ... the ids favs use are accurate down to a microsecond, there is no need for it	5 years ago
rinpatch	c8046e1080	tests: Replace 2 second sleep with offseting updated_at	5 years ago
Ivan Tashkinov	7973cbdb9f	OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.	5 years ago
Maksim Pechnikov	67cb46e15d	Merge branch 'develop' into issue/1383	5 years ago
Maxim Filippov	eb11c60289	Disable rate limiter for socket/localhost (unless RemoteIp is enabled)	5 years ago
Egor Kislitsyn	7528322f83	Merge branch 'develop' into feature/custom-runtime-modules	5 years ago
lain	2f31cef71f	Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060	5 years ago
Ivan Tashkinov	81b05340e9	[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). ... PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.	5 years ago
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	5 years ago
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	5 years ago
Mark Felder	9ef912aecf	Merge branch 'develop' into issue/1411	5 years ago
rinpatch	72f3b22134	Merge branch 'domain-block-precedence' into 'develop' ... make follows take precedence over domain blocks See merge request pleroma/pleroma!2019	5 years ago
Ivan Tashkinov	3920244be5	[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.	5 years ago
Sadposter	8cfaab8f04	Merge branch 'develop' into 'domain-block-precedence' ... # Conflicts: # lib/pleroma/user.ex	5 years ago
Sadposter	5abee19b63	make analysis happy	5 years ago
Sadposter	19d228cc58	modify SQL to include followed-but-domain-blocked activities	5 years ago
minibikini	43d9c06a2a	Merge branch 'develop' into 'feature/custom-runtime-modules' ... # Conflicts: # CHANGELOG.md	5 years ago
lain	1ae976ac51	Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md	5 years ago
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	5 years ago
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	5 years ago
Maksim Pechnikov	9dfaa0b832	fix loads config variable with large value from db	5 years ago
rinpatch	37c34ccec3	Merge branch 'fix/prefer-url-over-search' into 'develop' ... status search: prefer the status fetched by url over other results See merge request pleroma/pleroma!2050	5 years ago
rinpatch	f4b7f32d51	status search: prefer the status fetched by url over other results	5 years ago
Egor Kislitsyn	c098dec473	Merge branch 'develop' into feature/custom-runtime-modules	5 years ago
Maksim Pechnikov	2b821036c4	Merge branch 'develop' into issue/1383	5 years ago
lain	b3c80b8404	Merge branch 'exclude-visibilities-for-like-notifications' into 'develop' ... Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957	5 years ago
Maksim Pechnikov	95e6a2acd9	Merge branch 'develop' into issue/1342	5 years ago
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	8404f8c8fb	Merge branch 'improve-move-notificaions-api' into 'develop' ... Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032	5 years ago
rinpatch	29a3f70cba	Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop' ... ActivityPub: For user timelines, respects blocks. Closes #1463 See merge request pleroma/pleroma!2041	5 years ago
Maxim Filippov	cc36a8ea90	Fix test	5 years ago
Maxim Filippov	a7f77785c2	Implement report notes destruction	5 years ago
Ivan Tashkinov	1770602747	[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.	5 years ago
Ivan Tashkinov	40e1817f70	[#1427] Fixes / improvements of admin scopes support. Added tests.	5 years ago
rinpatch	6cb31edd76	Merge branch 'feature/1455-chat-character-limit' into 'develop' ... Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034	5 years ago
lain	e8cee4d9a0	ActivityPub: For user timelines, respects blocks. ... Unless the timeline belongs to a blocked user.	5 years ago
Egor Kislitsyn	a75d4a41e0	Add a test for custom runtime modules	5 years ago
Maxim Filippov	08c89fd2b8	Fix incorrect report count	5 years ago
Maksim Pechnikov	22fc271e23	init tag feed	5 years ago
Ivan Tashkinov	13926537b6	Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes	5 years ago
Ivan Tashkinov	af42c00cff	[#1427] Reworked admin scopes support. ... Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).	5 years ago
rinpatch	cdff5b8267	Merge branch 'develop' into fix/mrf-delete	5 years ago
rinpatch	9f99640cfc	ActivityPub: Fix deletes being exempt from MRF ... Closes #1461	5 years ago
lain	67d8df04a4	Merge branch '1335-user-api-id-fields-relations' into 'develop' ... [#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963	5 years ago
feld	d0bd4348b3	Merge branch 'feature/admin-api-render-whole-status' into 'develop' ... Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007	5 years ago
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	5 years ago
Maksim Pechnikov	e21afdb7c7	Merge branch 'develop' into issue/1411	5 years ago
Egor Kislitsyn	d4953474ac	Merge branch 'develop' into improve-move-notificaions-api	5 years ago
Maxim Filippov	4453a9cb73	Add failing test, which exposes a bug	5 years ago
Maksim Pechnikov	3c3bba0b7c	fix ScheduledActivity	5 years ago
Ivan Tashkinov	30caf3e51e	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex	5 years ago
Maksim Pechnikov	c0d572d0bf	added test	5 years ago
Maksim Pechnikov	680e071dba	Merge branch 'develop' into issue/1383	5 years ago
lain	24599c519f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit	5 years ago
Maksim Pechnikov	ed7f850ad2	fix test	5 years ago
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	5 years ago
Maksim Pechnikov	29a98b86b7	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	5 years ago
Maxim Filippov	4b60d41db9	Add report notes	5 years ago
Egor Kislitsyn	624e720aa4	Add `with_move` query param to the notifications API	5 years ago
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	5 years ago
Maksim Pechnikov	88f7cf51d4	Merge branch 'develop' into issue/1411	5 years ago
rinpatch	0d24ab04c5	Merge branch 'remove-info-from-users' into 'develop' ... Removed users.info field See merge request pleroma/pleroma!2006	5 years ago
kPherox	1915b23e72	test missing first field	5 years ago
Egor Kislitsyn	a98cda7758	Fix Pleroma.HTML.extract_first_external_url/2	5 years ago
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
Maksim Pechnikov	04a8ffbe84	added privacy option to push notifications	5 years ago
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	5 years ago
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	5 years ago
lain	98990d2d61	Merge branch 'fed-testing-updates' into 'develop' ... Add federated test infrastructure See merge request pleroma/pleroma!2014	5 years ago
lain	8627fb0bb5	Merge branch 'cleanup-tests-output' into 'develop' ... Cleanup tests output See merge request pleroma/pleroma!2018	5 years ago
Sadposter	c7cc80a9ee	obligatory format commit	5 years ago
Sadposter	fa97eddf8a	make follows take precedence over domain blocks	5 years ago
Egor Kislitsyn	c4b468a95b	Cleanup tests output	5 years ago
Maksim Pechnikov	1403a1441d	added tests	5 years ago
Maxim Filippov	fcabcab443	Fetch account from report, not from status (it might be deleted)	5 years ago
Maxim Filippov	5135656f57	Handle reopened reports with deleted statuses	5 years ago
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	5 years ago
lain	f36724efb1	User: Never return nil for user follower counts.	5 years ago
Maksim Pechnikov	a4f834a687	moved DigestEmail to Oban Periodic jobs	5 years ago
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	5 years ago
Maksim Pechnikov	c5766a8100	moved ActivityExpiration to Oban Periodic jobs	5 years ago
Maksim Pechnikov	6f202a401b	moved ScheduledActivity to Oban Periodic jobs	5 years ago
stwf	bd1984f054	update tests and Oban	5 years ago
lain	717d246491	Tests: Don't run federated tests by default	5 years ago
Chris McCord	f01881e82a	Add federated test infrastructure	5 years ago
Maksim Pechnikov	ac3abb5414	moved Pleroma.Stats to Oban Periodic jobs	5 years ago
Ivan Tashkinov	c8d3c3bfec	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex	5 years ago
Maxim Filippov	5869a43fe7	Fix tests	5 years ago
Maxim Filippov	b62be2564c	Merge branch 'develop' into feature/admin-api-render-whole-status	5 years ago
lain	dc9090810d	Merge branch 'fix/ap-disable-remote-render' into 'develop' ... Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010	5 years ago
Maxim Filippov	b3b4e5ca80	AdminAPI: Grouped reports old/new fix ... If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)	5 years ago
rinpatch	4b10804f21	OStatus controller: don't serve json at /notice/, redirect instead	5 years ago
rinpatch	02f7383891	ActivityPub controller: do not render remote users	5 years ago
feld	5f981178d0	Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' ... Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981	5 years ago
Sadposter	d3656c2725	add ability to set a custom user-agent string	5 years ago
Maxim Filippov	82f4e4760e	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	5 years ago
Maxim Filippov	fd24467b92	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	5 years ago
Maxim Filippov	2b341627da	Admin API: Render whole status in grouped reports	5 years ago
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	5 years ago
lain	bd62946020	Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' ... AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994	5 years ago
Ivan Tashkinov	cad9b325e5	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs	5 years ago
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' ... [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	5 years ago
Egor Kislitsyn	d38ab4bb89	Fix user.following_count	5 years ago
Ivan Tashkinov	4f88b1b435	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	5 years ago
Egor Kislitsyn	63711258ce	Fix sporadically failing test	5 years ago
Ivan Tashkinov	565f261338	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	5 years ago
Maksim Pechnikov	708fd234bd	fix order favorites activites	5 years ago
Maxim Filippov	b88dbc17c8	Fix tests	5 years ago
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	5 years ago
Egor Kislitsyn	36686f5245	Support authentication via `x-admin-token` HTTP header	5 years ago
Maksim Pechnikov	7d727dbfec	added test	5 years ago
Ivan Tashkinov	3aaf3aa2c2	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
kaniini	81cba405af	Merge branch 'nodeinfo-fields-limit' into 'develop' ... Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983	5 years ago
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	5 years ago
kPherox	c9a06b14ab	Add test	5 years ago
rinpatch	22554ac5ca	Merge branch 'bugfix/1395-email-activation' into 'develop' ... Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965	5 years ago
Ariadne Conill	7c59bc9ef9	fix credo	5 years ago
Ariadne Conill	5705cf0e3e	MRF: add ObjectAgePolicy which deals with old posts being imported	5 years ago
Maxim Filippov	114930b5fd	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	5 years ago
Maxim Filippov	30af5da330	Admin API: list all statuses from a given instance	5 years ago
feld	1afeaf82fa	Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' ... Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	5 years ago
Phil Hagelberg	3c60adbc1f	Support redirecting by activity UUID in static FE as well.	5 years ago
Phil Hagelberg	0867cb083e	Support redirecting by object ID in static FE. ... This matches the behavior of pleroma-fe better. Fixes #1412.	5 years ago
lain	60cc5a7750	Merge branch 'fix-rate-limiter-test' into 'develop' ... Fix random fails of the rate limiter tests (hopefully) See merge request pleroma/pleroma!1978	5 years ago
Egor Kislitsyn	72cf6a76f4	Fix random fails of the rate limiter tests	5 years ago
lain	facc37aaa6	Merge branch 'static-remote-redirect' into 'develop' ... For remote notices, redirect to the original instead of 404 in static-fe See merge request pleroma/pleroma!1974	5 years ago
Phil Hagelberg	62f3a93049	For remote notices, redirect to the original instead of 404. ... We shouldn't treat these like local statuses, but I don't think a 404 is the right choice either here, because within pleroma-fe, these are valid URLs. So with remote notices you have the awkward situation where clicking a link will behave differently depending on whether you open it in a new tab or not; the new tab will 404 if it hits static-fe. This new redirecting behavior should improve that situation.	5 years ago
Egor Kislitsyn	27cd1374e3	Add a notification for Move activities	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago
lain	e835cd97f6	Containment: Add a catch-all clause to contain_origin.	5 years ago
eugenijm	f86a7d5d8b	Fix exclude_visibilities filter for followers-only Like notifications	5 years ago
feld	e27d78e768	Merge branch 'nodeinfo-federation-enabled' into 'develop' ... report federating status in nodeinfo See merge request pleroma/pleroma!1971	5 years ago
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	5 years ago
href	b39b49cc14	report federating status in nodeinfo	5 years ago
lain	1ca7b877a1	Merge branch 'iss-1376' into 'develop' ... Check client and token in GET /oauth/authorize See merge request pleroma/pleroma!1940	5 years ago
lain	417f9a782f	Merge branch 'fix/1399' into 'develop' ... fix for migrate config to db task Closes #1399 See merge request pleroma/pleroma!1964	5 years ago
Steven Fuchs	94627baa5c	New rate limiter	5 years ago
lain	f6056e9c9c	UserEnabledPlug: Don't authenticate unconfirmed users.	5 years ago
lain	8521553ad9	User: Don't let deactivated users authenticate.	5 years ago
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Alexander	6a4201e0b4	fix for migrate task	5 years ago
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	5 years ago
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
lain	3a1aaadc18	Merge branch 'issue/1339' into 'develop' ... [#1339] add subject to atom feed See merge request pleroma/pleroma!1961	5 years ago
Maksim Pechnikov	9d0b989521	add subject to atom feed	5 years ago
Phil Hagelberg	6ef8049664	Add changelog entry, cheatsheet docs, and alphabetize.	5 years ago
Phil Hagelberg	ef7c3bdc7a	Add some further test cases. ... Including like ... private visibility, cos that's super important.	5 years ago
Phil Hagelberg	2bf592f5dc	Add tests for static_fe controller.	5 years ago
Ariadne Conill	5b60d82592	object containment: handle all cases where ID is invalid (missing, nil, non-string)	5 years ago
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maxim Filippov	7258db023e	Support old flag format	5 years ago
eugenijm	7888803ffe	Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`	5 years ago
rinpatch	84175fe30e	Set better Cache-Control header for static content ... Closes #1382	5 years ago
feld	8b19464176	Merge branch 'feature/multiple-users-force-password-reset' into 'develop' ... Force password reset for multiple users Closes admin-fe#46 See merge request pleroma/pleroma!1928	5 years ago
Maxim Filippov	f171095960	Grouped reports with status data baked in	5 years ago
rinpatch	54746c6c26	Object Fetcher: set cache after reinjecting ... Probably fixes the issue hj had, where polls would have different counters between endpoints.	5 years ago
AkiraFukushima	e1fc6cb78f	Check client and token in GET /oauth/authorize	5 years ago
Maksim Pechnikov	e52955c961	update following_relationship.ex	5 years ago
Maksim Pechnikov	62bc0657e7	excluded invisible users from search results	5 years ago
Maxim Filippov	2cbfa256fd	Merge branch 'develop' into feature/multiple-users-force-password-reset	5 years ago
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	5 years ago
rinpatch	fee1276963	Merge branch 'failing-search-fixes' into 'develop' ... User Search: Remove superfluous setweight and random test. See merge request pleroma/pleroma!1935	5 years ago
lain	4e53520917	User Search: Remove superfluous setweight and random test. ... The test tested for a behavior that isn't actually enforced anymore.	5 years ago
eugenijm	ed29be24cb	Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.	5 years ago
lain	a304a2a845	Merge branch 'transmogrifier-test-errors' into 'develop' ... capture test log where errors are expected See merge request pleroma/pleroma!1915	5 years ago
Steven Fuchs	5271bbcf11	add missing tesla mocks	5 years ago
lain	556da92902	Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' ... Store status data inside flag activity See merge request pleroma/pleroma!1849	5 years ago
rinpatch	8dd7c099a7	Merge branch 'bugfix/streamer-follows' into 'develop' ... streamer: use direct object for filter checks when there is no valid child object in an activity Closes #1291 See merge request pleroma/pleroma!1931	5 years ago
kaniini	74135e1318	Merge branch 'feature/omit-relay-user' into 'develop' ... AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924	5 years ago
kaniini	61bcd4595f	Merge branch 'feature/fast_sanitize' into 'develop' ... Switching to FastSanitize See merge request pleroma/pleroma!1916	5 years ago
Ariadne Conill	4bf942583f	streamer: use direct object for filter checks when there is no valid child object in an activity ... We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291	5 years ago
Maxim Filippov	743b622b7b	Force password reset for multiple users	5 years ago
Maxim Filippov	6f9d3d30fa	AdminAPI: Omit relay user from users list	5 years ago
Mark Felder	fcea6a9d2c	Merge branch 'develop' into feature/fast_sanitize	5 years ago
Egor Kislitsyn	61fc739ab8	Handle "Move" activity	5 years ago
kPherox	d1ae51b02a	Update test for get_recipients_from_activity	5 years ago
rinpatch	ae59b38203	Rip out the rest of htmlsanitizeex	5 years ago
rinpatch	61400d7eb7	Fix XSS emoji test	5 years ago
kPherox	c2f2d7bcf6	Add test follow activity for locked account	5 years ago
rinpatch	08f6837065	Switch from HtmlSanitizeEx to FastSanitize	5 years ago
stwf	56e42602b0	capture where errors are expected	5 years ago
Egor Kislitsyn	4270861085	Merge branch 'develop' into feature/move-activity	5 years ago
lain	2480200759	Merge branch 'refactor/following-relationships' into 'develop' ... Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814	5 years ago
Maxim Filippov	8282b6ac3d	Make sure incoming flags are updated with status data	5 years ago
Maxim Filippov	791bcfd90f	Merge branch 'develop' into feature/store-statuses-data-inside-flag	5 years ago
Maxim Filippov	8eff05d4c6	Strip status data from Flag (when federating or closing/resolving report)	5 years ago
eugenijm	0580654485	Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`. ... Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.	5 years ago
Egor Kislitsyn	b777083f3f	Add `also_known_as` field to Pleroma.User	5 years ago
stwf	5329b361ec	fix test	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Maxim Filippov	b08b1d5d91	Store status data inside Flag activity	5 years ago
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
Ariadne Conill	3f6a596922	activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors	5 years ago
Ariadne Conill	277aea45b9	tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization ... There appears to be confusion on whether or not Pleroma can handle this particular sin of JSON-LD. It can, and we will add regression tests to prove that it can handle this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD, but whatever.	5 years ago
kaniini	6281e4795a	Merge branch 'feature/push-subject-for-dm' into 'develop' ... Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864	5 years ago
Mark Felder	0c628fafc5	Spelling	5 years ago
Mark Felder	2cbb3f2364	Add tests for the subject of push notifications	5 years ago
rinpatch	6712b6e4de	Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' ... Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869	5 years ago
rinpatch	2dbee29cf5	Do not include notifications from blocked users when with_muted is set ... This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.	5 years ago
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged `develop`, handled User.Info.invisible.	5 years ago
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	5 years ago
Ivan Tashkinov	a11a7176d5	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex	5 years ago
Egor Kislitsyn	c6fba62666	Fix Relay	5 years ago
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	5 years ago
Ivan Tashkinov	ee04fbc35a	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	5 years ago
Ivan Tashkinov	c6fdfbc4f1	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	5 years ago
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	5 years ago
Ariadne Conill	05c58eaece	change Maksim's test description	5 years ago