3612 Commits (5cf2c7422b006d477498af8d7618a0d6f7659290)

Author	SHA1	Message	Date
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	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	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
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
Ariadne Conill	8b34b221cb	common api: add some missing IR bits for listen activities' children	5 years ago
Ariadne Conill	84712c35f9	activitypub: object view: include child object for Listen activities	5 years ago
Ariadne Conill	71eff09e56	common api: make sure the generated IR is actually federatable	5 years ago
Ariadne Conill	7cad6ea67a	pleroma api: hook up scrobbler controller	5 years ago
Ariadne Conill	2c82d8603b	common api: implement scrobbling	5 years ago
Ariadne Conill	172c74a77b	activitypub: transmogrifier: implement support for Listen activities	5 years ago
Ariadne Conill	1f9de2a8cd	activitypub: implement IR-level considerations for Listen activities	5 years ago
Ariadne Conill	b7877e9b1c	mastodon api: implement rendering of listen activities	5 years ago
Egor Kislitsyn	d4d88b3361	Extract conversation actions from `MastodonAPIController` to ConversationController	5 years ago
rinpatch	e9d1aa75d5	Revert subscription refactoring. ... As discussed in pleroma-meta#2 This reverts commit eb9aa7aa10, reversing changes made to c4fbb56984.	5 years ago
kaniini	6d74a7528c	Merge branch 'feature/follow-requests-count' into 'develop' ... Mastodon API: add follow_requests_count See merge request pleroma/pleroma!1726	5 years ago
Maksim Pechnikov	1053319cd6	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Haelwenn (lanodan) Monnier	9202904da9	status_controller.ex: Posting media status without content defined	5 years ago
rinpatch	374f83d29b	Fix not being able to post empty statuses with attachments ... Attachment field was filled in after the empty status check	5 years ago
minibikini	f9380289eb	Add `remote_ip` plug	5 years ago
kaniini	92d08d4113	Merge branch 'split-masto-api/follow-requests' into 'develop' ... Extract follow requests actions from `MastodonAPIController` to `FollowRequestController` See merge request pleroma/pleroma!1730	5 years ago
kaniini	68bf99baf2	Merge branch 'split-masto-api/domain-blocks' into 'develop' ... Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController` See merge request pleroma/pleroma!1729	5 years ago
kaniini	27a3221d57	Merge branch 'split-masto-api/scheduled-statuses' into 'develop' ... Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController` See merge request pleroma/pleroma!1728	5 years ago
Egor Kislitsyn	408750b94e	Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`	5 years ago
Egor Kislitsyn	99c5a35890	Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`	5 years ago
Egor Kislitsyn	8d31530119	Cleanup ScheduledActivityView	5 years ago
Egor Kislitsyn	0a5b106ddd	Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`	5 years ago
Egor Kislitsyn	621377f378	Extract filter actions from `MastodonAPIController` to `FilterController`	5 years ago
Egor Kislitsyn	6c7c35dbe1	Fix SubscriptionNotificationView	5 years ago
kaniini	91e2bcf218	Merge branch 'refactor/status-controller' into 'develop' ... Extract status actions from `MastodonAPIController` to `StatusController` See merge request pleroma/pleroma!1719	5 years ago
Ariadne Conill	14294243a2	mastodon api: implement follow_requests_count	5 years ago
Egor Kislitsyn	5ea5c58a85	Move view logic from StatusController.context to StatusView and add a test	5 years ago
kaniini	eb9aa7aa10	Merge branch 'refactor/subscription' into 'develop' ... Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664	5 years ago
Egor Kislitsyn	98d1347a4e	Extract status actions from `MastodonAPIController` into `StatusController`	5 years ago
kaniini	219771288c	Merge branch 'refactor/common_api' into 'develop' ... Refactor `CommonAPI.post/2` See merge request pleroma/pleroma!1713	5 years ago
kaniini	dc0fdb5e84	Merge branch 'refactor/timeline-controller' into 'develop' ... Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648	5 years ago
Maksim Pechnikov	73ae38ca04	add deprecated tag	5 years ago
Maksim Pechnikov	b4fc96f640	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Roman Chvanikov	b4b147000c	Merge develop	5 years ago
Egor Kislitsyn	3572cf29b7	Extract timeline actions from `MastodonAPIController` into `TimelineController`	5 years ago
Egor Kislitsyn	c57ad0a402	Cleanup CommonAPI	5 years ago
Egor Kislitsyn	de3e90e536	Add ActivityDraft.with_valid/2	5 years ago
Egor Kislitsyn	eed774d058	Add CommonAPI.ActivityDraft	5 years ago
kaniini	6abe12dced	Merge branch 'refactor/notification-controller' into 'develop' ... Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646	5 years ago
kaniini	a39e065916	Merge branch 'feature/return-link-for-password-reset' into 'develop' ... Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691	5 years ago
kaniini	48a82c4609	Merge branch 'refactor/user' into 'develop' ... Simplify updating user's `info` See merge request pleroma/pleroma!1712	5 years ago
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	5 years ago
kaniini	3ff57f1fd3	Merge branch 'hex-flake-id' into 'develop' ... Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692	5 years ago
kaniini	beabc49e35	Merge branch 'feature/activities-pagination-by-offset' into 'develop' ... Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714	5 years ago
kaniini	1b9cd4c866	Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop' ... Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716	5 years ago
rinpatch	f92d7d52c2	Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex	5 years ago
rinpatch	f2880d7d29	Credo considered harmful	5 years ago
rinpatch	c7d8ccd0c4	Remove useless with clause	5 years ago
rinpatch	1ddd403339	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	5 years ago
rinpatch	d87be2ec96	Don't embed the first page in inboxes/outboxes and refactor the views to ... follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.	5 years ago
Ekaterina Vaartis	118d6dcdf4	Fix nodeinfo handling	5 years ago
Ekaterina Vaartis	ba9d35a904	Add an API endpoint for listing remote packs	5 years ago
vaartis	a6e85215e1	Credo fix (remove parens on function definition)	5 years ago
vaartis	f21dbbc021	Move emoji_dir_path & cache_seconds_per_file	5 years ago
Ekaterina Vaartis	cdbe7cd37a	When listing emoji packs, be sure to create the directory	5 years ago
Egor Kislitsyn	b5dfe83433	Replace `Pleroma.FlakeId` with `flake_id` hex package	5 years ago
Maksim Pechnikov	1a858134ed	Merge branch 'develop' into issue/1218	5 years ago
Maxim Filippov	60cbea5bb2	Allow activities pagination via limit/offset	5 years ago
Haelwenn (lanodan) Monnier	0dc8f3d6d2	/api/ap/uploadMedia → /api/ap/upload_media	5 years ago
Egor Kislitsyn	035f22f784	Fix Credo warnings	5 years ago
Egor Kislitsyn	1bea67cb5e	Cleanup Pleroma.User	5 years ago
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	5 years ago
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Egor Kislitsyn	a66a7a328f	Extract notification actions from `MastodonAPIController` into `NotificationController`	5 years ago
Egor Kislitsyn	79b25be4e1	Do not return tuple when unneeded	5 years ago
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	5 years ago
kaniini	760df67a7b	Merge branch 'remove-direct-messages-from-public-timeline' into 'develop' ... Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703	5 years ago
kaniini	ad9595ca55	Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' ... added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651	5 years ago
Steven Fuchs	e1d2d69c87	Clean up views	5 years ago
Ekaterina Vaartis	e63f167f01	Also pretty print pack.json	5 years ago
Maksim Pechnikov	494bb6bac6	updated tests	5 years ago
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maksim Pechnikov	38245f1336	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	5 years ago
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' ... Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	5 years ago
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	5 years ago
Haelwenn (lanodan) Monnier	815b904508	Add support for AP C2S uploadMedia ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171	5 years ago
Haelwenn (lanodan) Monnier	2ad50583f0	Document and test /api/ap/whoami	5 years ago
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Maxim Filippov	72a01f1350	Use router helper to generate reset password link	5 years ago
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	5 years ago
eugenijm	7cf1252455	Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)	5 years ago
lain	b80c41a14f	Merge branch 'outbox_pagination' into 'develop' ... Fix AP outbox pagination See merge request pleroma/pleroma!1700	5 years ago
D Anzorge	0e6085da10	Fix pagination in AP outbox.json	5 years ago
Ivan Tashkinov	6f67aed3ac	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex	5 years ago
eugenijm	fe5e0b7846	Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)	5 years ago
Maksim Pechnikov	d4ed3a35b8	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	5 years ago
Haelwenn	f95a2b2cda	Merge branch 'issue/733' into 'develop' ... [#733] added test for Ostatus See merge request pleroma/pleroma!1657	5 years ago
rinpatch	b0ec82d24a	Merge branch 'chores/bump-copyright-year' into 'develop' ... Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698	5 years ago
Haelwenn (lanodan) Monnier	447514dfa2	Bump copyright years of files changed in 2019 ... Done via the following command: git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'	5 years ago
Ekaterina Vaartis	b585134c90	Get the nodeinfo address from the well-known	5 years ago
Ekaterina Vaartis	a1325d5fd9	Change path from nodeinfo to metadata->features	5 years ago
Ekaterina Vaartis	d51e5e447e	Move emoji reloading to admin api	5 years ago
Ekaterina Vaartis	7680aec17d	Move emoji api to pleroma api dir	5 years ago
Ekaterina Vaartis	36f2275dc9	A feature for shareable emoji packs, use it in download_from & tests	5 years ago