959 Commits (a0623c5db226a54998923ebab01703a7cee3dad5)

Author	SHA1	Message	Date
Ivan Tashkinov	be9d18461a	FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).	5 years ago
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (`ThreadMute.exists?/2`).	5 years ago
Ivan Tashkinov	ff1baae7e9	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	5 years ago
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	5 years ago
Egor Kislitsyn	9081a071ee	Add a test for accounts/update_credentials	5 years ago
Ivan Tashkinov	8f1d622b8d	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	5 years ago
Ivan Tashkinov	13cbb9f6ad	Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).	5 years ago
lain	eec1fcaf55	Home timeline tests: Add failing test for relationships	5 years ago
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	5 years ago
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	5 years ago
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	5 years ago
Ivan Tashkinov	1c05f539aa	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).	5 years ago
Ivan Tashkinov	0e27c274f4	Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements ... # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs	5 years ago
lain	6c1232b486	NotificationController: Fix test.	5 years ago
lain	1aa8aa7d7f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	5 years ago
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	5 years ago
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	5 years ago
lain	3c2c32b460	Merge branch 'remake-remodel' into develop	5 years ago
Ivan Tashkinov	ec3719f539	Improved in-test config management functions.	5 years ago
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	f3791add99	removing with_move parameter	5 years ago
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	5 years ago
rinpatch	fc4496d4fa	rate limiter: disable based on if remote ip was found, not on if the plug was enabled ... The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620	5 years ago
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	5 years ago
feld	2019f3b3ff	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	5 years ago
Haelwenn (lanodan) Monnier	863ec33ba2	Add support for funkwhale Audio activity ... reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764	5 years ago
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	5 years ago
Alexander Strizhakov	b2eb1124d1	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	f0753eed0f	removing try block in tesla request ... added mocks for tests which fail with Tesla.Mock.Error	5 years ago
lain	4bce13fa2f	MastodonController: Return 404 errors correctly.	5 years ago
lain	6f7a8c43a2	Merge branch 'fix/no-email-no-fail' into 'develop' ... Do not fail when user has no email See merge request pleroma/pleroma!2249	5 years ago
Mark Felder	05da5f5cca	Update Copyrights	5 years ago
Egor Kislitsyn	4a45b96a91	Merge branch 'develop' into fix/signup-without-email	5 years ago
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	5 years ago
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	5 years ago
Egor Kislitsyn	cb60a9c42f	Do not fail when user has no email	5 years ago
Egor Kislitsyn	f446744a6a	Allow account registration without an email	5 years ago
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	5 years ago
lain	cf4ecffcea	Merge branch 'tests-clear-config-tweaks' into 'develop' ... Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209	5 years ago
Ivan Tashkinov	226f4d5ef9	Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks ... # Conflicts: # test/web/admin_api/admin_api_controller_test.exs	5 years ago
Egor Kislitsyn	ca7ac068f0	Add a test	5 years ago
Maksim Pechnikov	28701c08ad	Merge branch 'develop' into issue/1276	5 years ago
Haelwenn (lanodan) Monnier	1257331291	MastodonAPI.StatusView: Do not use site_name ... site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">	5 years ago
Ivan Tashkinov	4f8c3462a8	Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.	5 years ago
Maksim Pechnikov	6f9839c73c	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	19516af74e	Fix `status.expires_in` validation	5 years ago
lain	24c526a0b1	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	5 years ago
Maksim Pechnikov	58574ef156	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	5 years ago
Haelwenn	1262357ddb	Merge branch 'cancel-follow-request' into 'develop' ... Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175	5 years ago
Lain Soykaf	d85bcc8627	Questions: Add timezone to `closed` property	5 years ago
Lain Soykaf	f875b9650a	EmojiReactions: Add Mastodon-aligned reaction endpoints, change response	5 years ago
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	5 years ago
feld	df0b00b32d	Merge branch 'mastoapi-non-html-strings' into 'develop' ... mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167	5 years ago
Egor Kislitsyn	8c71f7e11a	Add support for cancellation of a follow request	5 years ago
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	5 years ago
rinpatch	c27d1d65bf	Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' ... Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064	5 years ago
rinpatch	5b62acf6e9	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	5 years ago
lain	a802e07241	Emoji Reactions: Add `reacted` field to emoji reactions	5 years ago
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	02c3dd2e3d	update ecto	5 years ago
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	5 years ago
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	5 years ago
lain	347f3ed2c6	Emoji reactions: Change api format once more	5 years ago
Maksim Pechnikov	5fc2fa8908	Merge branch 'develop' into issue/1383	5 years ago
lain	615b72238e	Notifications: Add emoji reaction notifications	5 years ago
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	5 years ago
lain	dd3fc50ea4	Emoji reactions: Change cache and reply format	5 years ago
Maksim Pechnikov	b8d5c09f48	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	04c9ca5d68	Merge branch 'emoji-reaction-extensions' into 'develop' ... StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120	5 years ago
Maksim Pechnikov	6e88a7e591	exclude blocked user posts from search results	5 years ago
lain	7d8b709d29	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions	5 years ago
lain	4c5b5f14dc	StatusView: Add `emoji_reactions`	5 years ago
lain	2199d63ddc	StatusControllerTest: Fix typo	5 years ago
lain	510776ba31	CommonAPI: Don't error out on double favs/repeats	5 years ago
Egor Kislitsyn	023b7f605b	Fix notification controller test	5 years ago
Egor Kislitsyn	3849053c6a	Merge branch 'develop' into notifications-from-account	5 years ago
Maksim Pechnikov	b7908844f2	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	5 years ago
Maxim Filippov	e71a13ad57	Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" ... This reverts merge request !2076	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
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
Maxim Filippov	404a9ccb9a	Stats: return status counts by scope	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
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
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	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
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	6fbafb1cdc	Merge branch 'develop' into issue/1276	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
lain	e8cee4d9a0	ActivityPub: For user timelines, respects blocks. ... Unless the timeline belongs to a blocked user.	5 years ago
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	5 years ago
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	d4953474ac	Merge branch 'develop' into improve-move-notificaions-api	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
lain	e9993acdbb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	5 years ago
Maksim Pechnikov	680e071dba	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	ed7f850ad2	fix test	5 years ago
Maksim Pechnikov	29a98b86b7	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	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
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	a52da55eb9	added User.NotificationSetting struct	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
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	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
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	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	5 years ago
Maksim Pechnikov	b9041c2097	added recount unread notifications to markers	5 years ago
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago
eugenijm	f86a7d5d8b	Fix exclude_visibilities filter for followers-only Like notifications	5 years ago
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	5 years ago
eugenijm	7888803ffe	Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`	5 years ago
lain	1bd1f62af5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	5 years ago
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	5 years ago
Maksim Pechnikov	ff6c727739	Merge branch 'develop' into issue/1276	5 years ago
eugenijm	ed29be24cb	Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.	5 years ago
Maksim Pechnikov	1b3a942a84	fix format	5 years ago
Mark Felder	fcea6a9d2c	Merge branch 'develop' into feature/fast_sanitize	5 years ago
Maksim Pechnikov	209319c8d2	update marker api	5 years ago
rinpatch	ae59b38203	Rip out the rest of htmlsanitizeex	5 years ago
Maksim Pechnikov	b27a92e8fa	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Maksim Pechnikov	99cf1ef9be	Merge branch 'develop' into issue/1276	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
Maksim Pechnikov	d4270397dc	Marker: added unread_count field	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	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
Ariadne Conill	05c58eaece	change Maksim's test description	5 years ago
Maksim Pechnikov	189a288925	fix test	5 years ago
Maksim Pechnikov	9694d51437	added test fo Pleroma.Web.MastodonAPI.StatusController	5 years ago
lain	f1381d68e7	StatusControllerTest: Capture log.	5 years ago
Ariadne Conill	c2ae6310dc	tests: mastodon api: fix broken test that used OStatus	5 years ago
Ariadne Conill	a8eb1f0975	tests: mastodon search: search for an account that is visible via activitypub, not ostatus	5 years ago
Ariadne Conill	d379b48769	kill almost all of the OStatus module	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	6e4f52f8a2	Introduce new ingestion pipeline structure, implement internal Likes with it.	5 years ago
eugenijm	a97b642289	Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints	5 years ago
lain	cb8492962e	SearchController: Fix test. ... Turns out you can't actually find the user with this.	5 years ago
Egor Kislitsyn	059005ff82	Replace `user.following` with Pleroma.FollowingRelationship	5 years ago
kaniini	9fd5176c35	Merge branch 'unicode-search' into 'develop' ... Search: Add tests for unicode searches. See merge request pleroma/pleroma!1824	5 years ago
lain	c1bae01376	Search: Add tests for unicode searches.	5 years ago
eugenijm	580a67f5ca	Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)	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
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
eugenijm	8249924485	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	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
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
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
Egor Kislitsyn	c8b01f6667	Extract instance actions from `MastodonAPIController` to `InstanceController`	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	7d5a9f3f6d	Add tests for privately announcing statuses via API	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	f364438032	Add `rel="ugc"`	5 years ago
kPherox	a0f101ee80	Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials	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	122cc050ab	Move account_lists test to MastodonAPI.AccountControllerTest	5 years ago
Egor Kislitsyn	38db4878a4	Disable async in DomainBlockControllerTest	5 years ago
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	5 years ago
Egor Kislitsyn	e7aef27c00	Fix merge	5 years ago
Egor Kislitsyn	1207e88195	Fix ReportControllerTest	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	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
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	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
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
Egor Kislitsyn	76b7e5cd5b	Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest	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
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
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	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
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	5 years ago
Egor Kislitsyn	a66a7a328f	Extract notification actions from `MastodonAPIController` into `NotificationController`	5 years ago
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	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
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
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
Egor Kislitsyn	95c948110c	Add `rel="ugc"` to hashtags and mentions	5 years ago
Egor Kislitsyn	cf3041220a	Add support for `rel="ugc"`	5 years ago
eugenijm	fe5e0b7846	Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)	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
Ivan Tashkinov	01c1078015	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex	5 years ago
eugenijm	450bf7a63c	Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)	5 years ago
Roman Chvanikov	6042e21b25	Move subscription notifications to a separate controller	5 years ago
Roman Chvanikov	76c3e290fc	Merge develop	5 years ago
Egor Kislitsyn	ca88e37a8f	Fix a race condition in tests	5 years ago
Ivan Tashkinov	efbc2edba1	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex # lib/pleroma/web/router.ex	5 years ago
Ivan Tashkinov	e6f43a831b	[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	5 years ago
Ivan Tashkinov	610236d6be	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md	5 years ago
Roman Chvanikov	d7457c9165	Merge branch 'develop' into refactor/subscription	5 years ago
Ivan Tashkinov	6bcedb693c	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md # mix.lock	5 years ago
rinpatch	a78a7ee455	Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs	5 years ago
rinpatch	85b6144ffd	Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs	5 years ago
rinpatch	5c5ebd3861	Mastodon API: Respect post privacy in favourited/reblogged endpoints	5 years ago
stwf	25a64a4aa0	Capture test error messages where appropriate	5 years ago
Roman Chvanikov	0bd2b85edb	Separate Subscription Notifications from regular Notifications	5 years ago
Maksim Pechnikov	bc3e8c033b	fix formatting	5 years ago
Maksim Pechnikov	ec5aaf5bd7	fix tests	5 years ago
Maksim Pechnikov	d8a178274b	fix Activity.get_by_id	5 years ago
Maksim	58b17196fa	Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs	5 years ago
Egor Kislitsyn	b40b10b53d	Add an endpoint to get multiple statuses by IDs	5 years ago
Maksim Pechnikov	ab2f21e470	tests for mastodon_api_controller.ex	5 years ago
Ivan Tashkinov	ca1ba1e272	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs	5 years ago
rinpatch	896ffabe37	Merge branch 'so-long-twitterapi' into 'develop' ... Removing TwitterAPI See merge request pleroma/pleroma!1605	5 years ago
Haelwenn	fe7cf44c40	Merge branch 'feature/mastoapi-accounts-external' into 'develop' ... Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id` See merge request pleroma/pleroma!1622	5 years ago
rinpatch	b312ca3d52	Mastodon API Poll view: Fix handling of polls without an end date	5 years ago
Ivan Tashkinov	79cf629e1a	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
rinpatch	3face45467	Mastodon API: Add `pleroma.thread_muted` to Status entity ... Needed for pleroma-fe!941	5 years ago
rinpatch	cc1d1ee406	Mastdon API: Add ability to get a remote account by nickname to ... `/api/v1/accounts/:id`	5 years ago
Ivan Tashkinov	e890ea7e82	[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # config/config.exs	5 years ago
rinpatch	90c2dae9a4	Remove most of Pleroma.Web.TwitterAPI.TwitterAPI	5 years ago
Egor Kislitsyn	019ced0558	Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views	5 years ago
Egor Kislitsyn	30510ade0e	Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests	5 years ago
kPherox	eb75ea502d	Update test for custom fields when content-type urlencoded	5 years ago
kPherox	b8777b01ae	Update test for custom fields when name empty string	5 years ago
kPherox	45e21a9df4	Rename fields to fields_attributes	5 years ago
lain	efb8818e9e	Activity Expiration: Switch to 'expires_in' system.	5 years ago
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	5 years ago
Ivan Tashkinov	7101ba1a21	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
Ivan Tashkinov	256ff09aa8	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs	5 years ago
Maksim Pechnikov	85bd8a4e31	fixed clear config after test	5 years ago
lain	ef43016b2c	Merge branch 'feature/custom-fields' into 'develop' ... Add custom profile fields See merge request pleroma/pleroma!1488	5 years ago
Maksim	a320358703	added test helpers to clear config after tests	5 years ago
lain	7ab2dbbdb6	Merge branch 'pleroma-conversations' into 'develop' ... Extended Pleroma Conversations See merge request pleroma/pleroma!1535	5 years ago
Ivan Tashkinov	8778c16dac	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
Ivan Tashkinov	a180c1360e	[#1149] Oban mailer job. Adjusted tests.	5 years ago
stwf	d81f63845a	Implement Pleroma.Stats as GenServer	5 years ago
lain	560dbad538	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	5 years ago
Egor Kislitsyn	f7bbf99caa	Use info.fields instead of source_data for remote users	5 years ago
Egor Kislitsyn	2c35d4b0b0	Add configurable account field name length limit	5 years ago
Egor Kislitsyn	db3c05f6b4	Add configurable account field value length limit	5 years ago
Egor Kislitsyn	d6094b405d	Fix tests	5 years ago
Egor Kislitsyn	e0ac5c7a66	Add custom profile fields	5 years ago
Maksim	04da1166db	tests for /web/mastodon_api/mastodon_api.ex	5 years ago