4593 Commits (fb090b748ab7ec3740008017f419e210405e2633)

Author	SHA1	Message	Date
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	b4cbf0568b	[#1304] Analysis issue fix.	5 years ago
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	5 years ago
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	5 years ago
Ariadne Conill	ef659331b0	implement invisible support for remote users	5 years ago
Ariadne Conill	95871cb462	user: implement User.invisible?/1	5 years ago
Ariadne Conill	1469a084d4	relay: set invisible to true	5 years ago
Ariadne Conill	e7333db72a	user info: add invisible field	5 years ago
Haelwenn	f01dbc450c	Merge branch 'feature/mastofe-pwa' into 'develop' ... MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834	5 years ago
eugenijm	52ed2f8f2d	Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read	5 years ago
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	5 years ago
Mark Felder	dcb23a85b6	Merge branch 'develop' into feature/push-subject-for-dm	5 years ago
Mark Felder	152caef51d	Direct messages should provide a distinct push notification subject	5 years ago
Maxim Filippov	019147f115	Merge branch 'develop' into feature/relay-list	5 years ago
Ariadne Conill	44e64af5e7	object: containment: simplify the pattern match for OStatus testsuite hack	5 years ago
Ariadne Conill	e99fdfc32d	object: containment: only allow OStatus references in test suite environment	5 years ago
Ariadne Conill	3c785b85a6	object: fetcher: fix up formatting	5 years ago
Ariadne Conill	bae96de273	activitypub: tag containment checks for better error tracing	5 years ago
Ariadne Conill	7295a05cee	object: containment: also allow OStatus object IDs through when comparing origins	5 years ago
Ariadne Conill	a177f22e02	object: fetcher: improve error reporting	5 years ago
Ariadne Conill	bf2107743f	object: containment: don't try to contain ostatus objects	5 years ago
Ariadne Conill	6f110fc04c	object fetcher: fix up error handling	5 years ago
Ariadne Conill	48059c03c9	fix up some tests	5 years ago
Ariadne Conill	d379b48769	kill almost all of the OStatus module	5 years ago
Ariadne Conill	6a1f4c5145	federator: remove OStatus incoming document support	5 years ago
Ariadne Conill	835ad52378	remove Salmon module	5 years ago
Ariadne Conill	beb9861f9d	router: disconnect Salmon	5 years ago
Ariadne Conill	a7b92bba68	webfinger: stop pulling Salmon data out of WebFinger	5 years ago
Ariadne Conill	c00ae10af8	feed: don't advertise salmon endpoint	5 years ago
Ariadne Conill	adb639db56	publisher: move remote_users() from Salmon module	5 years ago
Ariadne Conill	4f82e42e4e	websub: remove entirely	5 years ago
Ariadne Conill	b16a460916	federator: remove websub stuff	5 years ago
Ariadne Conill	25b7ff56c3	application: don't start Federator.init/1 anymore	5 years ago
rinpatch	39e996528c	Fix a migration wiping user info of users that don't have any mutes ... And introduce safe_jsonb_set	5 years ago
Haelwenn (lanodan) Monnier	3c6fd0bb99	upload.ex: Remove deprecated configuration	5 years ago
Maxim Filippov	2473702be2	Merge branch 'develop' into feature/relay-list	5 years ago
kaniini	7511f3d192	Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop' ... Fix streaming websocket handshake with `Sec-WebSocket-Protocol` See merge request pleroma/pleroma!1847	5 years ago
kaniini	733b73b71c	Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex	5 years ago
eugenijm	359dd1890e	Mastodon API: Mark the conversation as read for the author when they send a new direct message	5 years ago
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	5 years ago
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
lain	1bfdf57fc7	Merge branch 'user-search-experiments' into 'develop' ... User search: Remove trigram and refactor the module See merge request pleroma/pleroma!1850	5 years ago
feld	21f0757b0d	Merge branch 'feature/multiple-users-activation-permissions' into 'develop' ... Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825	5 years ago
lain	6977cddff9	Merge branch 'benchmark-finishing' into 'develop' ... Benchmark finishing Closes #755 See merge request pleroma/pleroma!1848	5 years ago
rinpatch	0a5175ecbb	Order fts results by trigram	5 years ago
rinpatch	c10ce113d4	User search: Remove trigram and refactor the module ... - Remove trigram as it tends to rank garbage results highly, resulting in it prioritized above fts, which gives actually decent results. ACKed by kaniini and lain on irc. - Remove a test for handling misspelled requests, since we no longer have trigram - Remove a test for searching users with `nil` display names, because it is unrealistic, we don't accept usernames that are not >1 char strings - Make rank boosting for followers/followees sane again, previous values resulted in garbage matches getting on top just because the users are followers/followees	5 years ago
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	5 years ago
Maxim Filippov	90d516d42b	Store status data inside flag activity	5 years ago
Alexander	e7bb762ec2	don't stream in benchmark env	5 years ago
kPherox	5bd0717de2	Add `Sec-WebSocket-Protocol` to response header	5 years ago
Egor Kislitsyn	1d46944fbd	Do not add `follower_address` to `following` for non local users	5 years ago
eugenijm	a97b642289	Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints	5 years ago
lain	e3b4a3e96b	Merge branch 'incoming-id-fixes' into 'develop' ... Assorted transmogrifier fixes See merge request pleroma/pleroma!1831	5 years ago
rinpatch	9bdbf0811b	Make MediaProxy failure tracking less brutal ... The current failure tracking mechanism will never request anything that didn't respond with a success, 403, 404, or 5xx codes. This is causing issues when using in real fediverse because of weird status codes some software has and timeouts being frequent. This patch changes failure tracking mechanism to only never request the url again if it responded with 400, 204, or the body is too large, otherwise it can be re-requested in 60 seconds.	5 years ago
Maxim Filippov	cc6875b582	Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays	5 years ago
Maxim Filippov	c0aca32dd0	Merge branch 'develop' into feature/multiple-users-activation-permissions	5 years ago
Maxim Filippov	aaa4252f41	Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it	5 years ago
lain	422aa6befe	Ostatus DeleteHandler: Fix for new option format.	5 years ago
lain	37812740c4	Transmogrifier: Correctly save incoming ids for Accept/Reject.	5 years ago
lain	9b963064eb	Transmogrifier: Actually store who deleted a note.	5 years ago
Maxim Filippov	f5104f36bb	Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it	5 years ago
Egor Kislitsyn	059005ff82	Replace `user.following` with Pleroma.FollowingRelationship	5 years ago
lain	29647dfd09	Transmogrifier: Save correct ids for incoming deletes.	5 years ago
lain	c54ae662dc	Merge remote-tracking branch 'origin/develop' into benchmark-finishing	5 years ago
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	5 years ago
eugenijm	580a67f5ca	Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)	5 years ago
Ariadne Conill	9a2f71f4d5	mastodon api: fix exclude_replies (closes #1287)	5 years ago
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	5 years ago
kaniini	93bdc55306	Merge branch 'mrf/simple_policy/check_actor' into 'develop' ... mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806	5 years ago
Ivan Tashkinov	28fb98d69e	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	5 years ago
Haelwenn	b4f3c16885	Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' ... [#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643	5 years ago
Haelwenn (lanodan) Monnier	58aeabd020	mrf/simple_policy: check actor against accept/reject	5 years ago
kaniini	2411d09215	Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' ... Move local keys out of `user.info` See merge request pleroma/pleroma!1799	5 years ago
feld	1d8e956c32	Use the user.id instead of nickname in report URLs ... Ensures links to profiles of remote users work.	5 years ago
Ivan Tashkinov	b93856874d	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
rinpatch	fefbd31c6e	Move local keys out of `user.info`	5 years ago
Ivan Tashkinov	06b3bb54c5	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
Ivan Tashkinov	f459aabdfa	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	5 years ago
Haelwenn	9e34919dcd	Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop' ... Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597	5 years ago
kaniini	7a318d74e6	Merge branch 'split-masto-api/leftovers' into 'develop' ... [#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761	5 years ago
kaniini	45b7f03f89	Merge branch 'accept-embedded-announce-object' into 'develop' ... Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770	5 years ago
kaniini	17ff4b43cb	Merge branch 'unread-conversation-count' into 'develop' ... Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796	5 years ago
eugenijm	8249924485	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
lain	276a520163	CommonAPI: Create profile updates as public. ... This saves us lots of sending out because we can use sharedInbox.	5 years ago
lain	4b8524f392	ActivityPub / Transmogrifier: Correctly store incoming Update id.	5 years ago
Thibaut Girka	791d93ff0e	Make credo happy	5 years ago
Thibaut Girka	977e711e22	Import object from self-Announce whenever possible	5 years ago
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	5 years ago
Maksim Pechnikov	83631752af	removed legacy api: "/objects/:uuid/likes"	5 years ago
kaniini	e0c0ea9f13	Merge branch 'bugfix/widen-streamer-blocks' into 'develop' ... widen streaming API block effects See merge request pleroma/pleroma!1784	5 years ago
kaniini	5c04e81724	Merge branch 'user-info-unread-direct-conversation' into 'develop' ... Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737	5 years ago
Ariadne Conill	d1d058bf85	streamer: worker: actually use should_send? consistently	5 years ago
Ariadne Conill	5a0c018d2a	streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist	5 years ago
Ariadne Conill	2417b633ed	streamer: add missing copyright headers	5 years ago
lain	568a995d64	ActivityPub: Change addressing of Undo.	5 years ago
lain	27110793a7	Merge branch 'featrue/job-monitor' into 'develop' ... Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721	5 years ago
lain	27e914955e	Merge branch 'fix/nickname-fail' into 'develop' ... Fix get_cached_by_nickname_or_id not allowing to get local users by nickname Closes #1293 See merge request pleroma/pleroma!1777	5 years ago
rinpatch	8217292085	Fix get_cached_by_nickname_or_id not allowing to get local users by ... nickname Closes #1293	5 years ago
lain	01da6344b9	Merge branch 'bugfix/notification-nil-actor' into 'develop' ... notification_view.ex: Make sure `account` isn’t empty See merge request pleroma/pleroma!1779	5 years ago
Egor Kislitsyn	d3ac4e8083	Fix OAuthController	5 years ago
Haelwenn (lanodan) Monnier	5dc14c89ce	notification_view.ex: Make sure `account` isn’t empty ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1203	5 years ago
eugenijm	06d9df79c5	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
Ivan Tashkinov	64095961fe	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
Egor Kislitsyn	e0c68eeb02	Move `:favourites` and `:bookmarks` actions to StatusController	5 years ago
Egor Kislitsyn	7f2bc57725	Move `follows`, `mutes` and `blocks` actions to AccountController	5 years ago
Egor Kislitsyn	d3c404af12	Add MastoFEController	5 years ago
Egor Kislitsyn	1c6e1055c8	Add CustomEmojiController	5 years ago
kaniini	433f2c0f68	Merge branch 'split-masto-api/instance' into 'develop' ... Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760	5 years ago
kaniini	debd0a3066	Merge branch 'accept-embedded-announce-object' into 'develop' ... Inline object when Announcing a self-owned private object See merge request pleroma/pleroma!1769	5 years ago
Thibaut Girka	86880b9821	Inline object when Announcing a self-owned private object	5 years ago
Thibaut Girka	3d61efa7c9	Rename misleading `get_announce_visibility` to `public_announce?`	5 years ago
Egor Kislitsyn	26693292f4	Remove `:enqueued` counter	5 years ago
Egor Kislitsyn	c8b01f6667	Extract instance actions from `MastodonAPIController` to `InstanceController`	5 years ago
kaniini	89ab673d00	Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' ... Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765	5 years ago
kaniini	8557176808	Merge branch 'split-masto-api/auth' into 'develop' ... Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759	5 years ago
kaniini	9b38bf4af4	Merge branch 'features/private-reblogs' into 'develop' ... Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766	5 years ago
feld	1255ec888d	Revert "Add upload limits to /api/v1/instance" ... This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.	5 years ago
Thibaut Girka	427d0c2a00	Store private announcements in object.data["announcements"], filter them on display	5 years ago
Sergey Suprunenko	c541b83bef	Track failed proxy urls and don't request them again	5 years ago
Thibaut Girka	43e3db0951	Fix returned visibility of announces in MastodonAPI	5 years ago
Thibaut Girka	4c1f158f5d	Allow users to announce privately, including own private notes	5 years ago
Maxim Filippov	b2273c695e	Discard identifier, if empty	5 years ago
Thibaut Girka	fe538973dd	Ensure self-announces do not widen the audience of the original post	5 years ago
KokaKiwi	1f0be71ea4	Make activity announceable by its author.	5 years ago
Maxim Filippov	0f9c2c8b87	Send an identifier alongside with error message in OAuthController	5 years ago
Egor Kislitsyn	af690d1033	Extract auth actions from `MastodonAPIController` to `AuthController`	5 years ago
Egor Kislitsyn	2dad6dd020	Extract apps actions from `MastodonAPIController` to `AppController`	5 years ago
Egor Kislitsyn	39695c4436	Extract suggestions actions from `MastodonAPIController` to `SuggestionController`	5 years ago
Egor Kislitsyn	585bc57edb	Extract media actions from `MastodonAPIController` to `MediaController`	5 years ago
Egor Kislitsyn	36a34c36fe	Extract poll actions from `MastodonAPIController` to `PollController`	5 years ago
kPherox	a0f101ee80	Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials	5 years ago
lain	dae744478e	Transmogrifier: Handle compact objects in undos.	5 years ago
Ivan Tashkinov	6ffa2b5f66	[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	5 years ago
Egor Kislitsyn	0c6009dd2e	Extract mascot actions from `MastodonAPIController` to MascotController	5 years ago
Egor Kislitsyn	987e0b8be8	Move update_credentials to MastodonAPI.AccountController	5 years ago
Egor Kislitsyn	c0ce2d5faf	Move account_register, relationships and verify_credentials to MastodonAPI.AccountController	5 years ago
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	5 years ago
Egor Kislitsyn	e7aef27c00	Fix merge	5 years ago
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	5 years ago
kaniini	0e356cc800	Merge branch 'split-masto-api/reports' into 'develop' ... Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744	5 years ago
kaniini	74d8fadf37	Merge branch 'split-masto-api/conversations' into 'develop' ... Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743	5 years ago
Egor Kislitsyn	b7f27a4f58	Extract report actions from `MastodonAPIController` to `ReportController` ... Update MastodonAPI.ReportView	5 years ago
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	5 years ago
Ariadne Conill	e653edd182	split scrobble functions into their own controller	5 years ago
Ariadne Conill	a6e1469767	router: change scrobble timeline route from now-playing to scrobbles	5 years ago