2559 Commits (beee3e75a8a310cb75cd8b0d51729300b1e05cba)

Author	SHA1	Message	Date
Haelwenn (lanodan) Monnier	9202904da9	status_controller.ex: Posting media status without content defined	5 years ago
rinpatch	374f83d29b	Fix not being able to post empty statuses with attachments ... Attachment field was filled in after the empty status check	5 years ago
minibikini	f9380289eb	Add `remote_ip` plug	5 years ago
kaniini	92d08d4113	Merge branch 'split-masto-api/follow-requests' into 'develop' ... Extract follow requests actions from `MastodonAPIController` to `FollowRequestController` See merge request pleroma/pleroma!1730	5 years ago
kaniini	68bf99baf2	Merge branch 'split-masto-api/domain-blocks' into 'develop' ... Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController` See merge request pleroma/pleroma!1729	5 years ago
kaniini	27a3221d57	Merge branch 'split-masto-api/scheduled-statuses' into 'develop' ... Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController` See merge request pleroma/pleroma!1728	5 years ago
Egor Kislitsyn	408750b94e	Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`	5 years ago
Egor Kislitsyn	99c5a35890	Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`	5 years ago
Egor Kislitsyn	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
kaniini	dc0fdb5e84	Merge branch 'refactor/timeline-controller' into 'develop' ... Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648	5 years ago
Maksim Pechnikov	b4fc96f640	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Egor Kislitsyn	75290cbfbd	Add Pleroma.JobQueueMonitor	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	a39e065916	Merge branch 'feature/return-link-for-password-reset' into 'develop' ... Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691	5 years ago
kaniini	48a82c4609	Merge branch 'refactor/user' into 'develop' ... Simplify updating user's `info` See merge request pleroma/pleroma!1712	5 years ago
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	5 years ago
kaniini	3ff57f1fd3	Merge branch 'hex-flake-id' into 'develop' ... Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692	5 years ago
kaniini	beabc49e35	Merge branch 'feature/activities-pagination-by-offset' into 'develop' ... Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714	5 years ago
kaniini	1b9cd4c866	Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop' ... Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716	5 years ago
rinpatch	16487716af	Merge branch 'support/test' into 'develop' ... clears `robot.txt` after tests See merge request pleroma/pleroma!1715	5 years ago
Maksim	dd4263da5a	Apply suggestion to test/tasks/instance_test.exs	5 years ago
rinpatch	d87be2ec96	Don't embed the first page in inboxes/outboxes and refactor the views to ... follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.	5 years ago
Ekaterina Vaartis	118d6dcdf4	Fix nodeinfo handling	5 years ago
Ekaterina Vaartis	ba9d35a904	Add an API endpoint for listing remote packs	5 years ago
Maksim Pechnikov	1b2e4a0ae0	clears `robot.txt` after tests	5 years ago
Egor Kislitsyn	b5dfe83433	Replace `Pleroma.FlakeId` with `flake_id` hex package	5 years ago
Maksim Pechnikov	1a858134ed	Merge branch 'develop' into issue/1218	5 years ago
Maxim Filippov	60cbea5bb2	Allow activities pagination via limit/offset	5 years ago
Haelwenn (lanodan) Monnier	0dc8f3d6d2	/api/ap/uploadMedia → /api/ap/upload_media	5 years ago
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	5 years ago
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Egor Kislitsyn	a66a7a328f	Extract notification actions from `MastodonAPIController` into `NotificationController`	5 years ago
Egor Kislitsyn	79b25be4e1	Do not return tuple when unneeded	5 years ago
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	5 years ago
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	5 years ago
kaniini	760df67a7b	Merge branch 'remove-direct-messages-from-public-timeline' into 'develop' ... Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703	5 years ago
kaniini	ad9595ca55	Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' ... added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651	5 years ago
Steven Fuchs	e1d2d69c87	Clean up views	5 years ago
Maksim Pechnikov	494bb6bac6	updated tests	5 years ago
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maksim Pechnikov	38245f1336	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	5 years ago
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' ... Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	5 years ago
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	5 years ago
Haelwenn (lanodan) Monnier	815b904508	Add support for AP C2S uploadMedia ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171	5 years ago
Haelwenn (lanodan) Monnier	2ad50583f0	Document and test /api/ap/whoami	5 years ago
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Maxim Filippov	72a01f1350	Use router helper to generate reset password link	5 years ago
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	5 years ago
eugenijm	7cf1252455	Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)	5 years ago
lain	b80c41a14f	Merge branch 'outbox_pagination' into 'develop' ... Fix AP outbox pagination See merge request pleroma/pleroma!1700	5 years ago
D Anzorge	9aca2cc95d	Add test for correct AP outbox pagination	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
Maksim Pechnikov	d4ed3a35b8	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	5 years ago
Haelwenn	f95a2b2cda	Merge branch 'issue/733' into 'develop' ... [#733] added test for Ostatus See merge request pleroma/pleroma!1657	5 years ago
rinpatch	b0ec82d24a	Merge branch 'chores/bump-copyright-year' into 'develop' ... Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698	5 years ago
Haelwenn (lanodan) Monnier	447514dfa2	Bump copyright years of files changed in 2019 ... Done via the following command: git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'	5 years ago
Ekaterina Vaartis	b585134c90	Get the nodeinfo address from the well-known	5 years ago
Ekaterina Vaartis	a1325d5fd9	Change path from nodeinfo to metadata->features	5 years ago
Ekaterina Vaartis	36f2275dc9	A feature for shareable emoji packs, use it in download_from & tests	5 years ago
Ekaterina Vaartis	74fb6d8647	Move EmojiAPIController from EmojiAPI to PleromaAPI	5 years ago
Ekaterina Vaartis	6cd651a38b	Make the emoji controller api more RESTy	5 years ago
Ekaterina Vaartis	7c784128fd	Change emoji api responses to JSON	5 years ago
Ekaterina Vaartis	9eb2ee4df0	Allow importing old (emoji.txt / plain) packs from the filesystem	5 years ago
Ekaterina Vaartis	f5131540dc	Add a way to create emoji packs via an endpoint	5 years ago
Ekaterina Vaartis	8dbdd5c280	Allow uploading new emojis to packs from URLs	5 years ago
Ekaterina Vaartis	9afe7258dd	Implememt emoji pack file updating + write tests	5 years ago
Ekaterina Vaartis	9dc9689144	Add tests for pack metadata updating	5 years ago
Ekaterina Vaartis	adf31d596e	Add tests for downloading from fallback url	5 years ago
Ekaterina Vaartis	2a94eca096	Change YAML to JSON	5 years ago
Ekaterina Vaartis	2d4b8f3d20	Add an endpoint for deleting emoji packs	5 years ago
Ekaterina Vaartis	7e4c8b56ea	Add tests for emoji pack sharing	5 years ago
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	5 years ago
feld	25b4365656	Merge branch 'admin_api_invite_tokens' into 'develop' ... POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637	5 years ago
feld	220afadc55	Merge branch 'restore-tests' into 'develop' ... Restore tests for `change_password` and `delete_account` See merge request pleroma/pleroma!1658	5 years ago
Haelwenn	56286447ee	Merge branch 'fix/test-upload-cleanup' into 'develop' ... Cleanup uploads after the tests are finished See merge request pleroma/pleroma!1695	5 years ago
rinpatch	a12aeb09c4	Cleanup uploads after the tests are finished	5 years ago
rinpatch	eb87a86b5b	Preserve internal fields when reinjecting	5 years ago
rinpatch	84a40f6f26	Capture log in object refetch tests	5 years ago
rinpatch	7ef575d11e	Initial poll refresh support ... Implement refreshing the object with an interval and call the function when getting the poll.	5 years ago
Alex S	4faf2b1555	post for creating invite tokens in admin api	5 years ago
Ivan Tashkinov	b17f217bf3	[#1234] Addressed code analysis issue.	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
Maksim Pechnikov	0447c42715	Merge branch 'develop' into issue/733	5 years ago
Ivan Tashkinov	76068873db	[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.	5 years ago
rinpatch	ef2e2c5e12	Merge branch 'feature/return-total-for-reports' into 'develop' ... Admin API: Return total for reports See merge request pleroma/pleroma!1628	5 years ago
Maksim Pechnikov	7dd51652f9	Merge branch 'develop' into issue/733	5 years ago
rinpatch	95a4a19417	Merge branch 'support/tests' into 'develop' ... add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627	5 years ago
Steven Fuchs	80c5c3495b	remove remaining errors from tests	5 years ago
Roman Chvanikov	e9f69a3eb7	Move pleroma_api controllers into controllers sub-folders	5 years ago
Roman Chvanikov	7d1773bc6b	Rename SubscriptionNotificationController list and get actions to index and show	5 years ago
Roman Chvanikov	015597c2ab	Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs	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
Maxim Filippov	df15ed13d1	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
Maxim Filippov	219dca1b00	Merge branch 'develop' into feature/return-total-for-reports	5 years ago
Egor Kislitsyn	96816ceaa2	Revert "Merge branch 'revert-4fabf83a' into 'develop'" ... This reverts commit fe7fd33126, reversing changes made to 4fabf83ad0.	5 years ago
rinpatch	e8120944d8	Fix signed fetch inclusion publisher test ... Oban branch changed `actor` to `actor_id` and this test was not adjusted for that	5 years ago
kaniini	c623b4324d	Revert "Merge branch 'streamer-refactoring' into 'develop'" ... This reverts merge request !1653	5 years ago
Steven Fuchs	aab264db82	Streamer refactoring	5 years ago
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	5 years ago
Egor Kislitsyn	ca88e37a8f	Fix a race condition in tests	5 years ago
Egor Kislitsyn	43f17c2e67	Restore tests for `change_password` and `delete_account`	5 years ago
Maksim Pechnikov	d75bc728e7	Merge branch 'develop' into issue/733	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
Maksim Pechnikov	8751809e1e	Merge branch 'develop' into support/tests	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
rinpatch	62bbba80f3	Merge branch 'fix/truncate-remote-user-fields' into 'develop' ... Truncate remote user fields See merge request pleroma/pleroma!1619	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
Egor Kislitsyn	b870ae08fd	Fix `Activity.all_by_actor_and_id/2` test	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
lain	a9b78f55e3	Merge branch 'capture-test-errors' into 'develop' ... Capture test error messages where appropriate See merge request pleroma/pleroma!1665	5 years ago
rinpatch	ba70a8cae6	Merge branch 'develop' into feature/delivery-tracking	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
lain	53a3ad6043	Merge branch 'cleanup-activity' into 'develop' ... Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623	5 years ago
Haelwenn	0d9609894f	Merge branch 'feature/change-email' into 'develop' ... Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580	5 years ago
rinpatch	f884987ace	Merge branch 'admin-config-description' into 'develop' ... Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611	5 years ago
Maksim Pechnikov	bc3e8c033b	fix formatting	5 years ago
Maksim Pechnikov	ec5aaf5bd7	fix tests	5 years ago
rinpatch	fb96facc32	Remove unused functions and fix credo issues	5 years ago
rinpatch	ce23529d91	Use delivery info when federating deletes	5 years ago
Egor Kislitsyn	25d8216804	Add email change endpoint	5 years ago
Egor Kislitsyn	5bfbad13ad	Add more tests for Pleroma.Activity	5 years ago
Egor Kislitsyn	39dc9b470c	Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils	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
Maksim Pechnikov	2b40e57a72	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	5 years ago
Maksim Pechnikov	936951826e	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	5 years ago
rinpatch	769fb778d4	Track object/create activity fetches	5 years ago
Mark Felder	102eb4455c	Fix associated test as well	5 years ago
Maksim Pechnikov	4f548cb2b7	added test for Ostatus	5 years ago
Maksim Pechnikov	007e0c1ce1	added tests	5 years ago
Alex S	a1f2dfb10a	expanding regex sigils to use modifiers	5 years ago
Maksim Pechnikov	fcf604fa43	added tests	5 years ago
Egor Kislitsyn	3d12e05f43	Fix `Activity.all_by_ids_with_object/1` test	5 years ago
Maksim Pechnikov	a31af93e1d	added tests /activity_pub/transmogrifier.ex	5 years ago
Egor Kislitsyn	b40b10b53d	Add an endpoint to get multiple statuses by IDs	5 years ago
Maxim Filippov	d1abf7a358	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
minibikini	11e12b5761	Add Pleroma.Plugs.Cache	5 years ago
Egor Kislitsyn	e0f84d0043	Fix `ActivityPubController.read_inbox/2`	5 years ago
Ivan Tashkinov	b63faf9819	[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).	5 years ago
Maksim Pechnikov	39f99dc6cd	Merge branch 'develop' into support/tests	5 years ago
Maksim Pechnikov	ab2f21e470	tests for mastodon_api_controller.ex	5 years ago
Maksim Pechnikov	eb74c3d5c7	Merge branch 'develop' into issue/1218	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
Maxim Filippov	af746fa4a8	Return total for reports	5 years ago
Maxim Filippov	3542ca6702	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
Sadposter	2975da284b	truncate remote user bio/display name	5 years ago
Maksim Pechnikov	8cbad5500c	add tests for activity_pub/utils.ex	5 years ago
rinpatch	3face45467	Mastodon API: Add `pleroma.thread_muted` to Status entity ... Needed for pleroma-fe!941	5 years ago
rinpatch	c2b6c1b089	Extend `/api/pleroma/notifications/read` to mark multiple notifications ... as read and make it respond with Mastoapi entities	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	eb17cc17a1	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # CHANGELOG.md	5 years ago
Maxim Filippov	b15cfd80ef	Return "total" optionally	5 years ago
Maxim Filippov	a4c5f71e93	Return total from pagination + tests	5 years ago
Ivan Tashkinov	b49085c156	[#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.	5 years ago
Sadposter	e73685834c	add mandatory fields for user update	5 years ago
Sadposter	05c935c396	mix format	5 years ago
Sadposter	35ef470d00	truncate fields for remote users instead	5 years ago
Maxim Filippov	6c2fd1b78b	Fix tests	5 years ago
Ivan Tashkinov	a90ea8ba15	[#1149] Addressed code review comments (code style, jobs pruning etc.).	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	9cabc02864	Remove a useless import	5 years ago
rinpatch	dbfcba85ec	Add a changelog entry for twitterapi removal and fix credo issues	5 years ago
rinpatch	64410497d2	Remove TwitterAPI representers	5 years ago
rinpatch	985122cc03	Remove Activity, User and Notification views from TwitterAPI	5 years ago
rinpatch	90c2dae9a4	Remove most of Pleroma.Web.TwitterAPI.TwitterAPI	5 years ago
Maksim Pechnikov	6ef0103ca0	added Emoji struct	5 years ago
Maxim Filippov	f182f0f6bd	Add ability to search moderation logs	5 years ago
Maksim Pechnikov	d8098d142a	added Emoji.Formatter	5 years ago
Maksim Pechnikov	d7808b5db4	added code\path fields without html tags in ets	5 years ago
Maksim Pechnikov	cef2e980b1	division emoji.ex on loader.ex and emoji.ex	5 years ago
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	5 years ago
lain	66519f2100	Merge branch 'list-controller' into 'develop' ... Extract list actions from `MastodonAPIController` into `ListController` See merge request pleroma/pleroma!1600	5 years ago
Maxim Filippov	5e4fde1d3d	Filter logs by date	5 years ago
Maksim Pechnikov	00abe099cd	added tests for ActivityPub.like\unlike	5 years ago