2507 commits

Author	SHA1	Message	Date
kaniini	433f2c0f68	Merge branch 'split-masto-api/instance' into 'develop' ... Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760	2019-10-02 10:46:14 +00:00
Thibaut Girka	86880b9821	Inline object when Announcing a self-owned private object	2019-10-02 12:15:06 +02:00
Egor Kislitsyn	c8b01f6667	Extract instance actions from MastodonAPIController to InstanceController	2019-10-02 14:13:52 +07:00
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	2019-10-02 07:04:33 +00:00
kaniini	8557176808	Merge branch 'split-masto-api/auth' into 'develop' ... Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759	2019-10-02 07:02:56 +00:00
kaniini	9b38bf4af4	Merge branch 'features/private-reblogs' into 'develop' ... Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766	2019-10-02 07:02:24 +00:00
feld	1255ec888d	Revert "Add upload limits to /api/v1/instance" ... This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.	2019-10-01 22:16:29 +00:00
Thibaut Girka	427d0c2a00	Store private announcements in object.data["announcements"], filter them on display	2019-10-01 22:39:25 +02:00
Thibaut Girka	7d5a9f3f6d	Add tests for privately announcing statuses via API	2019-10-01 20:38:29 +02:00
Thibaut Girka	e0b654e202	Add tests	2019-10-01 18:38:57 +02:00
Maxim Filippov	0f9c2c8b87	Send an identifier alongside with error message in OAuthController	2019-10-01 18:10:04 +03:00
Egor Kislitsyn	af690d1033	Extract auth actions from MastodonAPIController to AuthController	2019-10-01 15:54:45 +07:00
Egor Kislitsyn	2dad6dd020	Extract apps actions from MastodonAPIController to AppController	2019-10-01 15:21:46 +07:00
Egor Kislitsyn	39695c4436	Extract suggestions actions from MastodonAPIController to SuggestionController	2019-10-01 15:07:49 +07:00
Egor Kislitsyn	585bc57edb	Extract media actions from MastodonAPIController to MediaController	2019-10-01 14:36:35 +07:00
Egor Kislitsyn	36a34c36fe	Extract poll actions from MastodonAPIController to PollController	2019-10-01 11:44:34 +07:00
kPherox	f364438032	Add rel="ugc"	2019-10-01 02:24:06 +09:00
kPherox	a0f101ee80	Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials	2019-10-01 01:40:33 +09:00
lain	dae744478e	Transmogrifier: Handle compact objects in undos.	2019-09-30 18:13:05 +02:00
lain	19bc0b8c79	.	2019-09-30 16:38:19 +02:00
lain	08256e9299	ActivityPub: Federate reactions.	2019-09-30 15:51:09 +02:00
lain	6068d2254e	PleromaAPIController: Fixes and refactoring.	2019-09-30 15:13:25 +02:00
Egor Kislitsyn	0c6009dd2e	Extract mascot actions from MastodonAPIController to MascotController	2019-09-30 19:32:43 +07:00
Egor Kislitsyn	c55facf78b	Fix warning in TransmogrifierTest	2019-09-30 19:10:56 +07:00
Egor Kislitsyn	987e0b8be8	Move update_credentials to MastodonAPI.AccountController	2019-09-30 19:10:56 +07:00
Egor Kislitsyn	c0ce2d5faf	Move account_register, relationships and verify_credentials to MastodonAPI.AccountController	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	122cc050ab	Move account_lists test to MastodonAPI.AccountControllerTest	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	38db4878a4	Disable async in DomainBlockControllerTest	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	e7aef27c00	Fix merge	2019-09-30 19:10:54 +07:00
lain	a7f22c6e93	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-30 13:58:14 +02:00
lain	b923842e96	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-30 13:57:54 +02:00
Egor Kislitsyn	1207e88195	Fix ReportControllerTest	2019-09-30 18:30:10 +07:00
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	2019-09-30 11:21:49 +00:00
kaniini	0e356cc800	Merge branch 'split-masto-api/reports' into 'develop' ... Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744	2019-09-30 11:17:30 +00:00
kaniini	74d8fadf37	Merge branch 'split-masto-api/conversations' into 'develop' ... Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743	2019-09-30 10:49:40 +00:00
Egor Kislitsyn	b7f27a4f58	Extract report actions from MastodonAPIController to ReportController ... Update MastodonAPI.ReportView	2019-09-30 17:44:10 +07:00
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	2019-09-30 10:39:48 +00:00
Ariadne Conill	211008ae2f	test: fix scrobble controller tests	2019-09-30 10:39:48 +00:00
Ariadne Conill	71eff09e56	common api: make sure the generated IR is actually federatable	2019-09-30 10:39:48 +00:00
Ariadne Conill	e7309d3b60	test: transmogrifier: add test proving that transmogrifier can handle outgoing listens	2019-09-30 10:39:48 +00:00
Ariadne Conill	7cad6ea67a	pleroma api: hook up scrobbler controller	2019-09-30 10:39:17 +00:00
Ariadne Conill	2c82d8603b	common api: implement scrobbling	2019-09-30 10:39:17 +00:00
Ariadne Conill	172c74a77b	activitypub: transmogrifier: implement support for Listen activities	2019-09-30 10:39:17 +00:00
Ariadne Conill	1f9de2a8cd	activitypub: implement IR-level considerations for Listen activities	2019-09-30 10:39:17 +00:00
Ariadne Conill	b7877e9b1c	mastodon api: implement rendering of listen activities	2019-09-30 10:39:17 +00:00
Egor Kislitsyn	d4d88b3361	Extract conversation actions from MastodonAPIController to ConversationController	2019-09-30 16:52:07 +07:00
rinpatch	e9d1aa75d5	Revert subscription refactoring. ... As discussed in pleroma-meta#2 This reverts commit eb9aa7aa10, reversing changes made to c4fbb56984.	2019-09-29 18:43:27 +03:00
kaniini	6d74a7528c	Merge branch 'feature/follow-requests-count' into 'develop' ... Mastodon API: add follow_requests_count See merge request pleroma/pleroma!1726	2019-09-29 11:44:31 +00:00
Maksim Pechnikov	1053319cd6	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier	9202904da9	status_controller.ex: Posting media status without content defined	2019-09-28 01:53:41 +02:00
rinpatch	374f83d29b	Fix not being able to post empty statuses with attachments ... Attachment field was filled in after the empty status check	2019-09-28 01:58:06 +03:00
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	2019-09-27 07:54:54 +00:00
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	2019-09-27 07:54:08 +00:00
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	2019-09-27 07:53:22 +00:00
Egor Kislitsyn	408750b94e	Extract domain blocks actions from MastodonAPIController to DomainBlockController	2019-09-27 14:28:05 +07:00
Egor Kislitsyn	99c5a35890	Extract follow requests actions from MastodonAPIController to FollowRequestController	2019-09-27 14:25:17 +07:00
Egor Kislitsyn	0a5b106ddd	Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController	2019-09-27 13:36:28 +07:00
Egor Kislitsyn	621377f378	Extract filter actions from MastodonAPIController to FilterController	2019-09-27 13:06:25 +07:00
kaniini	91e2bcf218	Merge branch 'refactor/status-controller' into 'develop' ... Extract status actions from `MastodonAPIController` to `StatusController` See merge request pleroma/pleroma!1719	2019-09-27 04:37:48 +00:00
Ariadne Conill	14294243a2	mastodon api: implement follow_requests_count	2019-09-27 04:22:40 +00:00
Egor Kislitsyn	5ea5c58a85	Move view logic from StatusController.context to StatusView and add a test	2019-09-27 10:52:47 +07:00
Egor Kislitsyn	76b7e5cd5b	Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest	2019-09-27 10:52:47 +07:00
kaniini	eb9aa7aa10	Merge branch 'refactor/subscription' into 'develop' ... Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664	2019-09-27 03:51:24 +00:00
Egor Kislitsyn	98d1347a4e	Extract status actions from MastodonAPIController into StatusController	2019-09-27 10:51:15 +07:00
kaniini	dc0fdb5e84	Merge branch 'refactor/timeline-controller' into 'develop' ... Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648	2019-09-27 03:42:30 +00:00
Maksim Pechnikov	b4fc96f640	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-26 20:56:59 +03:00
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	2019-09-26 19:01:54 +03:00
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-26 16:16:30 +03:00
Roman Chvanikov	b4b147000c	Merge develop	2019-09-26 10:38:54 +03:00
Egor Kislitsyn	3572cf29b7	Extract timeline actions from MastodonAPIController into TimelineController	2019-09-26 10:53:42 +07:00
kaniini	6abe12dced	Merge branch 'refactor/notification-controller' into 'develop' ... Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646	2019-09-26 03:13:22 +00:00
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	2019-09-26 03:12:03 +00:00
kaniini	48a82c4609	Merge branch 'refactor/user' into 'develop' ... Simplify updating user's `info` See merge request pleroma/pleroma!1712	2019-09-26 03:00:38 +00:00
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	2019-09-26 02:57:41 +00:00
kaniini	beabc49e35	Merge branch 'feature/activities-pagination-by-offset' into 'develop' ... Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714	2019-09-26 02:49:45 +00:00
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	2019-09-26 00:03:47 +00:00
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.	2019-09-25 15:59:04 +03:00
Ekaterina Vaartis	118d6dcdf4	Fix nodeinfo handling	2019-09-25 12:32:19 +02:00
Ekaterina Vaartis	ba9d35a904	Add an API endpoint for listing remote packs	2019-09-25 12:32:19 +02:00
Maxim Filippov	60cbea5bb2	Allow activities pagination via limit/offset	2019-09-25 01:25:42 +03:00
Haelwenn (lanodan) Monnier	0dc8f3d6d2	/api/ap/uploadMedia → /api/ap/upload_media	2019-09-24 19:03:06 +02:00
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	2019-09-24 19:50:07 +07:00
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-24 13:00:48 +03:00
Egor Kislitsyn	a66a7a328f	Extract notification actions from MastodonAPIController into NotificationController	2019-09-24 15:16:44 +07:00
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-24 08:06:04 +03:00
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	2019-09-23 22:42:34 +00:00
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	2019-09-23 22:41:31 +00:00
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	2019-09-23 22:35:09 +00:00
kaniini	ad9595ca55	Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' ... added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651	2019-09-23 22:34:52 +00:00
Steven Fuchs	e1d2d69c87	Clean up views	2019-09-23 22:33:59 +00:00
Maksim Pechnikov	494bb6bac6	updated tests	2019-09-23 22:37:30 +03:00
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-23 21:41:57 +03:00
Maksim Pechnikov	38245f1336	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-23 21:32:50 +03:00
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' ... Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	2019-09-23 18:20:08 +00:00
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	2019-09-23 21:14:51 +03:00
Haelwenn (lanodan) Monnier	815b904508	Add support for AP C2S uploadMedia ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171	2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier	2ad50583f0	Document and test /api/ap/whoami	2019-09-23 19:47:35 +02:00
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-22 16:58:39 +03:00
Maxim Filippov	72a01f1350	Use router helper to generate reset password link	2019-09-22 16:36:59 +03:00
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	2019-09-22 16:08:07 +03:00
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)	2019-09-20 18:27:00 +03:00
lain	b80c41a14f	Merge branch 'outbox_pagination' into 'develop' ... Fix AP outbox pagination See merge request pleroma/pleroma!1700	2019-09-19 16:53:59 +00:00
D Anzorge	9aca2cc95d	Add test for correct AP outbox pagination	2019-09-19 16:49:27 +02:00
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	2019-09-19 10:59:09 +03:00
Egor Kislitsyn	95c948110c	Add rel="ugc" to hashtags and mentions	2019-09-19 14:56:10 +07:00
Egor Kislitsyn	cf3041220a	Add support for rel="ugc"	2019-09-19 14:56:10 +07:00
eugenijm	fe5e0b7846	Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)	2019-09-19 08:59:25 +03:00
Maksim Pechnikov	d4ed3a35b8	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-19 07:35:34 +03:00
Haelwenn	f95a2b2cda	Merge branch 'issue/733' into 'develop' ... [#733] added test for Ostatus See merge request pleroma/pleroma!1657	2019-09-18 22:28:10 +00:00
rinpatch	b0ec82d24a	Merge branch 'chores/bump-copyright-year' into 'develop' ... Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698	2019-09-18 21:57:49 +00:00
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/'	2019-09-18 23:21:11 +02:00
Ekaterina Vaartis	b585134c90	Get the nodeinfo address from the well-known	2019-09-19 00:16:34 +03:00
Ekaterina Vaartis	a1325d5fd9	Change path from nodeinfo to metadata->features	2019-09-19 00:16:34 +03:00
Ekaterina Vaartis	36f2275dc9	A feature for shareable emoji packs, use it in download_from & tests	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	74fb6d8647	Move EmojiAPIController from EmojiAPI to PleromaAPI	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	6cd651a38b	Make the emoji controller api more RESTy	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7c784128fd	Change emoji api responses to JSON	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	9eb2ee4df0	Allow importing old (emoji.txt / plain) packs from the filesystem	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	f5131540dc	Add a way to create emoji packs via an endpoint	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	8dbdd5c280	Allow uploading new emojis to packs from URLs	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	9afe7258dd	Implememt emoji pack file updating + write tests	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	9dc9689144	Add tests for pack metadata updating	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	adf31d596e	Add tests for downloading from fallback url	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	2a94eca096	Change YAML to JSON	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	2d4b8f3d20	Add an endpoint for deleting emoji packs	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7e4c8b56ea	Add tests for emoji pack sharing	2019-09-19 00:16:33 +03:00
feld	ab2ca3038f	Merge branch 'hide-follower-following-count' into 'develop' ... Add a setting to hide follows/followers stats from the user profile See merge request pleroma/pleroma!1663	2019-09-18 21:13:15 +00:00
feld	25b4365656	Merge branch 'admin_api_invite_tokens' into 'develop' ... POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637	2019-09-18 21:11:37 +00:00
feld	220afadc55	Merge branch 'restore-tests' into 'develop' ... Restore tests for `change_password` and `delete_account` See merge request pleroma/pleroma!1658	2019-09-18 21:05:18 +00:00
Alex S	4faf2b1555	post for creating invite tokens in admin api	2019-09-18 10:49:14 +03:00
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	2019-09-17 22:53:26 +03:00
Maksim Pechnikov	0447c42715	Merge branch 'develop' into issue/733	2019-09-17 22:20:39 +03:00
rinpatch	ef2e2c5e12	Merge branch 'feature/return-total-for-reports' into 'develop' ... Admin API: Return total for reports See merge request pleroma/pleroma!1628	2019-09-17 19:09:56 +00:00
Maksim Pechnikov	7dd51652f9	Merge branch 'develop' into issue/733	2019-09-17 21:20:08 +03:00
rinpatch	95a4a19417	Merge branch 'support/tests' into 'develop' ... add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627	2019-09-17 14:47:26 +00:00
Roman Chvanikov	e9f69a3eb7	Move pleroma_api controllers into controllers sub-folders	2019-09-17 16:52:23 +03:00
Roman Chvanikov	7d1773bc6b	Rename SubscriptionNotificationController list and get actions to index and show	2019-09-17 16:48:24 +03:00
Roman Chvanikov	015597c2ab	Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs	2019-09-17 13:43:15 +00:00
eugenijm	450bf7a63c	Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)	2019-09-17 14:45:47 +03:00
Roman Chvanikov	6042e21b25	Move subscription notifications to a separate controller	2019-09-16 21:59:49 +03:00
Roman Chvanikov	76c3e290fc	Merge develop	2019-09-16 20:30:42 +03:00
Maxim Filippov	df15ed13d1	Merge branch 'develop' into feature/moderation-log-filters	2019-09-16 19:44:06 +03:00
Maxim Filippov	219dca1b00	Merge branch 'develop' into feature/return-total-for-reports	2019-09-16 14:40:17 +03:00
Egor Kislitsyn	96816ceaa2	Revert "Merge branch 'revert-4fabf83a' into 'develop'" ... This reverts commit fe7fd33126, reversing changes made to 4fabf83ad0.	2019-09-16 17:55:04 +07:00
rinpatch	e8120944d8	Fix signed fetch inclusion publisher test ... Oban branch changed `actor` to `actor_id` and this test was not adjusted for that	2019-09-16 13:23:06 +03:00
kaniini	c623b4324d	Revert "Merge branch 'streamer-refactoring' into 'develop'" ... This reverts merge request !1653	2019-09-16 09:09:21 +00:00
Steven Fuchs	aab264db82	Streamer refactoring	2019-09-16 07:44:03 +00:00
kaniini	17142a3720	Merge branch 'feature/delivery-tracking' into 'develop' ... Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661	2019-09-16 07:39:58 +00:00
Egor Kislitsyn	ca88e37a8f	Fix a race condition in tests	2019-09-16 12:55:05 +07:00
Egor Kislitsyn	43f17c2e67	Restore tests for change_password and delete_account	2019-09-16 12:34:47 +07:00
Maksim Pechnikov	d75bc728e7	Merge branch 'develop' into issue/733	2019-09-16 07:34:22 +03:00
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	2019-09-15 18:52:27 +03:00
Ivan Tashkinov	e6f43a831b	[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	2019-09-15 18:22:08 +03:00
Maksim Pechnikov	8751809e1e	Merge branch 'develop' into support/tests	2019-09-15 14:22:15 +03:00
Ivan Tashkinov	610236d6be	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md	2019-09-15 10:12:24 +03:00
Roman Chvanikov	d7457c9165	Merge branch 'develop' into refactor/subscription	2019-09-14 18:29:51 +03:00
Ivan Tashkinov	6bcedb693c	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md # mix.lock	2019-09-14 16:11:44 +03:00
rinpatch	a78a7ee455	Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs	2019-09-14 10:50:08 +00:00
rinpatch	85b6144ffd	Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs	2019-09-14 10:46:35 +00:00
rinpatch	5c5ebd3861	Mastodon API: Respect post privacy in favourited/reblogged endpoints	2019-09-14 01:50:15 +03:00
lain	a9b78f55e3	Merge branch 'capture-test-errors' into 'develop' ... Capture test error messages where appropriate See merge request pleroma/pleroma!1665	2019-09-13 17:07:14 +00:00
rinpatch	ba70a8cae6	Merge branch 'develop' into feature/delivery-tracking	2019-09-13 19:42:53 +03:00
stwf	25a64a4aa0	Capture test error messages where appropriate	2019-09-13 11:46:41 -04:00
Roman Chvanikov	0bd2b85edb	Separate Subscription Notifications from regular Notifications	2019-09-13 18:25:27 +03:00
lain	a7f31bf06c	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-13 16:31:27 +02:00
lain	e5b3ad3d04	ActivityPub: Use is_unicode_emoji? function.	2019-09-13 16:06:34 +02:00
Haelwenn	0d9609894f	Merge branch 'feature/change-email' into 'develop' ... Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580	2019-09-13 12:46:16 +00:00
rinpatch	f884987ace	Merge branch 'admin-config-description' into 'develop' ... Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611	2019-09-13 12:36:24 +00:00
Maksim Pechnikov	bc3e8c033b	fix formatting	2019-09-13 15:06:34 +03:00
Maksim Pechnikov	ec5aaf5bd7	fix tests	2019-09-13 14:59:58 +03:00
rinpatch	fb96facc32	Remove unused functions and fix credo issues	2019-09-13 12:29:42 +03:00
rinpatch	ce23529d91	Use delivery info when federating deletes	2019-09-13 11:38:17 +03:00
Egor Kislitsyn	25d8216804	Add email change endpoint	2019-09-13 13:09:35 +07:00
Maksim Pechnikov	d8a178274b	fix Activity.get_by_id	2019-09-13 07:12:34 +03:00
Maksim	58b17196fa	Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs	2019-09-13 03:58:58 +00:00
Maksim Pechnikov	2b40e57a72	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-13 06:55:05 +03:00
Maksim Pechnikov	936951826e	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-12 22:15:43 +03:00
rinpatch	769fb778d4	Track object/create activity fetches	2019-09-12 21:37:36 +03:00
Mark Felder	102eb4455c	Fix associated test as well	2019-09-12 12:29:08 -05:00
lain	8d4b661ecb	Transmogrifier: Strip internal emoji reaction fields.	2019-09-12 18:59:13 +02:00
lain	05e9776517	PleromaAPIController: Add endpoint to fetch emoji reactions.	2019-09-12 18:48:25 +02:00
Maksim Pechnikov	4f548cb2b7	added test for Ostatus	2019-09-12 10:25:43 +03:00
Maksim Pechnikov	007e0c1ce1	added tests	2019-09-11 23:19:06 +03:00
Alex S	a1f2dfb10a	expanding regex sigils to use modifiers	2019-09-11 09:25:33 +03:00
Maksim Pechnikov	fcf604fa43	added tests	2019-09-11 07:23:33 +03:00
Maksim Pechnikov	a31af93e1d	added tests /activity_pub/transmogrifier.ex	2019-09-10 16:43:10 +03:00
Egor Kislitsyn	b40b10b53d	Add an endpoint to get multiple statuses by IDs	2019-09-10 13:39:45 +07:00
Maxim Filippov	d1abf7a358	Merge branch 'develop' into feature/moderation-log-filters	2019-09-10 01:23:20 +03:00
minibikini	11e12b5761	Add Pleroma.Plugs.Cache	2019-09-09 18:53:08 +00:00
Egor Kislitsyn	e0f84d0043	Fix ActivityPubController.read_inbox/2	2019-09-10 01:11:57 +07:00
Ivan Tashkinov	b63faf9819	[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).	2019-09-08 15:00:03 +03:00
Maksim Pechnikov	39f99dc6cd	Merge branch 'develop' into support/tests	2019-09-07 22:13:43 +03:00
Maksim Pechnikov	ab2f21e470	tests for mastodon_api_controller.ex	2019-09-06 21:50:00 +03:00
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	2019-09-06 13:26:05 +03:00
rinpatch	896ffabe37	Merge branch 'so-long-twitterapi' into 'develop' ... Removing TwitterAPI See merge request pleroma/pleroma!1605	2019-09-06 08:43:38 +00:00
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	2019-09-05 12:48:27 +00:00
rinpatch	b312ca3d52	Mastodon API Poll view: Fix handling of polls without an end date	2019-09-05 12:03:39 +03:00
Ivan Tashkinov	79cf629e1a	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-09-05 11:30:41 +03:00
lain	99ea990a16	PleromaAPIController: Add emoji reactions.	2019-09-04 12:20:35 -05:00
Maxim Filippov	af746fa4a8	Return total for reports	2019-09-04 20:08:13 +03:00
Maxim Filippov	3542ca6702	Merge branch 'develop' into feature/moderation-log-filters	2019-09-04 19:40:07 +03:00
Maksim Pechnikov	8cbad5500c	add tests for activity_pub/utils.ex	2019-09-04 15:25:12 +03:00
rinpatch	3face45467	Mastodon API: Add pleroma.thread_muted to Status entity ... Needed for pleroma-fe!941	2019-09-04 14:17:23 +03:00
rinpatch	c2b6c1b089	Extend /api/pleroma/notifications/read to mark multiple notifications ... as read and make it respond with Mastoapi entities	2019-09-04 12:38:27 +03:00
lain	9bc12b88b3	ActivityPub: Save emoji reactions in object.	2019-09-03 16:50:04 -05:00
rinpatch	cc1d1ee406	Mastdon API: Add ability to get a remote account by nickname to ... `/api/v1/accounts/:id`	2019-09-03 19:26:10 +03:00
Ivan Tashkinov	b49085c156	[#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.	2019-09-02 14:57:40 +03:00
Maxim Filippov	6c2fd1b78b	Fix tests	2019-09-01 21:38:15 +03:00
Ivan Tashkinov	a90ea8ba15	[#1149] Addressed code review comments (code style, jobs pruning etc.).	2019-08-31 19:08:56 +03:00
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	2019-08-31 14:25:43 +03:00
rinpatch	9cabc02864	Remove a useless import	2019-08-31 10:57:35 +03:00
rinpatch	dbfcba85ec	Add a changelog entry for twitterapi removal and fix credo issues	2019-08-31 10:45:37 +03:00
rinpatch	64410497d2	Remove TwitterAPI representers	2019-08-31 10:41:15 +03:00
rinpatch	985122cc03	Remove Activity, User and Notification views from TwitterAPI	2019-08-31 10:31:15 +03:00
rinpatch	90c2dae9a4	Remove most of Pleroma.Web.TwitterAPI.TwitterAPI	2019-08-31 10:20:34 +03:00
Maxim Filippov	f182f0f6bd	Add ability to search moderation logs	2019-08-31 00:57:15 +03:00
Haelwenn	d9d7765383	Merge branch 'fix-osada-follow' into 'develop' ... Transmogrifier: Fix follow handling when the actor is an object. Closes #1211 See merge request pleroma/pleroma!1604	2019-08-28 07:10:35 +00:00
lain	b770ed1d99	CommonAPI: Support emoji reactions.	2019-08-27 17:56:28 -05:00
lain	f017260cdc	Merge remote-tracking branch 'origin/develop' into reactions	2019-08-27 16:38:51 -05:00
lain	66519f2100	Merge branch 'list-controller' into 'develop' ... Extract list actions from `MastodonAPIController` into `ListController` See merge request pleroma/pleroma!1600	2019-08-27 21:15:54 +00:00
Maxim Filippov	5e4fde1d3d	Filter logs by date	2019-08-27 20:48:16 +03:00
Maksim Pechnikov	00abe099cd	added tests for ActivityPub.like\unlike	2019-08-27 16:21:03 +03:00
rinpatch	eb1739c596	Remove most of TwitterAPIController	2019-08-27 12:29:19 +03:00
lain	a0b21c8928	Transmogrifier: Handle incoming emoji reactions.	2019-08-26 16:47:31 -05:00
lain	6e1ec4c5da	ActivityPub: Basic EmojiReactions.	2019-08-26 16:29:51 -05:00
lain	3da65292b3	Transmogrifier: Fix follow handling when the actor is an object.	2019-08-26 14:34:52 -05:00
Maxim Filippov	c338224c93	Fix sporadic test	2019-08-26 17:24:22 +03:00
Egor Kislitsyn	019ced0558	Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views	2019-08-26 19:37:57 +07:00
Egor Kislitsyn	30510ade0e	Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests	2019-08-26 19:37:54 +07:00
kPherox	eb75ea502d	Update test for custom fields when content-type urlencoded	2019-08-26 16:55:26 +09:00
kaniini	6dc24422dc	Merge branch 'issue/1177' into 'develop' ... [#1177] fixed unfollow for relay actor See merge request pleroma/pleroma!1589	2019-08-25 19:43:27 +00:00
Maxim Filippov	37dd3867bb	Log admin/moderator actions	2019-08-25 19:39:37 +00:00
kaniini	503139b343	Merge branch 'fix-all-custom-fields-deleted' into 'develop' ... Fix not to use unupdated attachments when all fields are deleted See merge request pleroma/pleroma!1596	2019-08-25 19:35:28 +00:00
kPherox	b8777b01ae	Update test for custom fields when name empty string	2019-08-26 03:30:31 +09:00
kPherox	d74efde94e	Update test for custom profile fields	2019-08-26 02:06:52 +09:00
Haelwenn (lanodan) Monnier	211e163770	Implement missing mocks for rel=me	2019-08-25 08:03:25 +02:00
kPherox	45e21a9df4	Rename fields to fields_attributes	2019-08-25 07:34:11 +09:00
lain	90986667ce	Merge branch 'admin-create-users' into 'develop' ... user creation admin api will create multiple users See merge request pleroma/pleroma!1170	2019-08-24 16:04:19 +00:00
lain	efb8818e9e	Activity Expiration: Switch to 'expires_in' system.	2019-08-24 17:22:48 +02:00
Maksim Pechnikov	654d291b6d	update tests	2019-08-24 17:41:53 +03:00
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	2019-08-24 15:48:33 +02:00
Maksim Pechnikov	73bcbf4fa3	add tests	2019-08-24 11:03:13 +03:00
Ivan Tashkinov	71700ea6d4	[#1149] Updated docs & tests.	2019-08-24 09:27:32 +03:00
Maksim Pechnikov	399ca9133b	fix test	2019-08-22 21:54:37 +03:00
Maksim Pechnikov	f95b67c933	Merge branch 'develop' into issue/1177	2019-08-22 21:13:03 +03:00
Ivan Tashkinov	7101ba1a21	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-22 21:01:28 +03:00
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	2019-08-22 20:59:58 +03:00
Maksim Pechnikov	64bfb41c55	fixed unfollow for relay actor	2019-08-22 06:57:55 +03:00
Maksim Pechnikov	85bd8a4e31	fixed clear config after test	2019-08-21 21:24:35 +03:00
Ariadne Conill	76bb3572dd	test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1	2019-08-20 20:20:12 +00:00
lain	ef43016b2c	Merge branch 'feature/custom-fields' into 'develop' ... Add custom profile fields See merge request pleroma/pleroma!1488	2019-08-20 12:44:14 +00:00
Sergey Suprunenko	75a5dd41ee	Add more tests for Database tasks and DigestEmailWorker	2019-08-19 16:10:00 +00:00
Maksim	a320358703	added test helpers to clear config after tests	2019-08-19 15:34:29 +00:00
Ariadne Conill	a2fdc32368	tests: activitypub: fix typo	2019-08-18 22:31:59 +00:00
kaniini	18c8c8d176	Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' ... Hide muted theads from home/public timelines unless `with_muted` is set See merge request pleroma/pleroma!1575	2019-08-18 21:57:55 +00:00
lain	7ab2dbbdb6	Merge branch 'pleroma-conversations' into 'develop' ... Extended Pleroma Conversations See merge request pleroma/pleroma!1535	2019-08-16 12:55:33 +00:00
rinpatch	a4a3e3becd	Hide muted theads from home/public timelines unless with_muted is set	2019-08-15 17:37:30 +03:00
Ivan Tashkinov	8778c16dac	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-14 21:44:50 +03:00
Ivan Tashkinov	a180c1360e	[#1149] Oban mailer job. Adjusted tests.	2019-08-14 21:42:21 +03:00
stwf	d81f63845a	Implement Pleroma.Stats as GenServer	2019-08-14 11:59:33 -04:00
lain	560dbad538	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	2019-08-14 15:30:40 +02:00
Egor Kislitsyn	e457fcc479	Add :max_remote_account_fields config option	2019-08-14 14:58:06 +07:00
Egor Kislitsyn	f7bbf99caa	Use info.fields instead of source_data for remote users	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	2c35d4b0b0	Add configurable account field name length limit	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	db3c05f6b4	Add configurable account field value length limit	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	7d6f8a7fd7	Linkify custom fields values in ActivityPub.UserViewx	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	5178f960c3	Support user attachment update in Transmogrifier	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	88598c9baf	Add profile custom fields to ActivityPub.UserView	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	d6094b405d	Fix tests	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	e0ac5c7a66	Add custom profile fields	2019-08-14 14:52:54 +07:00
rinpatch	9ef31767f2	Merge branch 'feature/mrf-vocabulary' into 'develop' ... MRF Vocabulary See merge request pleroma/pleroma!1559	2019-08-13 22:51:15 +00:00
Ariadne Conill	10fef2fcee	tests: fix up nodeinfo tests	2019-08-13 22:32:40 +00:00
Ariadne Conill	dd0b71ea6d	tests: add tests for MRF.describe()	2019-08-13 22:19:15 +00:00
Maksim	fea4d89e9f	tests for Web/ActivityPub/Relay	2019-08-13 21:12:59 +00:00
Maksim	04da1166db	tests for /web/mastodon_api/mastodon_api.ex	2019-08-13 21:12:37 +00:00
Ariadne Conill	f7e3b7ff75	tests: add tests for mrf_vocabulary	2019-08-13 20:55:42 +00:00
Ivan Tashkinov	0e1c481a94	[#1149] Added more oban workers. Refactoring.	2019-08-13 20:20:26 +03:00
lain	511ccea5aa	ConversationView: Align parameter names with other views.	2019-08-12 14:23:06 +02:00
lain	60231ec7bd	Conversation: Add endpoint to get a conversation by id.	2019-08-12 13:58:04 +02:00
lain	23c46f7e72	Conversations: Use 'recipients' for accounts in conversation view. ... According to gargron, this is the intended usage.	2019-08-12 12:51:08 +02:00
Ariadne Conill	9cfc289594	MRF: ensure that subdomain_match calls are case-insensitive	2019-08-10 21:19:26 +00:00
kaniini	84808e1697	Merge branch 'develop' into 'fix/hide-follows-counters' ... # Conflicts: # CHANGELOG.md	2019-08-10 18:49:04 +00:00
Sergey Suprunenko	af4cf35e20	Strip internal fields including likes from incoming and outgoing activities	2019-08-10 18:47:40 +00:00
Ivan Tashkinov	33a5fc4a70	[#1149] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.	2019-08-10 20:38:31 +03:00
rinpatch	0802a08871	Mastodon API: Fix thread mute detection ... It was calling CommonAPI.thread_muted? with post author's account instead of viewer's one.	2019-08-10 16:27:46 +03:00
Ivan Tashkinov	267262491e	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-09 20:09:56 +03:00
Ivan Tashkinov	b7fad8d395	[#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.	2019-08-09 20:08:01 +03:00
rinpatch	409bcad54b	Mastodon API: Set follower/following counters to 0 when hiding ... followers/following is enabled We are already doing that in AP representation, so I think we should do it here as well for consistency.	2019-08-09 16:53:55 +03:00
lain	a2b98f6d58	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	2019-08-08 16:04:20 +02:00
Haelwenn	aa718ab8f6	Merge branch 'fix/object-reembeds' into 'develop' ... Do not rembed the object after updating it Closes #1142 See merge request pleroma/pleroma!1538	2019-08-06 22:14:00 +00:00
rinpatch	5329e84d62	OStatus tests: stop relying on embedded objects	2019-08-07 00:58:48 +03:00
rinpatch	32018a4ee0	ActivityPub tests: remove assertions of embedded object being updated, ... because the objects are no longer supposed to be embedded	2019-08-07 00:36:13 +03:00
Maksim	139b196bc0	[#1150] fixed parser TwitterCard	2019-08-06 20:19:28 +00:00
Maksim	bdc9a7222c	tests for CommonApi/Utils	2019-08-05 15:37:05 +00:00
lain	d6fe220e32	Linting.	2019-08-05 16:11:23 +02:00
lain	b64b6fee2a	CommonAPI: Replies to conversations also get the correct context id.	2019-08-05 15:33:22 +02:00
lain	3af6d14da7	Pleroma Conversations API: Add a way to set recipients.	2019-08-05 15:09:19 +02:00
Sergey Suprunenko	e8ad116c2a	Do not add the "next" key to likes.json if there is no more items	2019-08-04 17:13:06 +00:00
Alexander Strizhakov	de0f3b73dd	Admin fixes	2019-08-03 18:16:09 +00:00
Sergey Suprunenko	040347b248	Remove spaces from the domain search	2019-08-03 18:13:20 +00:00
Sergey Suprunenko	8b2fa31fed	Handle MRF rejections of incoming AP activities	2019-08-03 18:12:38 +00:00
lain	eee98aaa73	Pleroma API: Add endpoint to get conversation statuses.	2019-08-02 19:53:08 +02:00
feld	d93d777915	Fix/mediaproxy whitelist base url	2019-08-02 17:07:09 +00:00
lain	56b1c3af13	CommonAPI: Extend api with conversation replies.	2019-08-02 15:05:27 +02:00
lain	5ff8f07ca9	Merge branch 'feature/hide-follows-remote' into 'develop' ... Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users See merge request pleroma/pleroma!1411	2019-08-02 11:23:07 +00:00
Ivan Tashkinov	23d279e03e	[#1149] Replaced RetryQueue with oban-based retries.	2019-08-01 17:28:00 +03:00
Egor Kislitsyn	f98235f2ad	Clean up tests output	2019-08-01 16:33:36 +07:00
kaniini	6c06529cd4	Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop' ... Disallow following locked accounts over OStatus See merge request pleroma/pleroma!1512	2019-07-31 19:13:56 +00:00
rinpatch	813c686dd7	Disallow following locked accounts over OStatus	2019-07-31 22:05:12 +03:00
Maksim	6eb33e7303	test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id	2019-07-31 18:35:15 +00:00
Ariadne Conill	f72e0b7cad	ostatus: explicitly disallow protocol downgrade from activitypub ... This closes embargoed bug #1135.	2019-07-31 18:17:31 +00:00
rinpatch	301ea0dc04	Add tests for counters being updated on follow	2019-07-31 21:09:13 +03:00
Maksim	58443d0cd6	tests for TwitterApi/UtilController	2019-07-31 15:14:36 +00:00
lain	7483679a7b	StatusView: Return direct conversation id.	2019-07-31 15:12:29 +02:00
rinpatch	c88a5d3251	Merge branch 'develop' into feature/hide-follows-remote	2019-07-31 14:12:29 +03:00
Alexander Strizhakov	51b3b6d816	Admin changes	2019-07-30 16:36:05 +00:00
kaniini	5835069215	Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" ... This reverts merge request !1504	2019-07-29 19:42:26 +00:00
Ariadne Conill	5795a890e9	markdown: clean up html generated by earmark	2019-07-29 19:09:58 +00:00
lain	1dfde4151c	Merge branch 'refactor/use-constants' into 'develop' ... refactoring: begin to use constants See merge request pleroma/pleroma!1500	2019-07-29 16:30:47 +00:00
Sergey Suprunenko	c0e258cf21	Redirect not logged-in users to the MastoFE login page on private instances	2019-07-29 16:17:22 +00:00
Maksim	159bbec570	added tests for OstatusController	2019-07-29 05:02:20 +00:00
Ariadne Conill	b93498eb52	constants: add as_public constant and use it everywhere	2019-07-29 02:43:19 +00:00
Sachin Joshi	242f5c585e	add account confirmation email resend in mastodon api	2019-07-28 20:30:10 +00:00
Maksim	6b77a88365	[#1097] added redirect: /pleroma/admin -> /pleroma/admin/	2019-07-26 20:27:38 +00:00
rinpatch	41e0304757	Merge branch 'develop' into feature/hide-follows-remote	2019-07-25 18:43:30 +03:00
kaniini	19835be067	Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' ... Fix remote follow from /ostatus_subscribe Closes #1103 See merge request pleroma/pleroma!1472	2019-07-24 19:29:01 +00:00
Sergey Suprunenko	b20020da16	Show the url advertised in the Activity in the Status JSON response	2019-07-24 19:28:21 +00:00
kPherox	8d9f43e1d1	Add WebFinger test for AP-only account	2019-07-25 01:27:34 +09:00
Mike Verdone	0e2b5a3e6a	WIP	2019-07-24 17:25:11 +02:00
Maksim	55341ac717	tests WebFinger	2019-07-24 15:13:10 +00:00
Eugenij	4504135894	Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)	2019-07-24 15:12:27 +00:00
Mike Verdone	2c83eb0b15	Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" ... This reverts commit 2981821db8.	2019-07-24 17:09:59 +02:00
Mike Verdone	2981821db8	squash! Expose expires_at datetime in mastoAPI only for the activity actor ... NOTE: rewrite the commit msg	2019-07-24 16:51:09 +02:00
Mike Verdone	3cb471ec06	Expose expires_at datetime in mastoAPI only for the activity actor ... In the "pleroma" section of the MastoAPI for status activities you can see an expires_at item that states when the activity will expire, or nothing if the activity will not expire. The expires_at date is only visible to the person who posted the activity. This is the conservative approach in case some attacker decides to write a logger for expiring posts. However, in the future of OCAP, signed requests, and all that stuff, this attack might not be that likely. Some other pleroma dev should remove the restriction in the code at that time, if they're satisfied with the security implications of doing so.	2019-07-24 14:47:22 +02:00
Mike Verdone	704960b3c1	Add support for activity expiration to common and Masto API ... The "expires_at" parameter accepts an ISO8601-formatted date which defines when the activity will expire. At this point the API will not give you any feedback about if your post will expire or not.	2019-07-24 14:45:14 +02:00
Mike Verdone	8ba7a151ad	Cleanup: fix a comment	2019-07-24 13:14:52 +02:00
sadposter	f5d574f4ed	check both item and parent domain blocks	2019-07-24 11:35:16 +01:00
Sadposter	4af4f6166b	honour domain blocks on streaming notifications	2019-07-24 11:09:06 +01:00
kaniini	9c6357324e	Merge branch 'feature/admin-api-user-statuses' into 'develop' ... Admin API: Endpoint for fetching latest user's statuses See merge request pleroma/pleroma!1413	2019-07-23 23:59:21 +00:00
Ariadne Conill	d3bdb8e704	rich media: parser: splice the given URL into the result	2019-07-23 23:51:29 +00:00
Maxim Filippov	f46805bb40	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-24 02:42:28 +03:00
Maxim Filippov	03471151d6	AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)	2019-07-24 01:51:36 +03:00
Alexander Strizhakov	5e72554f3c	Admin config fix	2019-07-23 19:17:00 +00:00
Maksim	c49a09ed88	tests for Pleroma.Web.ActivityPub.Publisher	2019-07-23 19:15:48 +00:00
Sadposter	c400565427	fix test names because i cannot type	2019-07-23 15:47:17 +01:00
Sadposter	299c0e965b	actually reblog on the reblog test	2019-07-23 15:38:19 +01:00
Sadposter	7026018c8c	Use correct URL for tests	2019-07-23 15:31:35 +01:00
Sadposter	452980652d	Mix format	2019-07-23 15:13:05 +01:00
Sadposter	fd1fa5a2ec	add tests for unauthed reqs to liked/reblogged_by	2019-07-23 15:08:41 +01:00
Alexander Strizhakov	b70e659304	Feature/1087 wildcard option for blocks	2019-07-22 14:33:58 +00:00
Haelwenn	674ad5e1df	Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop' ... activitypub: publisher: align sharedinbox usage with AP specification rules See merge request pleroma/pleroma!1464	2019-07-22 11:01:35 +00:00
Sadposter	f712ee879a	Bugfix: muted/blocked user notification streaming	2019-07-22 02:43:55 +00:00
Sergey Suprunenko	05b5af8075	Add tests for users tasks and PleromaAuthenticator	2019-07-22 02:43:15 +00:00
Sadposter	a5d6287ba8	Hide blocked users from interactions	2019-07-22 02:42:29 +00:00
Ariadne Conill	56019d53a8	activitypub: publisher: align sharedinbox usage with AP specification rules ... While debugging the follow breakage, I observed that our sharedInbox usage did not match the rules in the specification. Accordingly, I have better aligned our usage of sharedInbox with the rules outlined in the ActivityPub specification.	2019-07-22 02:38:31 +00:00
rinpatch	196cad46f3	Resolve merge conflicts	2019-07-20 22:04:47 +03:00
Sergey Suprunenko	43a7cd27fe	[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest	2019-07-20 13:07:51 +00:00
kaniini	33729bbb28	Merge branch 'feature/richmedia-ttl' into 'develop' ... add the rich media ttl based on image exp time See merge request pleroma/pleroma!1438	2019-07-19 21:36:36 +00:00
Maksim	c2e2aadc42	#1110 fixed /api/pleroma/healthcheck	2019-07-19 16:20:23 +00:00
Sachin Joshi	de9906ad56	change the structure of image ttl parsar	2019-07-19 11:43:42 +05:45
Maxim Filippov	9570a5be40	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-18 23:38:38 +03:00
Maksim	b6b748d3e7	tests for Uploader with webhook	2019-07-18 12:30:18 +00:00
kaniini	1e48af9acf	Merge branch 'feature/instance-fetch-actor' into 'develop' ... instance fetch service actor See merge request pleroma/pleroma!1440	2019-07-17 19:45:40 +00:00
Eugenij	4bf2bb9cff	Fix password reset for non-test env ... Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response instead of 404 and 400. Fixes pattern matching error caused by different response format in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns :ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled. In tests, it's disabled.	2019-07-17 18:09:31 +00:00
Ariadne Conill	3d23a12d75	tests: add test for fetching the internal fetch actor	2019-07-17 17:48:08 +00:00
kaniini	ce73d5f6a5	Merge branch 'feature/mention-mrf' into 'develop' ... Add MRF MentionPolicy for dropping posts which mention specific actors See merge request pleroma/pleroma!1439	2019-07-17 15:28:41 +00:00
RX14	96a2890a9e	Add MRF MentionPolicy for dropping posts which mention specific actors	2019-07-17 15:16:55 +01:00
Alexander Strizhakov	10f82c88b8	mastoapi password reset ... added rate limit to password reset configure rate limit in runtime	2019-07-16 21:44:50 +00:00
Sachin Joshi	18234cc44e	add the rich media ttl based on image exp time	2019-07-17 00:20:34 +05:45
Eugenij	520ee6c591	Add pleroma.deactivated to the Account entity (Mastodon API)	2019-07-16 11:14:46 +00:00
Eugenij	c4ca142e14	Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)	2019-07-16 11:04:11 +00:00
rinpatch	996fd58ac4	Merge branch 'bugfix/poll-id-as-string' into 'develop' ... Status View: Poll ids are strings. See merge request pleroma/pleroma!1430	2019-07-16 06:06:22 +00:00
lain	7a24def473	Mastodon Controller: Fix tests.	2019-07-16 14:01:18 +09:00
lain	1ed24bcc76	Status View: Poll ids are strings. ... All ids in mastodon are strings, in general.	2019-07-16 12:47:40 +09:00
feld	9f987dd017	Merge branch 'match-file-name' into 'develop' ... try to always match the filename for proxy url See merge request pleroma/pleroma!1405	2019-07-15 22:04:58 +00:00
Sergey Suprunenko	b74300bc7a	Add more tests for MastodonAPIController and CommonAPI	2019-07-15 19:47:23 +00:00
Sachin Joshi	1d906ffa82	Merge branch 'develop' into match-file-name ... # Conflicts: # lib/pleroma/web/media_proxy/media_proxy_controller.ex	2019-07-15 21:30:56 +05:45
kaniini	03c4ea44ad	Merge branch 'admin-configure-atom-keys' into 'develop' ... admin configure - atom keys with leading : See merge request pleroma/pleroma!1424	2019-07-15 13:01:58 +00:00
Alex S	c66044b923	atom keys with leading :	2019-07-15 11:00:55 +03:00
Egor Kislitsyn	de13c9bb8f	List messages must be visible for mentioned users	2019-07-15 14:54:40 +07:00
Egor Kislitsyn	64a946643e	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-07-15 14:11:54 +07:00
Egor Kislitsyn	a87c313309	Support list visibility in StatusView	2019-07-15 14:00:29 +07:00
Maksim	fa17879c20	added tests for Web.MediaProxy	2019-07-14 21:01:32 +00:00
Sergey Suprunenko	dce8ebc9ea	Unfollow should also unsubscribe	2019-07-14 19:25:03 +00:00
Ariadne Conill	841314c2d5	tests: fix object containment violations in the transmogrifier tests ... Some objects were not completely rewritten in the tests, which caused object containment violations. Fix them by rewriting the object IDs to be in an appropriate namespace.	2019-07-14 19:24:22 +00:00
Alexander Strizhakov	e7c39b7ac8	Feature/1072 muting notifications	2019-07-14 13:29:31 +00:00
rinpatch	0c2dcb4c69	Add follow information refetching after following/unfollowing	2019-07-14 01:58:39 +03:00
rinpatch	183da33e00	Add tests for fetch_follow_information_for_user and check object type ... when fetching the page	2019-07-14 00:56:02 +03:00
Maxim Filippov	418ae6638d	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-14 00:39:06 +03:00
Maxim Filippov	a9459ff98f	Admin API: Endpoint for fetching latest user's statuses	2019-07-14 00:37:26 +03:00
Ariadne Conill	80c46d6d8b	nodeinfo: implement MRF transparency exclusions	2019-07-13 18:53:14 +00:00
rinpatch	e8fa477793	Refactor Follows/Followers counter syncronization ... - Actually sync counters in the database instead of info cache (which got overriden after user update was finished anyway) - Add following count field to user info - Set hide_followers/hide_follows for remote users based on http status codes for the first collection page	2019-07-13 19:27:49 +03:00
rinpatch	095117a58c	Merge branch 'develop' into fix/ap-hide-follows	2019-07-12 21:43:06 +03:00
rinpatch	97b79efbcd	ActivityPub Controller: Actually pass for_user to following/followers ... views and give 403 errors when trying to request hidden follower pages when unauthenticated	2019-07-12 20:54:20 +03:00
Maksim	92055941bd	Pleroma.Web.Metadata - tests	2019-07-12 16:42:54 +00:00
rinpatch	1f6ac7680d	ActivityPub User view: Following/Followers refactoring ... - Render the collection items if the user requesting == the user rendered - Do not render the first page if hide_{followers,follows} is set, just give the URI to it	2019-07-12 19:41:55 +03:00
Mark Felder	360e4cdaa2	Move these to pleroma namespace in Mastodon API	2019-07-12 11:25:58 -05:00
rinpatch	27ed260eed	AP user view: Add a test for hiding totalItems in following/followers	2019-07-12 18:36:14 +03:00
Eugenij	4198c3ac39	Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel	2019-07-11 13:55:31 +00:00
Alexander Strizhakov	846ad9a463	admin api configure changes	2019-07-11 13:02:13 +00:00
kaniini	e4e3fd7e55	Merge branch 'fix/1019-refactor' into 'develop' ... Fix/1019 refactor See merge request pleroma/pleroma!1397	2019-07-11 13:01:11 +00:00
Egor Kislitsyn	9e06873d58	Add list to Visibility	2019-07-11 19:29:24 +07:00
Egor Kislitsyn	958fb9aa80	Add "listMessage"	2019-07-11 16:36:08 +07:00
Egor Kislitsyn	182f7bbb11	Merge branch 'develop' into feature/addressable-lists	2019-07-11 13:26:59 +07:00
Alexander Strizhakov	a237c6a2d4	support for idna domains	2019-07-10 15:23:25 +00:00
Haelwenn (lanodan) Monnier	252e129b1e	MastoAPI: Add categories to custom emojis ... Note: This isn’t in a release yet, can be seen in mastofe on the rebase/glitch-soc branch.	2019-07-10 17:02:37 +02:00
Alex S	beba7bbc85	removing synchronization worker	2019-07-10 17:42:18 +03:00
Alex S	f8786fa6f2	adding following_address field to user	2019-07-10 17:42:18 +03:00
Sergey Suprunenko	ff55e3c16f	Create mentions only for explicitly mentioned users	2019-07-10 13:29:50 +00:00
Maksim	008c55e4e9	add test for search_controller/ 100% coverage	2019-07-10 08:28:03 +00:00
Sergey Suprunenko	2d2b50ccca	Send and handle "Delete" activity for deleted users	2019-07-10 05:16:08 +00:00
feld	93a0eeab16	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
Maksim	bb8065a1fd	tests MRF filters	2019-07-10 05:12:21 +00:00
Ivan Tashkinov	8a41d34673	[#878] Tests improvements per code review.	2019-07-09 22:37:59 +03:00
Ivan Tashkinov	6fc0c27be3	[#878] Uncommented test statement.	2019-07-09 22:28:04 +03:00
Ivan Tashkinov	829e997223	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests ... # Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs	2019-07-09 21:46:16 +03:00
kaniini	1417627d07	Merge branch 'remove-avatar-header' into 'develop' ... Ability to reset avatar, profile banner and backgroud See merge request pleroma/pleroma!1187	2019-07-09 17:51:41 +00:00
Haelwenn	95c085174d	Merge branch 'test-speedup' into 'develop' ... Testing: Don't federate in testing. See merge request pleroma/pleroma!1391	2019-07-09 15:35:28 +00:00
rinpatch	376a55c97f	Merge branch '161-incoming-replies-depth-limit' into 'develop' ... [#161] Limited replies depth on incoming federation (memory leaks fix) Closes #161 See merge request pleroma/pleroma!1361	2019-07-09 14:15:10 +00:00
lain	abe2e8881f	Testing: Don't federate in testing.	2019-07-09 15:30:51 +09:00
Ivan Tashkinov	daff85a985	[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.	2019-07-08 19:53:02 +03:00
rinpatch	72b88c82bc	Mastodon API: Fix embedded relationships not being rendered inside of statuses	2019-07-08 12:07:08 +03:00
Ivan Tashkinov	ad8d86e7c6	Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit	2019-07-06 10:17:06 +03:00
Eugenij	ab50c6b3ca	Add fallback value to the admin report view. ... This is to avoid 500 error when the reported user no longer exists in the database.	2019-07-02 01:27:00 +00:00
Ivan Tashkinov	a799418573	[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit ... # Conflicts: # CHANGELOG.md	2019-06-30 16:05:00 +03:00
Ivan Tashkinov	2b9d914089	[#161] Refactoring, documentation.	2019-06-30 15:58:50 +03:00
Eugenij	1f76740e10	Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)	2019-06-30 09:08:46 +00:00
rinpatch	4c60a562a7	Fix not being able to pin unlisted posts ... Closes #1038	2019-06-29 22:27:42 +03:00
Ivan Tashkinov	5b7b1040b3	[#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.	2019-06-29 20:04:50 +03:00
kaniini	d1549a6375	Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop' ... Merge admin and mastodon user views for reports See merge request pleroma/pleroma!1346	2019-06-29 00:12:09 +00:00
William Pitcock	c22f0bfb80	test: add tests for mediaproxy warming policy	2019-06-28 23:41:42 +00:00
Maxim Filippov	90927e6a9a	Kowalski, analysis!	2019-06-28 15:27:18 +03:00
Maxim Filippov	452ca5250d	Merge admin and mastodon user views for reports	2019-06-28 15:15:32 +03:00
Sergey Suprunenko	d53fb55bb7	Return correct response when reply to a direct message is not direct itself	2019-06-26 10:59:27 +00:00
Maksim Pechnikov	4ad15ad2a9	add ignore hosts and TLDs for rich_media	2019-06-25 22:25:37 +03:00
Maksim Pechnikov	0cb8e710fb	add test	2019-06-25 18:06:08 +03:00
Maksim	a0c4ebb4d7	[#184] small refactoring reset password	2019-06-24 19:01:56 +00:00
Eugenij	f2c03425b0	Broadcast conversation update when DM is deleted	2019-06-24 07:14:04 +00:00
kaniini	27b9605de0	Merge branch 'rich_media_titles_two' into 'develop' ... Rich media titles two See merge request pleroma/pleroma!1325	2019-06-23 05:43:11 +00:00
Alex S	b37ede5df3	log capturing	2019-06-23 08:16:28 +03:00
Alex S	982cad0268	support for config groups	2019-06-23 08:16:16 +03:00
Sachin Joshi	a0c65bbd6c	Merge branch 'develop' into 'remove-avatar-header' ... # Conflicts: # CHANGELOG.md	2019-06-23 03:25:50 +00:00
Alex S	410add1c30	support for tuples with more than 2 values	2019-06-22 17:30:53 +03:00
lain	0e415921cd	Rich Media Parser: Do not return just a title if nothing else is there.	2019-06-22 16:22:59 +02:00
lain	58c4d5312b	Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'"" ... This reverts commit b6af80f769.	2019-06-22 15:12:57 +02:00
Alex S	f0fccb7578	fix for int and modules	2019-06-22 09:01:30 +03:00
kaniini	55742d978d	Merge branch 'feature/mrf-anti-link-spam' into 'develop' ... implement anti link spam MRF See merge request pleroma/pleroma!1307	2019-06-21 22:56:54 +00:00
kaniini	e3534f5b3c	Merge branch 'oauth_secure_redirect' into 'develop' ... OAuth security improvements (`redirect_uri` listing enforcement) See merge request pleroma/pleroma!1302	2019-06-21 22:31:12 +00:00
feld	b6af80f769	Revert "Merge branch 'fix/ogp-title' into 'develop'" ... This reverts merge request !1277	2019-06-21 11:36:32 +00:00
Alexander Strizhakov	32320c1ee9	Fixes for dynamic configuration	2019-06-20 17:43:57 +00:00
William Pitcock	21dacd4b15	unbreak polls	2019-06-19 16:33:49 +00:00
William Pitcock	736d8ad6be	implement anti link spam MRF	2019-06-19 15:58:32 +00:00
Ivan Tashkinov	9f45f93949	Added more redirect_uri checks to prevent redirect to not explicitly listed URI.	2019-06-18 17:00:49 +03:00
rinpatch	c7acca2abb	Mastodon API: Sanitize display names ... Closes #1000	2019-06-18 14:12:11 +03:00
rinpatch	49a49d3763	Merge branch 'removing-test-errors' into 'develop' ... Removing test errors See merge request pleroma/pleroma!1296	2019-06-17 14:16:23 +00:00
Haelwenn	c34327b22e	Merge branch 'fix/sanitize-report-content' into 'develop' ... Sanitize HTML in ReportView Closes #990 See merge request pleroma/pleroma!1293	2019-06-16 18:05:00 +00:00
Alex S	2e2edcb461	capturing errors	2019-06-16 20:10:12 +08:00
Maksim	a04bf131e0	[#570] add user:notification stream	2019-06-16 10:33:25 +00:00
rinpatch	bf6aa6f1a8	Fix report content stopping to be nullable	2019-06-16 13:06:12 +03:00
rinpatch	44de34d170	Credo fixes	2019-06-16 01:35:45 +03:00
rinpatch	e943905bd7	Add tests for report view	2019-06-16 01:30:14 +03:00
kaniini	52b1b0e45d	Merge branch '963_oob_oauth_redirect_fix' into 'develop' ... [#963] No redirect on OOB OAuth authorize request with existing authorization See merge request pleroma/pleroma!1276	2019-06-15 13:45:50 +00:00
lain	a440cf856d	Mastodon API: Return the token needed for the chat.	2019-06-15 10:59:35 +02:00
rinpatch	62ffc00a5d	Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' ... AccountView: Add user background. See merge request pleroma/pleroma!1280	2019-06-14 16:49:28 +00:00
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	2019-06-14 15:45:05 +00:00
Maksim	ee4ed87fb4	[#948] /api/v1/account_search added optional parameters (limit, offset, following)	2019-06-14 11:39:57 +00:00
lain	eac298083f	MastodonAPI: Add a way to update the background image.	2019-06-14 11:19:22 +02:00
lain	5965efb216	AccountView: Add user background.	2019-06-13 19:08:05 +02:00
Egor Kislitsyn	a12f8e13c8	Improve <title> fallback; Add a test	2019-06-13 15:02:46 +07:00
Ivan Tashkinov	4b2c29016c	[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.	2019-06-12 21:30:06 +03:00
lain	63ab3c30eb	Merge branch 'feature/rate-limiter' into 'develop' ... Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266	2019-06-11 11:32:01 +00:00
Egor Kislitsyn	ad04d12de6	Replace MastodonAPIController.account_register/2 rate limiter	2019-06-11 16:06:03 +07:00
Sergey Suprunenko	365268d522	Add more tests for using media_proxy and whitelists	2019-06-10 11:34:11 +00:00
rinpatch	dffc9f060a	replace missing mock with a 404	2019-06-07 20:48:25 +03:00
rinpatch	d020f68e87	Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched	2019-06-07 20:40:38 +03:00
lain	7e9f7ea0c2	MastodonAPI: Add test for user search.	2019-06-06 16:16:22 +02:00
kaniini	3f6da9c45a	Merge branch 'bugfix/377-stuck-follow-request' into 'develop' ... Bugfix/377 stuck follow request Closes #377 See merge request pleroma/pleroma!1250	2019-06-05 15:52:40 +00:00
kaniini	a511d2f900	Merge branch 'improve-search' into 'develop' ... [#943] Contain search for unauthenticated users See merge request pleroma/pleroma!1220	2019-06-05 15:51:32 +00:00
lain	ad19bfc7fe	Utils: Split update_follow_state and update_follow_state_for_all.	2019-06-05 16:43:35 +02:00
lain	827a51e777	CommonAPI: Add test for accept_follow_request.	2019-06-05 15:45:16 +02:00
lain	3115b64cfe	Transmogrifier: Add tests for incoming follows to locked accounts.	2019-06-05 14:10:46 +02:00
Egor Kislitsyn	cfa5572d28	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 17:53:15 +07:00
lain	024dfdc39c	Typo + Linting.	2019-06-05 12:45:28 +02:00
lain	8b9a0dd4a7	User: Don't error out when following a user that's already followed. ... This leads to a few situations where it is impossible to follow a user.	2019-06-05 12:06:45 +02:00
Egor Kislitsyn	5b04f07a1e	Limit search for unauthenticated users to local users only	2019-06-05 16:51:04 +07:00
kaniini	e4babb1c9f	Merge branch 'explicit-addressing' into 'develop' ... Explicit addressing See merge request pleroma/pleroma!1239	2019-06-05 08:28:20 +00:00
Egor Kislitsyn	6ba9055b51	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 12:54:30 +07:00
Maksim Pechnikov	d3d1704e84	Merge branch 'develop' into issue/941	2019-06-04 15:06:58 +03:00
rinpatch	bbff7554de	Add tests for get_existing_votes	2019-06-04 13:47:53 +03:00
Egor Kislitsyn	9ce928d823	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-04 16:28:23 +07:00
lain	4cab98b7bf	Merge remote-tracking branch 'origin/develop' into explicit-addressing	2019-06-04 11:23:46 +02:00
Maksim Pechnikov	4f2e359687	Merge branch 'develop' into issue/941	2019-06-04 09:49:08 +03:00
kaniini	9f0d0d0805	Merge branch 'feature/mrf-subchain' into 'develop' ... MRF: subchain policy See merge request pleroma/pleroma!1233	2019-06-04 05:49:54 +00:00
kaniini	9d2563a3de	Merge branch 'generic-fe-settings' into 'develop' ... Generic settings store for frontend user settings See merge request pleroma/pleroma!1221	2019-06-04 05:43:43 +00:00
Maksim Pechnikov	64ada7f960	fix tests	2019-06-03 22:51:14 +03:00
Maksim Pechnikov	f13d6c7f78	update api to set skip_thread_containment	2019-06-03 21:02:57 +03:00
lain	804b6a4d8f	CommonAPI.Utils: Add tests.	2019-06-03 19:08:38 +02:00
lain	80d4d83aac	CommonAPI: Add explicit addressing.	2019-06-03 18:17:08 +02:00
Maksim Pechnikov	080e1aa70e	add option skip_thread_containment	2019-06-03 16:13:37 +03:00
rinpatch	dc91bcc0af	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 13:16:17 +03:00
lambda	314758c25b	Merge branch 'align-mastodon-conversations' into 'develop' ... Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215	2019-06-03 09:48:37 +00:00
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 11:14:52 +03:00
rinpatch	2fe3a20638	Make error message about author's inability to vote more sensible	2019-06-02 23:33:15 +03:00
rinpatch	c47da0e65d	Add tests for poll view	2019-06-02 23:25:33 +03:00
William Pitcock	38a275b31f	test: add tests for subchain policy	2019-06-02 10:08:51 +00:00
kaniini	5402d04e3c	Merge branch 'feature/notification-control-part-2' into 'develop' ... notification controls, part 2 See merge request pleroma/pleroma!1204	2019-06-02 08:25:37 +00:00
Sachin Joshi	e394fc2eef	fix the flaky test for users creation by admin	2019-06-02 09:49:59 +05:45
rinpatch	cfa588e357	Fix Credo issues	2019-06-01 21:42:29 +03:00
rinpatch	65db5e9f52	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
rinpatch	300d94c628	Add poll votes ... Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects	2019-06-01 16:17:46 +03:00
Sachin Joshi	ad5263c647	Merge remote-tracking branch 'upstream/develop' into admin-create-users	2019-06-01 11:42:37 +05:45
Sachin Joshi	5534d4c676	make bulk user creation from admin works as a transaction	2019-06-01 11:17:53 +05:45
kaniini	e706b42f51	Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' ... visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230	2019-06-01 03:39:13 +00:00
Sergey Suprunenko	2bbc2a801f	Remove all follower collections but actor's from "cc"	2019-06-01 03:26:45 +00:00
William Pitcock	f2efe24cf8	visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility	2019-06-01 03:24:08 +00:00
Haelwenn (lanodan) Monnier	5d3ece2861	Remove now useless flavours switching	2019-06-01 01:44:10 +02:00
lambda	2993361075	Merge branch 'hotfix/leaking-lists' into 'develop' ... Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222	2019-05-31 13:26:48 +00:00
lain	7861974ab2	MastodonAPI: Add extension to set and get pleroma_settings_store.	2019-05-31 14:50:18 +02:00
lain	aaad85c4d9	AccountView: settings -> settings_store	2019-05-31 14:49:46 +02:00
lain	eb2963bc43	User: Add settings store to Info, AccountView ... This is to provide a generic frontend settings storage mechanism for all kinds of frontends.	2019-05-31 14:27:15 +02:00
rinpatch	d9c0650ff9	Mastodon API: Fix lists leaking private posts ... Our previous list visibility resolver grabbed posts if either follower collection of the user in a list who is followed is in `to` or if follower collection of the user in a list was in `cc`. This not only missed unlisted posts but also lead to leaking private posts when `fix_explicit_addressing` mistakingly started putting follower collections to `cc` (also fixed in this MR). Reported by @kurisu@iscute.moe via a DM	2019-05-31 15:25:17 +03:00
rinpatch	a9eaa55885	Fix fix_explicit_addressing moving follower collection to cc and add tests for it	2019-05-31 14:17:05 +03:00
lain	97fb50d9fa	Mastodon Conversation API: Don't return own account in 'accounts'.	2019-05-31 11:27:14 +02:00
Sergey Suprunenko	1690be991e	Replace missing non-nullable Card attributes with empty strings	2019-05-30 21:03:31 +00:00
lambda	91ac8b075b	Merge branch 'use-pleroma-config' into 'develop' ... Use Pleroma.Config everywhere See merge request pleroma/pleroma!1214	2019-05-30 13:16:08 +00:00
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
Maksim	db94294dfb	[#936] fix tests	2019-05-29 14:04:58 +00:00
Sachin Joshi	1452a96ad6	ability to set and reset avatar, profile banner and backgroud in Mastodon API	2019-05-27 15:31:01 +05:45
lambda	5bb843ceec	Merge branch 'refactor/die-httpoison-die' into 'develop' ... remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203	2019-05-26 13:33:11 +00:00
William Pitcock	79503ce90f	mrf: simple policy: fix matching imported activitypub and ostatus statuses	2019-05-26 02:01:24 +00:00
William Pitcock	45e4642a58	tests: chase remote/local removal	2019-05-26 00:20:54 +00:00
William Pitcock	59a703fcbe	twitter api: user view: expose user notification settings under pleroma object	2019-05-25 05:31:13 +00:00
William Pitcock	1542cccbbc	tests: chase notification setting changes	2019-05-25 05:22:13 +00:00
William Pitcock	56fd7dbdd7	remove @websub and @ostatus module-level constants	2019-05-25 04:43:11 +00:00
William Pitcock	80d55d428f	tests: websub: check only that signature validation succeeds or fails	2019-05-25 04:34:16 +00:00
Aaron Tinio	9415932af5	Keep nodeinfo available when not federating	2019-05-25 08:15:12 +08:00
Egor Kislitsyn	a7affbdd6d	Fix tests	2019-05-24 21:41:11 +07:00
Egor Kislitsyn	f333041a0a	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-24 21:05:57 +07:00
Sachin Joshi	0c53d91f3b	fix merge conflict	2019-05-23 09:45:12 +02:00
William Pitcock	8086c7aed6	tests: add tests for banner and avatar removal	2019-05-22 18:53:12 +00:00
rinpatch	19c90d47c4	Normalize poll votes to Answer objects	2019-05-22 21:17:57 +03:00
Maksim	620908a2db	[#699] add worker to clean expired oauth tokens	2019-05-22 15:44:50 +00:00
lambda	ff363f70b5	Merge branch 'refactor/keys' into 'develop' ... move key generation functions into Pleroma.Keys module See merge request pleroma/pleroma!1186	2019-05-22 06:28:16 +00:00
rinpatch	cdac5efd10	Merge branch 'bugfix/account_view_source.note' into 'develop' ... MastoAPI AccountView: fill source.note with plaintext version of note Closes #926 See merge request pleroma/pleroma!1189	2019-05-22 05:39:01 +00:00
Haelwenn (lanodan) Monnier	0e2c215a00	MastoAPI AccountView: fill source.note with plaintext version of note ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/926	2019-05-22 07:22:19 +02:00
Sachin Joshi	17bfd000d7	Ability to reset avatar, profile banner and backgroud	2019-05-22 06:47:18 +02:00
kaniini	79c2cef2fb	Merge branch 'mongooseim-support' into 'develop' ... MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172	2019-05-22 04:06:54 +00:00
William Pitcock	045803346d	move key generation functions into Pleroma.Keys module	2019-05-22 03:58:15 +00:00
Aaron Tinio	f76268135c	Fix failing test	2019-05-22 07:16:11 +08:00
Aaron Tinio	3ab9255eda	Respond with a 404 Not implemented JSON error message ... when requested API is not implemented	2019-05-22 07:15:52 +08:00
Aaron Tinio	a13d449b24	Add tests for fallback routes	2019-05-22 05:39:29 +08:00
rinpatch	63b0b7190c	MastoAPI: Add GET /api/v1/polls/:id	2019-05-21 20:40:35 +03:00
rinpatch	0407ffe75f	Change validation error status codes to be more appropriate	2019-05-21 17:12:38 +03:00
rinpatch	aafe30d94e	Handle poll votes	2019-05-21 14:12:10 +03:00
rinpatch	3f96b3e4b8	Enforce poll limits and add error handling for MastodonAPI's post endpoint	2019-05-21 10:54:20 +03:00
rinpatch	76a7429bef	Add poll limits to /api/v1/instance and initial state	2019-05-21 09:13:10 +03:00
Sadposter	dc916ba15f	Format mascot tests	2019-05-20 12:58:17 +01:00
Sadposter	e81f0fc6d4	Add mascot get/set tests	2019-05-20 12:58:06 +01:00
Aaron Tinio	2375e9a95b	Add report filtering to MRF.SimplePolicy	2019-05-20 06:02:50 +08:00
rinpatch	5ece901af3	Resolve merge conflicts and remove IO.inspects	2019-05-18 13:37:38 +03:00
rinpatch	fd920c8973	Mastodon API: Add support for posting polls	2019-05-18 13:29:28 +03:00
William Pitcock	dc08159538	also suppress link previews from posts marked #nsfw	2019-05-17 22:13:24 +00:00
William Pitcock	0da1233e8e	rich media: suppress link previews if post is marked as sensitive	2019-05-17 18:49:43 +00:00
lain	f959bf7aa6	MongooseIM: Add basic integration endpoints.	2019-05-17 18:21:11 +02:00
Egor Kislitsyn	557f0e33a7	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-17 19:57:14 +07:00
Egor Kislitsyn	f2936e0a07	Add ap_id to List	2019-05-17 19:56:37 +07:00
lain	249b31ffe5	Fix specs.	2019-05-17 11:49:13 +02:00
Alexander Strizhakov	7ed682213f	Fix/902 random compile failing	2019-05-17 07:25:20 +00:00
Sachin Joshi	5c028b8f92	user creation admin api will create multiple users	2019-05-17 12:21:58 +05:45
Aaron Tinio	443cd68a4c	Add tests for MRF.SimplePolicy	2019-05-17 09:02:34 +08:00
kaniini	bf84d50c76	Merge branch 'feature/890-add-report-uri' into 'develop' ... Feature/890 add report uri Closes #890 See merge request pleroma/pleroma!1164	2019-05-16 20:11:12 +00:00
Sergey Suprunenko	e2b3a27204	Add Reports to Admin API	2019-05-16 19:09:18 +00:00
feld	e190b3022b	Merge branch 'fix/domain-unblocked-reblogs' into 'develop' ... Fix domain-unblocked reblogs Closes #892 See merge request pleroma/pleroma!1157	2019-05-16 18:57:14 +00:00
Mark Felder	ebb0482116	Merge branch 'develop' into conversations-import	2019-05-16 13:11:17 -05:00
Egor Kislitsyn	fc7246d715	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-16 17:54:24 +07:00
Alex S	4711d8151c	try this	2019-05-16 17:35:07 +07:00
Aaron Tinio	2b6119dfbf	Restrict reblogs of activities from blocked domains	2019-05-16 05:53:51 +08:00
Aaron Tinio	64495b96e9	Add test for blocked domains	2019-05-16 05:53:51 +08:00
rinpatch	62e42b03ab	Handle incoming Question objects	2019-05-15 20:10:16 +03:00
William Pitcock	f09c3afdf5	chase test failures	2019-05-15 16:23:01 +00:00
William Pitcock	c7644313e7	test: update obsolete test	2019-05-15 15:54:10 +00:00
lain	f168a1cbdc	Merge remote-tracking branch 'origin/develop' into conversations-import	2019-05-15 17:47:29 +02:00
kaniini	62516be9c4	Merge branch 'fix/public-option-not-working' into 'develop' ... Fix public option not working Closes #873 See merge request pleroma/pleroma!1143	2019-05-15 15:42:21 +00:00
lambda	4440e23547	Merge branch 'chore/extricate-http-signatures' into 'develop' ... switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155	2019-05-15 15:37:31 +00:00
lain	cbb3451023	CommonAPI: Refactor visibility, forbid public to private replies.	2019-05-15 16:30:08 +02:00
Sachin Joshi	ee22fff5ac	remove deprecated PleromaFE configuration	2019-05-15 15:29:59 +05:45
Egor Kislitsyn	a7a8f3bc2c	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-15 14:31:24 +07:00
Aaron Tinio	70c81b95d0	Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug	2019-05-15 05:09:32 +08:00
William Pitcock	071f78733a	switch to pleroma/http_signatures library	2019-05-14 20:03:13 +00:00
Maksim	52297920e7	Refactoring oauth response.	2019-05-14 14:49:45 +00:00
Egor Kislitsyn	d474995efa	Add Tests	2019-05-14 20:12:47 +07:00
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-14 18:15:56 +07:00
lambda	b14a314ce7	Merge branch 'feature/federator-behaviours' into 'develop' ... federator modularization (outgoing) See merge request pleroma/pleroma!1140	2019-05-13 18:58:04 +00:00
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	2019-05-13 18:35:45 +00:00
Sachin Joshi	7701a4c841	Make irreversible field default to false in filters	2019-05-14 00:13:15 +05:45
William Pitcock	582bd9d170	tests: fix AP test failures	2019-05-12 14:40:57 +00:00
William Pitcock	d823eb921b	tests: fix salmon tests	2019-05-12 14:35:38 +00:00
William Pitcock	2b847d4add	tests: chase federator publish_single_foo removals	2019-05-12 05:04:24 +00:00
kaniini	131f883207	Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' ... Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129	2019-05-11 16:52:26 +00:00
Sachin Joshi	f01f995816	make url uniform in admin api	2019-05-11 14:46:00 +05:45
Francis Dinh	2a54e8c1f5	Use "repeated" instead of "retweeted" for repeated statuses in Twitter API ... This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533	2019-05-09 19:58:34 -04:00
rinpatch	e4523c3010	Fix get_in_reply_to in OStatus' activity representer depending on embedded objects	2019-05-09 22:27:00 +03:00
lain	a4598b5e8b	Visibility: Make it more resilient.	2019-05-08 18:08:50 +02:00
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	2019-05-08 14:34:36 +00:00
rinpatch	3a7c14645e	- Actually use preloaded bookmarks in views ... - Preload bookmarks in bookmark timeline - Rework bookmark preload tests	2019-05-07 19:33:22 +00:00
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	2019-05-07 14:43:21 +00:00
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-07 16:51:11 +07:00
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	2019-05-06 17:51:03 +00:00
Haelwenn (lanodan) Monnier	b5ad1715b2	MastoAPI: profile update with emoji_map	2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier	2f76a40d02	formatter.ex: Add get_emoji_map/1	2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier	85b5c60694	Pleroma.Formatter: width/height to class=emoji	2019-05-03 16:25:58 +02:00
lain	81d1aa424d	Streamer: Stream out Conversations/Participations.	2019-05-03 13:39:14 +02:00
Roman Chvanikov	8af55728e4	Fix tests	2019-05-01 19:03:55 +02:00
lain	45f790becc	Merge remote-tracking branch 'origin/develop' into conversations_three	2019-05-01 18:40:41 +02:00
Maksim	c854bff8f5	Refactored Pleroma.Web.Auth.Authenticator	2019-05-01 13:28:04 +00:00
lambda	0bcdaf378e	Merge branch 'bugfix/web-notification-special-char' into 'develop' ... fix the web push notification with special char for status created See merge request pleroma/pleroma!1092	2019-05-01 10:45:32 +00:00
Alex S	f11e7037c2	test fixes	2019-05-01 16:09:53 +07:00
Sachin Joshi	cd6da3606b	Merge branch 'develop' into bugfix/web-notification-special-char	2019-05-01 00:21:30 +05:45
lain	b0951a8849	WebPush: Use Object.normalize, rewrite tests so they test reality.	2019-04-29 18:15:30 +02:00
rinpatch	0fd176b990	Merge branch 'fix/add-default-scope-mastoapi' into 'develop' ... Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100	2019-04-29 06:45:18 +00:00
kaniini	292c69481b	Merge branch 'regression/rights-only-for-admin' into 'develop' ... Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102	2019-04-28 23:05:14 +00:00
rinpatch	61ca2f7a4e	Fix rights in TwitterAPI's user entity being present only for ... Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.	2019-04-28 19:42:43 +03:00
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	2019-04-27 23:55:54 +03:00
rinpatch	c3e9fcf098	Fix bookmarks depending on embeded object and move checking if the ... status is bookmarked to SQL	2019-04-27 23:06:46 +03:00
kaniini	002ea343f8	Merge branch 'feature/bbcode' into 'develop' ... BBCode support (backend) See merge request pleroma/pleroma!1097	2019-04-27 07:44:24 +00:00
William Pitcock	ef52aa0e66	tests: fix up for changed bbcode library output and verify html is properly escaped	2019-04-26 22:45:45 +00:00
William Pitcock	501af917b5	add support for bbcode	2019-04-26 22:35:02 +00:00
lambda	4de5fef1f8	Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' ... Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059	2019-04-26 11:59:47 +00:00
kaniini	48f68fd133	Merge branch 'feature/mastoapi-new-config' into 'develop' ... Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093	2019-04-26 02:41:35 +00:00
rinpatch	dfc8425659	Move settings to Source subentity	2019-04-25 10:31:14 +03:00
Alex S	85953c0836	fixes for tests	2019-04-25 13:46:40 +07:00
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	2019-04-25 13:41:10 +07:00
William Pitcock	0fd0ffcd76	activitypub: transmogrifier: send reject follow if following does not succeed	2019-04-25 00:48:45 +00:00
rinpatch	4baea6e6d9	Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API ... This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs	2019-04-24 20:01:42 +03:00
Sachin Joshi	963d5774af	fix the status notification with special char	2019-04-24 07:06:17 +05:45
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	2019-04-23 02:47:43 +00:00
rinpatch	f60d072bbb	Add pleroma.in_reply_to_account_acct to MastoAPI status entity	2019-04-22 11:54:27 +03:00
Egor	b9cdf6d3b9	Use User.get_cached* everywhere	2019-04-22 07:20:43 +00:00
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	2019-04-22 07:19:53 +00:00
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-22 13:08:30 +07:00
kaniini	7fcbda702e	Merge branch 'rework-emoji-management' into 'develop' ... Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073	2019-04-22 02:07:19 +00:00
Roman Chvanikov	2662bea4e0	Add accounts and last_status to conversation read response	2019-04-21 20:26:13 +07:00
Ivan Tashkinov	9256d2d4b4	[#923] Refactored OAuthController#authorize definitions, added test.	2019-04-21 10:51:32 +03:00
eugenijm	375fd21055	Set correct values in the MastoAPI reblog status view	2019-04-21 05:40:22 +03:00
Ekaterina Vaartis	aef3a3ca46	Fix tests that used finmoji	2019-04-20 11:34:00 +03:00
eugenijm	fa48532387	Handle reblogs on the first follow request in MastoAPI	2019-04-20 04:39:49 +03:00
kaniini	9da8b287f8	Merge branch 'feature/database-compaction' into 'develop' ... database compaction See merge request pleroma/pleroma!473	2019-04-19 16:55:33 +00:00
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	2019-04-19 07:50:21 +00:00
lambda	218d96a26b	Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' ... OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047	2019-04-19 07:49:26 +00:00