4853 Commits (83cd7f2b5f269adf53b66b851fcea187cb914e28)

Author	SHA1	Message	Date
Ivan Tashkinov	1298a2ea2c	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock	4 years ago
lain	bf95dfb240	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	4 years ago
lain	10b0e55acf	Merge branch 'whole-word-filter-hotfix' into 'develop' ... Update filter_view.ex to return whole_word actual value See merge request pleroma/pleroma!2851	4 years ago
Mary Kate	f785dba09b	changelog for filter whole_word fix	4 years ago
Mary Kate	d6ab9f2132	update test for whole_word in filter	4 years ago
Alex Gleason	cc196e2cd5	Merge remote-tracking branch 'upstream/develop' into restrict-domain	4 years ago
Alex Gleason	ad9c925efb	Speed up instance timeline query	4 years ago
Roman Chvanikov	4672b61106	Merge branch 'develop' into command-available-check	4 years ago
lain	7755f49e28	Merge branch 'migrate-legacy-tags' into 'develop' ... Migrate legacy tags set by AdminFE to match TagPolicy, #2010 See merge request pleroma/pleroma!2836	4 years ago
lain	9c96fc052a	CommonValidations: Extract modification right checker	4 years ago
lain	2173945f90	MailerTest: Give it some time.	4 years ago
Roman Chvanikov	8c57a299b4	Handle non-list keys in Config.fetch/1	4 years ago
Roman Chvanikov	2299bfe4c1	Merge branch 'develop' into refactor/config-get	4 years ago
Roman Chvanikov	97b5701449	Update clear_config macro	4 years ago
Mark Felder	0f9aecbca4	Remove fallback to local database when LDAP is unavailable. ... In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.	4 years ago
Mark Felder	f7146583e5	Remove LDAP mail attribute as a requirement for registering an account	4 years ago
Roman Chvanikov	6f60ac9f41	Refactor config	4 years ago
lain	19c108170e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation	4 years ago
lain	474aba984f	Merge branch 'unique-app-id' into 'develop' ... Add unique index for apps.client_id, fixes #2022 Closes #2022 See merge request pleroma/pleroma!2844	4 years ago
rinpatch	b1b6a7dfa8	Merge branch 'deactivated-user-posts' into 'develop' ... Deactivated user posts Closes #2011 See merge request pleroma/pleroma!2845	4 years ago
Alex Gleason	184742af5e	Unique apps.client_id for new installations, fixes #2022	4 years ago
Egor Kislitsyn	91fbb5b21f	Fix ActivityExpirationPolicy	4 years ago
lain	878c7f3f30	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation	4 years ago
lain	532d6f94ae	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	4 years ago
lain	36aa34a1a8	MastodonAPITest: Do the needful	4 years ago
Haelwenn (lanodan) Monnier	0f088d8ce3	question_validator: Allow content to be an empty-string (blank)	4 years ago
lain	1a00713744	CommonValidations: Treat deactivated users as not present.	4 years ago
lain	0cfadcf2ca	TransmogrifierTest: Add test for deactivated users	4 years ago
lain	e92c040ad3	CommonAPITest: Add test that deactivated users can't post.	4 years ago
lain	953f71bcfa	App Test: Make more resilient	4 years ago
Roman Chvanikov	56e9bf3393	Unify Config.get behaviour for atom/list key param	4 years ago
lain	28584bb224	Merge branch 'email-blacklist' into 'develop' ... Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837	4 years ago
Alex Gleason	4f57e85ab9	Email blacklist: Update phrasing again	4 years ago
Alex Gleason	058daf498f	Email blacklist: Update response phrasing	4 years ago
lain	e3953923ac	Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop' ... fixes 1957 Add option to send user chatmessage instead of dm Closes #1957 See merge request pleroma/pleroma!2782	4 years ago
Ilja	cbf8bfc694	Improved WelcomeChatMessageTest ... * Checks if message is the same using ==/2 instead of =~/2	4 years ago
lain	56b5b9aa27	Merge branch 'follower-mrf-again' into 'develop' ... Follower mrf again See merge request pleroma/pleroma!2833	4 years ago
lain	de3bdc63ad	AccountControllerTest: Add test for message returned.	4 years ago
lain	5876d5123c	Merge branch 'object-age-fix' into 'develop' ... MRF Object Age Policy: Don't break on messages without cc/to See merge request pleroma/pleroma!2840	4 years ago
lain	10c792110e	MRF Object Age Policy: Don't break on messages without cc/to	4 years ago
Alex Gleason	f9301044ed	Add ReportNote test	4 years ago
Alex Gleason	77b48cb4ce	Factory: Add report_activity_factory	4 years ago
Alex Gleason	dc88b6f091	Add email blacklist, fixes #1404	4 years ago
Alex Gleason	c2c3dd4613	Migrate legacy tags set by AdminFE to match TagPolicy, #2010	4 years ago
Ilja	f671d7e68c	Add welcome chatmessages ... * I added the option in config/config.exs * created a new module lib/pleroma/user/welcome_chat_message.ex * Added it to the registration flow * added to the cheatsheet * added to the config/description.ex * added to the Changelog.md	4 years ago
lain	4b18a07392	Revert "Merge branch 'revert-1ac0969c' into 'develop'" ... This reverts merge request !2825	4 years ago
lain	010d77ec85	Revert "Merge branch 'mrf-silence-2' into 'develop'" ... This reverts merge request !2820	4 years ago
lain	1ac0969c72	Merge branch 'mrf-silence-2' into 'develop' ... MRF silencing alternative solution See merge request pleroma/pleroma!2820	4 years ago
Haelwenn (lanodan) Monnier	ac2598307d	Merge remote-tracking branch 'pleroma/develop' into features/poll-validation	4 years ago
Ivan Tashkinov	27b0a8b155	[#1985] Prevented force login on registration if account approval and/or email confirmation needed. ... Refactored login code in OAuthController, reused in AccountController. Added tests.	4 years ago
lain	1dd162a5f7	SimplePolicy: Fix problem with DM leaks.	4 years ago
Haelwenn	d1cf1108ac	Merge branch 'render-preview-cards-in-chats' into 'develop' ... Render preview cards in chats See merge request pleroma/pleroma!2816	4 years ago
Haelwenn	87fe31fb5c	Merge branch '1993-confirm-users-on-registration' into 'develop' ... AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809	4 years ago
lain	781b270863	ChatMessageReferenceView: Display preview cards.	4 years ago
lain	873ff5ce14	Merge branch 'hide-reactions' into 'develop' ... Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804	4 years ago
lain	e2e66e50d3	SimplePolicyTest: Add test for leaking DMs.	4 years ago
lain	d39b72c8fa	Merge branch 'feature/captcha-expose-timeout' into 'develop' ... Expose seconds_valid in Pleroma Captcha API endpoint Closes #1954 See merge request pleroma/pleroma!2812	4 years ago
Maksim Pechnikov	cff7bb5cd4	Merge branch 'develop' into issue/1933-update-dependency	4 years ago
Mark Felder	33f0427809	Expose seconds_valid in Pleroma Captcha API endpoint	4 years ago
Alex Gleason	702f0fb822	Merge remote-tracking branch 'upstream/develop' into mrf-silence	4 years ago
Alex Gleason	93638935d7	SimpleMRF: :silence --> :followers_only	4 years ago
Alex Gleason	00d090004e	:show_reactions, refactor the other test	4 years ago
Alex Gleason	026a51cb27	:show_reactions, add CHANGELOG.md, refactor test	4 years ago
Alex Gleason	d8a01c9432	Merge remote-tracking branch 'upstream/develop' into hide-reactions	4 years ago
lain	dc36d6e9d2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin	4 years ago
lain	a6d3bb5f30	Merge branch 'issue/1023' into 'develop' ... [#1023] added generated `pleroma.env` See merge request pleroma/pleroma!2763	4 years ago
lain	d9bf2c58df	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration	4 years ago
Haelwenn	269b61a240	Merge branch '1996-dont-break-on-chatmessages' into 'develop' ... EnsureRePrepended: Don't break on chat messages. Closes #1996 See merge request pleroma/pleroma!2808	4 years ago
lain	de5c7e20a3	Merge branch 'bugfix/remote-user-atom' into 'develop' ... feed/user_controller: Return 404 when the user is remote Closes #1911 See merge request pleroma/pleroma!2811	4 years ago
Haelwenn (lanodan) Monnier	2e27847573	feed/user_controller: Return 404 when the user is remote	4 years ago
lain	79f9ddd8b7	Merge branch 'by-approval' into 'develop' ... Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757	4 years ago
lain	6a25f72a75	FrontendStatic: Work correctly for other frontend types.	4 years ago
lain	c25c21dd22	AccountController: Don't explicitly ask to keep users unconfirmed. ... Confirmation is set in User.register_changeset based on the config settings.	4 years ago
lain	edf8b6abfe	EnsureRePrepended: Don't break on chat messages.	4 years ago
Maksim Pechnikov	15b8446cdb	updated dev & test packages	4 years ago
Alex Gleason	3c90f7f715	SimpleMRF: Let instances be silenced	4 years ago
Alex Gleason	3b7c454418	Let favourites and emoji reactions optionally be hidden	4 years ago
lain	ad5c42628a	FrontendStatic: Add plug to serve frontends based on configuration.	4 years ago
Alex Gleason	f688c8df82	Fix User.registration_reason HTML sanitizing issues	4 years ago
Alex Gleason	f43518eb74	Lint, fix test	4 years ago
Alex Gleason	6f44a0ee84	Add configurable registration_reason limit	4 years ago
Alex Gleason	6747bf2e16	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
lain	9e6f4694dd	Pipeline: Unify embedded_object / object_data, move to validator.	4 years ago
lain	762c9ea564	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation	4 years ago
lain	2a3abfd326	Merge branch 'issue/1934-welcome-email' into 'develop' ... [#1934] welcome email See merge request pleroma/pleroma!2786	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Maksim Pechnikov	643664d583	added migrate old settings to new	4 years ago
Lain Soykaf	1dd6de03ee	CommonAPI Tests: Check that undoing objects federates them as embeds.	4 years ago
Lain Soykaf	3d13fb05f8	Side Effects: On undoing, put information about the undone object.	4 years ago
Lain Soykaf	91f3cf9bc6	Pipeline: Add embedded object federation.	4 years ago
feld	51627a10e5	Merge branch 'unblock-domain-via-query' into 'develop' ... Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783	4 years ago
Mark Felder	4bfad0b483	Support blocking via query parameters as well and document the change.	4 years ago
Haelwenn	6100b90209	Merge branch '1976-status-view-fixes' into 'develop' ... StatusView: Handle badly formatted emoji reactions. Closes #1976 See merge request pleroma/pleroma!2788	4 years ago
Maksim Pechnikov	67ab9a7928	Merge branch 'develop' into issue/1934-welcome-email	4 years ago
lain	76aa49a0c5	Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop' ... [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting Closes #1973 See merge request pleroma/pleroma!2791	4 years ago
Ivan Tashkinov	9ea51a6de5	[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.	4 years ago
lain	b2ba70eec4	Merge branch 'bugfix/mrf-reject-logging' into 'develop' ... Fix #783: Make MRF reject log as info level instead of error Closes #783 See merge request pleroma/pleroma!2758	4 years ago
lain	250e0369c7	Merge branch 'issue/1878' into 'develop' ... [#1878] fix reset confirmation email in admin section See merge request pleroma/pleroma!2751	4 years ago
lain	a81581472f	Merge branch 'linkify' into 'develop' ... Fix Linkify See merge request pleroma/pleroma!2792	4 years ago
Maksim Pechnikov	7991ddad58	added warning to use old keys	4 years ago
Alex Gleason	b6488a4db4	Update linkify migration tests to use config from ConfigDB	4 years ago
Alex Gleason	c7a0016f9f	Migration to fix malformed Pleroma.Formatter config	4 years ago
Alex Gleason	b87a1f8eaf	Refactor require_migration/1 into a test helper function	4 years ago
Alex Gleason	67389b77af	Add AutolinkerToLinkify migration test	4 years ago
Ivan Tashkinov	6f5f7af607	[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. ... Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.	4 years ago
lain	1c9752cff4	Merge branch 'fix/pleroma-api-emoji-packs' into 'develop' ... Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777	4 years ago
Lain Soykaf	0cb9e1da74	StatusView: Handle badly formatted emoji reactions.	4 years ago
Maksim Pechnikov	5879d36854	fix sender for welcome email	4 years ago
Maksim Pechnikov	8d6f7aec21	Merge branch 'develop' into issue/1023	4 years ago
Maksim Pechnikov	7cafb96c02	added tests	4 years ago
Mark Felder	109836306c	Test that Emoji Packs can be listed when instance is not public	4 years ago
lain	5b1eeb06d8	Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" ... This reverts merge request !2784	4 years ago
lain	696c13ce54	Revert "Merge branch 'linkify' into 'develop'" ... This reverts merge request !2677	4 years ago
lain	2b5d9eb105	Merge branch 'linkify' into 'develop' ... AutoLinker --> Linkify, update to latest version See merge request pleroma/pleroma!2677	4 years ago
lain	fa2421dd7e	Merge branch 'gopher-fix' into 'develop' ... Gopher: using atom keys in search params See merge request pleroma/pleroma!2775	4 years ago
Ivan Tashkinov	b8021016eb	[#2497] Resolved merge conflicts.	4 years ago
Egor Kislitsyn	bdb3375933	Allow unblocking a domain via query params	4 years ago
Alexander Strizhakov	6afc6717d6	copy tmp file if test depends on it	4 years ago
Maksim Pechnikov	3edaecae96	added welcome email	4 years ago
Ivan Tashkinov	bdf57b8ef4	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs	4 years ago
Alex Gleason	afa8b469ed	Allow restricting public timeline by instance	4 years ago
Alex Gleason	ae74c52e22	Test angry face in formatter D:< #1968	4 years ago
Alex Gleason	48f8b26c92	OpenAPI: Add :id to follower/following endpoints, fixes #1958	4 years ago
Alex Gleason	15f8921b11	Test that unapproved users can never log in regardless of admin settings	4 years ago
Alex Gleason	5756843736	Fully delete users with status :approval_pending	4 years ago
Alex Gleason	880301985b	Formatter: Test link with local mention	4 years ago
Maksim Pechnikov	6c59fe259d	Merge branch 'develop' into issue/1023	4 years ago
Alex Gleason	9ce95fa68f	Use `approval_required` in /api/v1/instance	4 years ago
Mark Felder	b2d398b1d0	Merge branch 'develop' into refactor/gun-pool-registry	4 years ago
Mark Felder	9d30bacace	Merge branch 'develop' into refactor/notification_settings	4 years ago
rinpatch	0fe36b311c	Merge branch 'features/mrf-reasons' into 'develop' ... Add rejection reason to our MRFs See merge request pleroma/pleroma!2759	4 years ago
Haelwenn (lanodan) Monnier	d29b8997f4	MastoAPI: fix & test giving MRF reject reasons	4 years ago
Maksim Pechnikov	3f8bff8d6b	Merge branch 'develop' into issue/sign-authority	4 years ago
href	e499275076	Don't test tls_options in adapter helper test.	4 years ago
rinpatch	bf3492ceb3	Connection Pool: add tests	4 years ago
rinpatch	721e89e88b	Remove tests for old pool	4 years ago
Haelwenn (lanodan) Monnier	e4beff90f5	Create Question: Add context field to create	4 years ago
Haelwenn (lanodan) Monnier	922ca23298	Question: Add tests on HTML tags in options ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1362	4 years ago
Haelwenn (lanodan) Monnier	c19bdc811e	Fix attachments in polls	4 years ago
lain	040524c09f	Merge branch 'tests/apc2s-update_outbox' into 'develop' ... AP C2S tests: Make sure you can't use another user's AP id See merge request pleroma/pleroma!2767	4 years ago
Haelwenn (lanodan) Monnier	39870d99b8	transmogrifier tests: Move & enhance in specialised modules	4 years ago
Haelwenn (lanodan) Monnier	82895a4012	SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert	4 years ago
Haelwenn (lanodan) Monnier	173f69c854	question_validator: fix for mastodon poll expiration ... Mastodon activities do not have a "closed" field, this could be seen on https://pouet.it/users/lanodan_tmp/statuses/104345126997708380 which runs Mastodon 3.1.4 (SDF runs 3.1.2)	4 years ago
Haelwenn (lanodan) Monnier	10bd08ef07	transmogrifier_test: test date, anyOf and oneOf completely	4 years ago
Haelwenn (lanodan) Monnier	7bcd7a9595	QuestionValidator: Create	4 years ago
Haelwenn (lanodan) Monnier	6d8427cca2	AP C2S tests: Make sure you can't use another user's AP id	4 years ago
Alex Gleason	0d004a9d04	Email admins when a new unapproved account is up for review	4 years ago
Alex Gleason	48983e9421	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Alex Gleason	fab44f6970	Test User with confirmation_pending: true, approval_pending: true	4 years ago
Alex Gleason	20d24741af	AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint	4 years ago
Alex Gleason	33f1b29b2c	AdminAPI: Filter users by `need_approval`	4 years ago
Alex Gleason	b750129da1	AdminAPI: Return `approval_pending` with users	4 years ago
Maksim Pechnikov	1dd767b8c7	Include port in host for signatures	4 years ago
Mark Felder	777a7edc6b	Lint and fix test to match new log message	4 years ago
Alex Gleason	a1570ba6ad	AdminAPI: Return `registration_reason` with users	4 years ago
feld	3f65f2ea79	Merge branch 'feature/1922-media-proxy-whitelist' into 'develop' ... Support for hosts with scheme in MediaProxy whitelist setting Closes #1922 See merge request pleroma/pleroma!2754	4 years ago
feld	2909dc873b	Merge branch '1940-admin-token-oauthless-auth' into 'develop' ... [#1940] Reinstated OAuth-less `admin_token` authentication Closes #1940 See merge request pleroma/pleroma!2760	4 years ago
Ivan Tashkinov	124b4709dc	[#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.	4 years ago
feld	246f49d685	Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop' ... Transmogrifier: filtering weirdness in address fields Closes #1916 See merge request pleroma/pleroma!2762	4 years ago
Haelwenn (lanodan) Monnier	858d9fc7e8	MRF Policies: Return a {:reject, reason} instead of {:reject, nil}	4 years ago
Ivan Tashkinov	9b225db7d8	[#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.	4 years ago
Ivan Tashkinov	cf3f8cb72a	[#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).	4 years ago
Maksim Pechnikov	3062f86613	added generated `pleroma.env`	4 years ago
Alex Gleason	5ddf0415c4	Accept `reason` in POST /api/v1/accounts and store in DB	4 years ago
=	b221b640a2	Transmogrifier: filtering weirdness in address fields	4 years ago
Mark Felder	80c21100db	Merge branch 'develop' into refactor/notification_settings	4 years ago
feld	5d215fd81f	Merge branch 'config-behaviours-runtime' into 'develop' ... Config/Docs: Expand behaviour suggestions modules at runtime Closes #1941 See merge request pleroma/pleroma!2755	4 years ago
feld	8f9ee694ed	Merge branch 'features/profile-fields-emojo' into 'develop' ... user: Add support for custom emojis in profile fields See merge request pleroma/pleroma!2741	4 years ago
Haelwenn (lanodan) Monnier	2aac92e9e0	Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post	4 years ago
Haelwenn	f918b6f86d	Merge branch '1937-renaming' into 'develop' ... ActivityPub: Don't rename a clashing nickname with the same ap id. Closes #1937 See merge request pleroma/pleroma!2748	4 years ago
Alex Gleason	bcfd38c8f3	Make a user unapproved when registering with `account_approval_required` on	4 years ago
Alex Gleason	e4e5577818	Prevent unapproved users from logging in	4 years ago
Alex Gleason	51ab8d0128	Add `account_approval_required` instance setting	4 years ago
Alex Gleason	a62f17da17	Add `approval_pending` field to User	4 years ago
href	4347d2de5e	Config/Docs: Expand behaviour suggestions at runtime	4 years ago
Alexander Strizhakov	b376442325	MediaProxy whitelist setting now supports hosts with scheme ... added deprecation warning about using bare domains	4 years ago
Roman Chvanikov	aedbbec88a	Add Pleroma.Utils.command_available?/1 and use where appropriate	4 years ago
Maksim Pechnikov	62fc8eab0d	fix reset confirmation email in admin section	4 years ago
Mark Felder	6167593881	Support Exiftool for stripping EXIF data ... We really only want to strip location data anyway, and mogrify strips color profiles.	4 years ago
Mark Felder	3c0c1fd2ef	Merge branch 'develop' into issue/1790-updated-oban	4 years ago
feld	ce9514000d	Merge branch 'proxy-range-and-chunk' into 'develop' ... ReverseProxy: Streaming and disable encoding if Range Closes #1860 and #1823 See merge request pleroma/pleroma!2749	4 years ago
href	a1dace088c	ReverseProxy: Streaming and disable encoding if Range ... Fixes #1823 Fixes #1860	4 years ago
lain	93e494ec21	ActivityPub: Don't rename a clashing nickname with the same ap id.	4 years ago
lain	b39eb6ecc5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
Haelwenn	31a0ed5d01	Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop' ... Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated` Closes admin-fe#107 and #1788 See merge request pleroma/pleroma!2554	4 years ago
lain	4d809144d8	Merge branch 'cluster-test-ci' into 'develop' ... RE-enable cluster tests on CI See merge request pleroma/pleroma!2743	4 years ago
Haelwenn	4ac6e6283f	Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix' ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn	5ea6387572	Merge branch 'user-search-nickname-rank-boost' into 'develop' ... Improved search results for localized nickname match See merge request pleroma/pleroma!2733	4 years ago
stwf	08211eff22	Re-enable the federated tests, increase timeout	4 years ago
Haelwenn (lanodan) Monnier	cc7153cd82	user: Add support for custom emojis in profile fields	4 years ago
Mark Felder	2b979cc90c	Add AdminFE reports URL to report emails	4 years ago
lain	8ca1f3e8c6	Merge branch '1723-token-fixes' into 'develop' ... AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694	4 years ago
lain	f4469dc741	Merge branch 'features/favicons' into 'develop' ... Add support for remote favicons See merge request pleroma/pleroma!2261	4 years ago
Haelwenn	bdc7b60610	Merge branch '1925-muting-reblogs' into 'develop' ... AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732	4 years ago
eugenijm	c2be0da79f	Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`	4 years ago
Haelwenn	68036f5a3b	Merge branch 'follow-pipeline' into 'develop' ... Handle `Follow` activities with the pipeline See merge request pleroma/pleroma!2734	4 years ago
Maksim Pechnikov	31259cabcc	fix test	4 years ago
Ivan Tashkinov	123352ffa1	Removed unused trigram index on `users`. Fixed `users_fts_index` usage.	4 years ago
lain	00e54f8fe7	ActivityPub: Remove `follow` and fix issues.	4 years ago
lain	9dda8b5427	CommonAPI: Switch to pipeline for following.	4 years ago
lain	172f4aff8e	Transmogrifier: Move following to the pipeline.	4 years ago
lain	7d0e2b3fdd	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline	4 years ago
lain	cdc153db31	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880	4 years ago
lain	6335b32aa8	Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' ... [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731	4 years ago
Ivan Tashkinov	704a383055	Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.	4 years ago
lain	c0385cf47a	AccountController: Fix muting / unmuting reblogs.	4 years ago
Maksim Pechnikov	e341f81785	fixed delete `Like` activity in remove user	4 years ago
Haelwenn (lanodan) Monnier	312fc55f14	Add [:instances_favicons, :enabled] setting, defaults to false	4 years ago
Haelwenn (lanodan) Monnier	6a679d80c9	Move get_favicon to Pleroma.Instances, use /	4 years ago
Haelwenn (lanodan) Monnier	f6d09fafee	Add support for remote favicons	4 years ago
Haelwenn	a8447c3803	Merge branch '1918-avatar-background-header-reset-2' into 'develop' ... Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729	4 years ago
lain	8939ff39e4	Merge branch 'remove-twitter-api' into 'develop' ... Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327	4 years ago
Ivan Tashkinov	3e08e77151	[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.	4 years ago
lain	c8dd973af5	AccountController: Remove unused `update_?` routes. ... These were not documented and are also not used anymore.	4 years ago
lain	59cf78e412	AccountController: Allow removal / reset of user images.	4 years ago
lain	9ad305209a	Merge branch 'bugfix/peertube-videos' into 'develop' ... Fix getting videos from peertube See merge request pleroma/pleroma!2728	4 years ago
Haelwenn	fa0fa4552f	Merge branch 'feature/1392-support-irreversible-filters' into 'develop' ... Updates for Feature/1392 support irreversible filters Closes #1392 See merge request pleroma/pleroma!2186	4 years ago
Haelwenn (lanodan) Monnier	fbb9743a70	Fix getting videos from peertube	4 years ago
Haelwenn	d81acb5f62	Merge branch 'description-limits' into 'develop' ... Add limits to image descriptions See merge request pleroma/pleroma!2724	4 years ago
lain	a6a12b241f	FollowValidator: Add basic validation.	4 years ago
lain	4e3b3998ad	BlockValidation test: Rename.	4 years ago
lain	eb87430803	ObjectValidator tests: Extract block validation tests.	4 years ago
lain	410c1fab31	ObjectValidator tests: Extract update validation tests.	4 years ago
lain	b2e1ea9226	ObjectValidation tests: Extract announce validation tests.	4 years ago
lain	bbaf108aee	ObjectValidator tests: Extract undo validation tests.	4 years ago
lain	168256dce9	ObjectValidation tests: Extract like validation tests.	4 years ago
lain	e6a13d97d0	ObjectValidation tests: Extract delete validation tests.	4 years ago
lain	60d4c6c91d	ObjectValidator tests: Extract emoji react testing	4 years ago
lain	e0baaa967c	ObjectValidator tests: Extract chat tests	4 years ago
lain	0aa4c20d78	ObjectValidator Test: Extract attachments.	4 years ago
lain	28feba8af4	Preloaders: Remove status_net preloader	4 years ago
lain	1963e143c5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api	4 years ago
lain	ed4f9f6a29	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json	4 years ago
lain	208baf157a	ActivityPub: Add new 'capabilities' to user.	4 years ago
lain	74b88c0a8b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
rinpatch	69f0b286f7	Merge branch '1915-dont-filter-announce-notifications' into 'develop' ... Streamer: Don't filter out announce notifications. Closes #1915 See merge request pleroma/pleroma!2719	4 years ago
lain	cc8b4e48d9	InstanceView: Add chat limit, description limit	4 years ago
lain	af7720237b	Upload: Restrict description length	4 years ago
Alexander Strizhakov	818f3c2393	test fixes	4 years ago
Alexander Strizhakov	028a241b7d	tests fixes	4 years ago
Alexander Strizhakov	20c27bef40	renaming back and reject nil on create	4 years ago
Alexander Strizhakov	52ff75413a	Apply suggestion to test/notification_test.exs	4 years ago
Alexander Strizhakov	086a260c04	Apply suggestion to test/notification_test.exs	4 years ago
Sergey Suprunenko	8277b29790	Restrict thread statuses that contain user's irreversible filters	4 years ago
Sergey Suprunenko	5af1bf443d	Skip notifications for statuses that contain an irreversible filtered word	4 years ago
Sergey Suprunenko	4a8c26654e	Restrict statuses that contain user's irreversible filters	4 years ago
Alexander Strizhakov	480dfafa83	don't save tesla settings into db	4 years ago
lain	cf56655614	Streamer: Don't filter out announce notifications.	4 years ago
Mark Felder	4695bdd81b	Merge branch 'develop' into issue/1790-updated-oban	4 years ago
lain	c2a052a346	Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' ... MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690	4 years ago
lain	9a27ef47f1	Merge branch '1912-leading-trailing-space-search' into 'develop' ... SearchController: Trim query. Closes #1912 See merge request pleroma/pleroma!2717	4 years ago
lain	d3efb50262	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	4 years ago
lain	19fbfbb767	Merge branch '1892-exclude-bots-from-search-results' into 'develop' ... [#1892] Exclusion of service actors from user search results Closes #1892 See merge request pleroma/pleroma!2708	4 years ago
lain	945e75c8e8	SearchController: Trim query.	4 years ago
lain	e3b5559780	AccountController: Make setting accepts_chat_messages possible.	4 years ago
lain	4a7b89e372	ChatMessageValidator: Additional validation.	4 years ago
lain	5c0bf4c472	ActivityPub: Ingest information about chat acceptance.	4 years ago
lain	26a7cc3f00	UserView: Add acceptsChatMessages field	4 years ago
lain	db76c26469	AccountViewTest: Fix test.	4 years ago
lain	3250228be9	AccountView: Add 'accepts_chat_messages' to view.	4 years ago
lain	98bfdba108	User: On registration, set `accepts_chat_messages` to true.	4 years ago
Ivan Tashkinov	90764670dc	[#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.	4 years ago
Mark Felder	8121e46f25	Merge branch 'develop' into activation-meta	4 years ago
Ivan Tashkinov	61180ab6f4	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex	4 years ago
rinpatch	4c044f6225	Merge branch 'fetcher-fixes' into 'develop' ... Don't fail fetching when the user in a replied-to message can't be fetched. See merge request pleroma/pleroma!2711	4 years ago
lain	311b7c19d0	Streamer: Align announce streaming with polling.	4 years ago
lain	61fe94d698	SideEffects: Refactor.	4 years ago
rinpatch	fa7a0be225	Merge branch '1716-handle-nickname-clashes' into 'develop' ... ActivityPub: Handle clashing nicknames for the same ap id Closes #1716 See merge request pleroma/pleroma!2712	4 years ago
lain	fedfe8f7d6	ActivityPub: Handle clashing nicknames for the same ap id ... If we get a new user (identified by ap_id) that would have the same nickname as an existing user, give the existing user a nickname that is prepended with the user id, as this will never clash. This can happen when a user switches server software and that soft- ware generates ap ids in a different way.	4 years ago
lain	ce92e6e5ce	Fetcher: Work when we can't get the OP.	4 years ago
lain	8ae572d5ae	Fixtures: Pretty print.	4 years ago
lain	691742e62d	Revert "Merge branch 'avatar-removing' into 'develop'" ... This reverts merge request !2701	4 years ago
Mark Felder	5a8e0208b1	Add fields limits to instance metadata, add tests	4 years ago
Ivan Tashkinov	3d2989278c	[#1892] Excluded bot actors (applications, services) from search results.	4 years ago
Mark Felder	d69af7f742	Rename user.settings column ... This is used exclusively by MastoFE/GlitchFE now	4 years ago
lain	0176b7bca2	Merge branch 'preload-fixups-2' into preloadfixups	4 years ago
lain	2382a2a151	Preload: Load the correct instance panel	4 years ago
rinpatch	7bb3618939	Merge branch 'fix-notification-filtering' into 'develop' ... Notifications: Never return `nil` in the notification list. See merge request pleroma/pleroma!2705	4 years ago
lain	c01f4ca07f	Notification: Remove TODO.	4 years ago
lain	90083a754d	Notifications: Never return `nil` in the notification list.	4 years ago
Egor Kislitsyn	3aa04b81c4	Test default "content-type" for CastAndValidate	4 years ago
lain	07ff2d62f4	Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop' ... excluding attachment links from RichMedia See merge request pleroma/pleroma!2702	4 years ago
Alexander Strizhakov	6512ef6879	excluding attachment links from RichMedia	4 years ago
Egor Kislitsyn	4a306720e8	Merge branch 'develop' into remove-twitter-api	4 years ago
lain	651f269568	Merge branch 'avatar-removing' into 'develop' ... UpdateCredentialsTest: Add test for removing profile images. See merge request pleroma/pleroma!2701	4 years ago
lain	e64d08439e	UpdateCredentialsTest: Add test for removing profile images.	4 years ago
lain	8630a6c7f5	Preloaders: Use strings as keys.	4 years ago
lain	a19f8778af	User preloader: Put user info at correct key	4 years ago
lain	577da132da	Merge branch '1031-parent-visible' into 'develop' ... Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679	4 years ago
Mark Felder	ce85db41a3	Lint	4 years ago
Haelwenn (lanodan) Monnier	244655e884	MastoAPI: Show source field when deleting	4 years ago
Mark Felder	69848d5c97	Rename notification "privacy_option" setting	4 years ago
Haelwenn	bf1c5e255a	Merge branch 'block-handling' into 'develop' ... Handle blocks with the pipeline See merge request pleroma/pleroma!2685	4 years ago
Haelwenn	09478c9cf7	Merge branch '1258-anti-link-spam-exemption' into 'develop' ... AntiSpamLinkPolicy: Exempt local users. Closes #1258 See merge request pleroma/pleroma!2686	4 years ago
Mark Felder	fd5e797379	Simplify notification filtering settings further	4 years ago
Mark Felder	b950fb01db	Merge branch 'develop' into refactor/notification_settings	4 years ago
lain	a5bbfa21a1	StaticFE: Prioritize json in requests.	4 years ago
lain	f378e93bf4	AccountController: Return scope in proper format.	4 years ago
lain	a2002ebb63	Preloading: Fix nodeinfo url.	4 years ago
lain	4a7a34ae8c	Preloading: Return correct data for statusnet stuff.	4 years ago
lain	7ed2296416	Nodeinfo: Add chat information back in.	4 years ago
lain	15a8b70318	User: Don't unfollow on block when the relevant setting is set.	4 years ago
lain	c3383d4fab	BlockValidator: Restore old behavior for incoming blocks.	4 years ago
Haelwenn (lanodan) Monnier	27c33f216a	activity_draft: Add source field	4 years ago
feld	8288419686	Merge branch 'preload-data' into 'develop' ... Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381	4 years ago
Mark Felder	433c01b370	Merge branch 'develop' into refactor/notification_settings	4 years ago
lain	04abee782b	AntiSpamLinkPolicy: Exempt local users.	4 years ago
lain	1cd1977c0f	Merge branch 'issue/1872-ex_aws' into 'develop' ... [#1872] use Pleroma.HTTP for ExAws.S3 See merge request pleroma/pleroma!2683	4 years ago
lain	84f9ca1956	Blocking: Don't federate if the options is set.	4 years ago
lain	44bb7cfccd	ActivityPub: Remove `block`.	4 years ago
lain	e38293c8f1	Transmogrifier: Switch to pipeline for Blocks.	4 years ago
lain	89e5b2046b	ObjectValidator: Basic `Block` support.	4 years ago
lain	d137f934df	Transmogrifier Test: Extract block handling.	4 years ago
lain	0e26ef2ab9	Merge branch 'fix/following-request-from-deactivated' into 'develop' ... Filter outstanding follower requests from deactivated accounts Closes #1771 See merge request pleroma/pleroma!2682	4 years ago
Maksim Pechnikov	439a1a0218	added wrapper Pleroma.HTTP for ExAws.S3	4 years ago
Mark Felder	67ab580553	Filter outstanding follower requests from deactivated accounts	4 years ago
lain	35f6770436	StatusView: Add pleroma.parent_visible	4 years ago
lain	88ccade1cb	Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' ... admin api status count per instance See merge request pleroma/pleroma!2500	4 years ago
lain	65f3eb333b	Apply suggestion to test/http/tzdata_test.exs	4 years ago
Maksim Pechnikov	721fc7c554	added wrapper Pleroma.HTTP for Tzdata.HTTPClient	4 years ago
lain	98af7b59e4	Merge branch 'update-validator' into 'develop' ... Update validator See merge request pleroma/pleroma!2668	4 years ago
Roman Chvanikov	1471b70ef1	Merge develop	4 years ago
Haelwenn	c7d69e9256	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' ... Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320	4 years ago
Maksim Pechnikov	a8d967762e	migrate to oban 2.0-rc1	4 years ago
lain	b7f297f0bd	Merge branch 'issue/1798' into 'develop' ... [#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655	4 years ago
lain	adc199c6a8	ActivityPubControllerTest: Capture error log	4 years ago
lain	d93e01137b	ActivityPubControllerTest: Testing changes.	4 years ago
lain	2737809bbf	An act of desperation.	4 years ago
lain	2c603f2009	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator	4 years ago
Maksim Pechnikov	84aa9c78dd	fix tests	4 years ago
Maksim Pechnikov	2715c40e1d	added tests	4 years ago
lain	46f7e51b27	Merge branch 'add-muted-to-notifications' into 'develop' ... Add `pleroma.is_muted` property to notifications Closes #1812 See merge request pleroma/pleroma!2670	4 years ago
Egor Kislitsyn	7e6f43c0d7	Add `is_muted` to notifications	4 years ago
Maksim Pechnikov	b0a40fc2e4	added verify RUM settings before start app	4 years ago
lain	59bdef0c33	Merge branch 'feature/1739-account-endpoints' into 'develop' ... account visibility in masto api Closes #1739 See merge request pleroma/pleroma!2488	4 years ago
lain	8b5bdd164e	Merge branch 'fix/1825-admin-api-error-codes' into 'develop' ... Proper error codes for error in adminFE Closes #1825 See merge request pleroma/pleroma!2665	4 years ago
lain	e785cd5cae	ActivityPub: Remove `update` and switch to pipeline.	4 years ago
rinpatch	c75ba63bef	Merge branch '1865-media-only' into 'develop' ... Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned" Closes #1865 See merge request pleroma/pleroma!2650	4 years ago
lain	1e7ca24430	Update Handling Test: Fix for re-used update ids.	4 years ago
lain	31a4d42ce0	SideEffects: Handle user updating.	4 years ago
rinpatch	282f492cd5	Merge branch '1883-mrf-chat' into 'develop' ... HellthreadPolicy: Restrict to Notes and Articles. Closes #1883 See merge request pleroma/pleroma!2666	4 years ago
lain	93ae1c8bd3	Merge branch 'feature/1854-emoji-pagination' into 'develop' ... Emoji and packs pagination Closes #1854 See merge request pleroma/pleroma!2658	4 years ago
lain	35e9282ffd	HellthreadPolicy: Restrict to Notes and Articles.	4 years ago
Alexander Strizhakov	c5863438ba	proper error codes for error in adminFE	4 years ago
lain	31761340fe	Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop' ... Support 'bot' field in account update_credentials Closes #1600 and #1467 See merge request pleroma/pleroma!2662	4 years ago
lain	7d542450b1	Merge branch 'develop' into '1865-media-only' ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	1a704e1f1e	fix for packs pagination	4 years ago
Haelwenn (lanodan) Monnier	3d4cfc9c5f	Stop filling conversation field on incoming objects (legacy, unused) ... conversation field is still set for outgoing federation for compatibility.	4 years ago
feld	f928267773	Merge branch 'issue/1855' into 'develop' ... #1855 MediaProxy cache invalidation via Admin API See merge request pleroma/pleroma!2648	4 years ago
Sergey Suprunenko	b63646169d	Add support for bot field in update_credentials	4 years ago
lain	75670a99e4	UpdateValidator: Only allow updates from the user themselves.	4 years ago
lain	abdb540d45	ObjectValidators: Add basic UpdateValidator.	4 years ago
Ivan Tashkinov	5237a2df9f	[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.	4 years ago
lain	7e488cd4a7	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator	4 years ago
Alexander Strizhakov	3e3f9253e6	adding overall count for packs and files	4 years ago
Alexander Strizhakov	4975ed86bc	emoji pagination for pack show action	4 years ago
Alexander Strizhakov	3becdafd33	emoji packs pagination	4 years ago
Maksim Pechnikov	e4c61f1741	added test	4 years ago
Maksim Pechnikov	4044f24e2e	fix test	4 years ago
Mark Felder	2731ea1334	Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url	4 years ago
Mark Felder	3462d4b995	Merge branch 'develop' into issue/1855	4 years ago
lain	d772361e62	Merge branch 'fix/1787-mogrify-args' into 'develop' ... Moving custom ecto types in context folders See merge request pleroma/pleroma!2652	4 years ago
Maksim	96493da7bd	Apply suggestion to test/web/media_proxy/invalidation_test.exs	4 years ago
Maksim	078d687e6e	Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs	4 years ago
Maksim	2991aae4c4	Apply suggestion to test/web/media_proxy/invalidations/script_test.exs	4 years ago
Maksim	11b22a4229	Apply suggestion to test/web/media_proxy/invalidations/http_test.exs	4 years ago
Maksim	6d33a3a51b	Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs	4 years ago
Maksim	793a53f1ec	Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs	4 years ago
Maksim	1b45bc7b2a	Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs	4 years ago
rinpatch	4ec2fb967e	Merge branch 'features/users-raw_bio' into 'develop' ... User: Add raw_bio, storing unformatted bio See merge request pleroma/pleroma!2326	4 years ago
Haelwenn	b536e57124	Merge branch '1866-last-status-stuff' into 'develop' ... Resolve "/api/v1/conversations returns the wrong `last_status`" Closes #1866 See merge request pleroma/pleroma!2647	4 years ago
Alexander Strizhakov	b66e6eb521	fixes for tests	4 years ago
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	4 years ago
Alexander Strizhakov	3c2cee33ad	moving custom ecto types in context folders	4 years ago
href	f124f68205	Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME	4 years ago
Alexander Strizhakov	e1603ac8fe	fix attemps to merge map	4 years ago
Alexander Strizhakov	23decaab81	fix for updated hackney ... warning: :hackney_connect.partial_chain/1 is undefined or private	4 years ago
Alexander Strizhakov	9a4fde9766	Mogrify args as custom tuples	4 years ago
lain	015f9258a9	Transmogrifier: Extract user update handling tests.	4 years ago
lain	1eb6cedaad	ActivityPub: When restricting to media posts, only show 'Creates'.	4 years ago
stwf	faba1a6e33	fix tests	4 years ago
Maksim Pechnikov	579763126f	Merge branch 'develop' into issue/1855	4 years ago
Egor Kislitsyn	bd63089a63	Fix tests	4 years ago
Egor Kislitsyn	58e4e3db8b	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	4 years ago
Maksim Pechnikov	62b8c31b7a	added tests	4 years ago
lain	b7df7436c8	Conversations: Return last dm for conversation, not last message.	4 years ago
Maksim Pechnikov	2e8a236cef	fix invalidates media url's	4 years ago
eugenijm	b15cfc3d36	Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page	4 years ago
rinpatch	271ea5068f	Merge branch '1851-favorites-pagination' into 'develop' ... StatusController: Correctly paginate favorites. Closes #1851 See merge request pleroma/pleroma!2636	4 years ago
href	cb7be6eef2	Remove use of atoms in MRF.UserAllowListPolicy	4 years ago
Egor Kislitsyn	520367d6fd	Fix atom leak in Rich Media Parser	4 years ago
Mark Felder	26f710b9e3	Merge branch 'develop' into preload-data	4 years ago
Haelwenn	4115701f71	Merge branch 'recipients-experiments' into 'develop' ... ActivityPub: Don't show announces of your own objects in timeline. See merge request pleroma/pleroma!2637	4 years ago
Egor Kislitsyn	697cf92024	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	4 years ago
lain	e557265a03	Merge branch 'global-status-expiration' into 'develop' ... Global status expiration See merge request pleroma/pleroma!2208	4 years ago
Mark Felder	34593d6aa5	Merge branch 'develop' into features/mix-task-reset-mfa	4 years ago
Maksim Pechnikov	f9dcf15ecb	added admin api for MediaProxy cache invalidation	4 years ago
Ivan Tashkinov	2188097066	[#1794] Fixes URI query handling for hashtags extraction in search.	4 years ago
Haelwenn (lanodan) Monnier	40970f6bb9	New mix task: pleroma.user reset_mfa <nickname>	4 years ago
Egor Kislitsyn	1f35acce54	Merge OGP parser with TwitterCard	4 years ago
Ivan Tashkinov	b28cec4271	[#1794] Fixes URI query handling for hashtags extraction in search.	4 years ago
lain	5d87405b51	ActivityPubTest: Update test for atomized parameters.	4 years ago
Thibaut Girka	570123ae21	Add test	4 years ago
rinpatch	7aa6c82937	Merge branch 'remake-remodel-dms' into 'develop' ... Chats / ChatMessages See merge request pleroma/pleroma!2429	4 years ago
lain	600e2ea073	ActivityPubTest: Make test easier to understand.	4 years ago
lain	9e411372d0	ActivityPub: Don't show announces of your own objects in timeline.	4 years ago
Egor Kislitsyn	3dd1de61a7	Add `url` field to AdminAPI.AccountView	4 years ago
lain	063e6b9841	StatusController: Correctly paginate favorites. ... Favorites were paginating wrongly, because the pagination headers where using the id of the id of the `Create` activity, while the ordering was by the id of the `Like` activity. This isn't easy to notice in most cases, as they usually have a similar order because people tend to favorite posts as they come in. This commit adds a way to give different pagination ids to the pagination helper, so we can paginate correctly in cases like this.	4 years ago
lain	064c4f86f3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	e1bc37d118	MigrationHelper: Move notification backfilling to own module.	4 years ago
Roman Chvanikov	604a83ae3e	merge develop	4 years ago
Egor Kislitsyn	d44843e677	Restrict ActivityExpirationPolicy to Notes only	4 years ago
Egor Kislitsyn	da22119c2f	Merge branch 'develop' into global-status-expiration	4 years ago
lain	d192492658	Merge branch 'openapi/admin/relay' into 'develop' ... Add OpenAPI spec for AdminAPI.RelayController See merge request pleroma/pleroma!2579	4 years ago
lain	c450b248cc	Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop' ... Delete outgoing pending follow requests on user deletion See merge request pleroma/pleroma!2631	4 years ago
lain	3b5282bef2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	89b85f6529	ChatController: Remove nonsensical pagination.	4 years ago
lain	7d66dd180a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	fe2a5d0614	ChatController: Make last_read_id mandatory.	4 years ago
Sergey Suprunenko	8d9e586887	Delete pending follow requests on user deletion	4 years ago
lain	801e668a97	ChatController: Add `last_read_id` option to mark_as_read.	4 years ago
lain	2cdaac4330	SideEffects: Move streaming of chats to after the transaction.	4 years ago
lain	f4cf4ae16e	ChatController: Use new oauth scope *:chats.	4 years ago
Haelwenn (lanodan) Monnier	e1b07402ab	User: Add raw_bio, storing unformatted bio ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1643	4 years ago
lain	9189b489ee	Migrations: Move Notification migration code to helper	4 years ago
lain	ca0e6e702b	ChatMessageReference -> Chat.MessageReference	4 years ago
lain	4e8c0eecd5	WebPush: Don't break on contentless chat messages.	4 years ago
Egor Kislitsyn	b02df1803e	Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys	4 years ago
lain	a8ca030d85	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn	d74985af23	Merge branch 'features/apc2s-pagination' into 'develop' ... Fix AP C2S pagination Closes #866 and #751 See merge request pleroma/pleroma!2491	4 years ago
lain	115d08a754	Pipeline: Add a side effects step after the transaction finishes ... This is to run things like streaming notifications out, which will sometimes need data that is created by the transaction, but is streamed out asynchronously.	4 years ago
lain	0efa8aa0b9	Transmogrifier: For follows, create notifications last. ... As the notification type changes depending on the follow state, the notification should not be created and streamed out before the state settles. For this reason, the notification creation has been delayed until it's clear if the user has been followed or not. This is a bit hacky but it will be properly rewritten using the pipeline soon.	4 years ago
lain	cc8a7dc205	SideEffects / ChatView: Add an unread cache. ... This is to prevent wrong values in the stream.	4 years ago
lain	aa2ac76510	Notification: Don't break on figuring out the type of old EmojiReactions	4 years ago
lain	d44da91bbf	SubscriptionOperation: Let chat mentions through.	4 years ago
Egor Kislitsyn	317e2b8d61	Use atoms as keys in `ActivityPub.fetch_*` functions options	4 years ago
lain	74edd4f391	Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	56dfa0e0fb	Transmogrifier: Update notification after accepting.	4 years ago
lain	9a53f619e0	Apply suggestion to test/chat_message_reference_test.exs	4 years ago
lain	41503b1673	Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs	4 years ago
lain	00748e9650	ChatMessageReferences: Change seen -> unread	4 years ago
stwf	a42d135cce	test fix	4 years ago
minibikini	b57e4ad1ab	Merge branch 'develop' into 'openapi/admin/relay' ... # Conflicts: # lib/pleroma/web/admin_api/controllers/admin_api_controller.ex	4 years ago
lain	b952f3f379	WebPush: Push out chat message notications.	4 years ago
lain	5d7dda883e	SideEffectsTest: More tests.	4 years ago
Egor Kislitsyn	a8132690bd	Fix credo	4 years ago
Egor Kislitsyn	70f054b083	Merge branch 'develop' into openapi/admin/relay	4 years ago
Egor Kislitsyn	b4d5bdd6f1	Merge branch 'develop' into openapi/admin/config	4 years ago
stwf	3b8180d7d1	add status_net/config	4 years ago
stwf	dbcc1b105e	encode data properly	4 years ago
stwf	29ae5bb771	preload data into index.html	4 years ago
lain	b3407344d3	ChatController: Add function to mark single message as read.	4 years ago
lain	c020fd4352	ChatMessageReferenceView: Return read status as `unread`.	4 years ago
Egor Kislitsyn	c16315d055	Add OpenAPI spec for AdminAPI.ReportController	4 years ago
Egor Kislitsyn	9d572f2f66	Move report actions to AdminAPI.ReportController	4 years ago
lain	fb4ae9c720	Streamer, SideEffects: Stream out ChatMessageReferences ... Saves us a few calles to fetch things from the DB that we already have.	4 years ago
lain	7f5c5b11a5	Chats: Remove `unread` from the db, calculate from unseen messages.	4 years ago
lain	2591745fc2	ChatMessageReferences: Move tests	4 years ago
lain	f3ccd50a33	ChatMessageReferences: Adjust views	4 years ago
lain	aa22fce8f4	ChatMessageReference: Introduce and switch in chat controller.	4 years ago
feld	6c1c2cddec	Merge branch 'fix/1794-hashtag-search-results' into 'develop' ... [#1794] Improvements to hashtags extraction from search query Closes #1794 See merge request pleroma/pleroma!2611	4 years ago
Egor Kislitsyn	68cb152a08	Merge branch 'develop' into openapi/admin/relay	4 years ago
lain	879304dcd9	Merge branch 'replies-domain-block' into 'develop' ... Replies domain block Closes #1650 See merge request pleroma/pleroma!2622	4 years ago
lain	5da38c15cd	Merge branch 'openapi/admin/oauth-apps' into 'develop' ... Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582	4 years ago
lain	022d975a39	Merge branch 'openapi/admin/invites' into 'develop' ... Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585	4 years ago
lain	38dce485c4	Notification: Add function to backfill notification types	4 years ago
lain	904295d53b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	37542a9dfa	Activity: Remove notifications-related functions.	4 years ago
lain	127ccc4e1c	NotificationController: Don't return chat_mentions by default.	4 years ago
lain	cd2abcc0e3	Merge branch 'fix/invisible-repeats' into 'develop' ... Do not include activities of invisible users unless explicitly requested Closes #1833 See merge request pleroma/pleroma!2620	4 years ago
lain	805ab86933	Notifications: Make notifications save their type.	4 years ago
rinpatch	165a4b2a69	Do not include activities of invisible users unless explicitly requested ... Closes #1833	4 years ago
lain	d111eae798	Merge branch 'feature/status-by-id-account-view' into 'develop' ... another view for account in admin-fe status_show Closes #1783 See merge request pleroma/pleroma!2543	4 years ago
lain	8e1db6a835	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Alexander Strizhakov	19f468c5bc	replies filtering for blocked domains	4 years ago
rinpatch	6fb900a496	Merge branch 'user-updates' into 'develop' ... AccountController: Federate user account changes. Closes pleroma-support#33 and #1801 See merge request pleroma/pleroma!2617	4 years ago
Alexander Strizhakov	7e6ec778d9	exclude replies on blocked domains	4 years ago
lain	af9090238e	CommonAPI: Newlines -> br for chat messages.	4 years ago
Egor Kislitsyn	a7627bdc7a	Merge remote-tracking branch 'origin/develop' into global-status-expiration	4 years ago
lain	8ff3425828	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	d4d4b92f75	TimelineController: Only return `Create` in public timelines.	4 years ago
lain	9460983032	AccountController: Federate user account changes. ... Hotfixy commit, will be moved to the pipeline.	4 years ago
Haelwenn	e96765df6b	Merge branch 'chore/bump-hackney' into 'develop' ... mix.lock: update hackney to 1.16.0 Closes #1612 See merge request pleroma/pleroma!2614	4 years ago
Roman Chvanikov	b973d0b2f0	Fix config setting to not affect other tests	4 years ago
rinpatch	0cb7b0ea84	hackney adapter helper: support tlsv1.3 and remove custom opts ... - partitial_chain is no longer exported, but it seems to be the default anyway. - The bug that caused sni to not be sent automatically seems to be fixed - https://github.com/benoitc/hackney/issues/612	4 years ago
lain	6ff079ca9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	8bdf18d7c1	CommonAPI: Linkify chat messages.	4 years ago
lain	2c9465cc51	SafeText: Let through basic html.	4 years ago
lain	b004c427a0	Merge branch 'conversation-pagination' into 'develop' ... Conversation pagination See merge request pleroma/pleroma!2601	4 years ago
Steven Fuchs	6d4b80822b	Conversation pagination	4 years ago
Ivan Tashkinov	24f40b8a26	[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.	4 years ago
Ivan Tashkinov	78c80a261a	Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results	4 years ago
Roman Chvanikov	0a83af330b	fix unused var warning	4 years ago
Ivan Tashkinov	c181e555db	[#1794] Improvements to hashtags extraction from search query.	4 years ago
kPherox	9ca978494f	Add test for stream boosts of mastodon user	4 years ago
Haelwenn (lanodan) Monnier	a43b435c0a	AP C2S: allow limit & order on outbox & read_inbox	4 years ago
Haelwenn (lanodan) Monnier	b3b367b894	Bugfix: Reuse Controller.Helper pagination for APC2S	4 years ago
lain	863c02b25d	SideEffects: Stream out chat messages.	4 years ago
lain	c86a88edec	Streamer: Add a chat message stream.	4 years ago
lain	9848978109	Merge branch 'fix-relay-repeat-notification' into 'develop' ... Fix relay repeat notification See merge request pleroma/pleroma!2590	4 years ago
lain	af6d01ec93	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	396bc69aee	Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' ... Fix profile emojis bypassing mediaproxy and harden CSP Closes #1810 See merge request pleroma/pleroma!2596	4 years ago
Egor Kislitsyn	06f20e9181	Add OpenApi spec to AdminAPI.ConfigController	4 years ago
Egor Kislitsyn	d1ee3527ef	Move config actions to AdminAPI.ConfigController	4 years ago
Mark Felder	4c82f657c5	Formatting	4 years ago
lain	1d30608e20	Merge branch 'fix/1557-gets-local-pack' into 'develop' ... get-packs for local generated pack Closes #1557 See merge request pleroma/pleroma!2604	4 years ago
lain	f6ddf0cc50	Merge branch 'feature/1792-update-actor-type' into 'develop' ... Validate actor type See merge request pleroma/pleroma!2593	4 years ago
Alexander Strizhakov	ae05792d2a	get-packs for local generated pack	4 years ago
Mark Felder	9eea800026	Refactor notification settings	4 years ago
rinpatch	455a402c8a	HTTP Security plug: rewrite &csp_string/0 ... - Directives are now separated with ";" instead of " ;", according to https://www.w3.org/TR/CSP2/#policy-parsing the space is optional - Use an IO list, which at the end gets converted to a binary as opposed to ++ing a bunch of arrays with binaries together and joining them to a string. I doubt it gives any significant real world advantage, but the code is cleaner and now I can sleep at night. - The static part of csp is pre-joined to a single binary at compile time. Same reasoning as the last point.	4 years ago
rinpatch	8f6d428880	AccountView: Use mediaproxy URLs for emojis ... Also use atom keys in emoji maps instead of binaries Closes #1810	4 years ago
rinpatch	78c46fb7ba	MediaProxy test: use config macros instead of directly putting values ... They were not properly cleaned later and caused trouble for another tests	4 years ago
kPherox	48fd9be65a	Exclude post actor from to of relay announce	4 years ago
rinpatch	d35be02e70	Merge branch 'refactor-add-mention-step-one' into 'develop' ... Fix ObjectView calling into strange functions Closes #1807 See merge request pleroma/pleroma!2580	4 years ago
rinpatch	91f73a7592	Merge branch 'notification-fixes' into 'develop' ... Notification performance fixes See merge request pleroma/pleroma!2595	4 years ago
lain	b8e029b5ea	Notification: Actually preload objects.	4 years ago
Alexander Strizhakov	3249141588	validate actor type	4 years ago
rinpatch	3601c0015c	Merge branch '1808-pleroma-sucks' into 'develop' ... Resolve "Don't fail message ingestions when we can't update a user" Closes #1808 See merge request pleroma/pleroma!2576	4 years ago
Egor Kislitsyn	fca48154a2	Add AdminAPI.InviteView	4 years ago
Egor Kislitsyn	2a4f965191	Add OpenAPI spec for AdminAPI.InviteTokenController	4 years ago
Egor Kislitsyn	95ebfb9190	Move invite actions to AdminAPI.InviteTokenController	4 years ago
lain	644195e31e	Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop' ... [#1501] Made user feed contain public and unlisted activities Closes #1501 See merge request pleroma/pleroma!2584	4 years ago
Alexander Strizhakov	8f08384d80	another view for account in admin-fe status_show	4 years ago
Ivan Tashkinov	d7a57004ef	[#1501] Made user feed contain public and unlisted activities.	4 years ago
Egor Kislitsyn	e32b7ae044	Skip failing `:crypt` test on mac	4 years ago
Egor Kislitsyn	0ba1f2631a	Add OpenAPI spec for AdminAPI.OAuthAppContoller	4 years ago
lain	dbd07d29a3	Streamer: Don't crash on streaming chat notifications	4 years ago
lain	2c25087d20	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	6bd7070b00	Transmogrifier: Use a simpler way to get mentions.	4 years ago
Egor Kislitsyn	cbcd592300	Add OpenAPI spec for AdminAPI.RelayController	4 years ago
lain	f20dff451e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks	4 years ago
lain	5d5db7e5b7	StealEmojiPolicyTest: Clean up.	4 years ago
lain	2dff376041	StealEmojiPolicyTest: Fix flaky test.	4 years ago
lain	ee35bb5ac2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	aeb0875025	StealEmojiPolicyTest: Fix flaky test.	4 years ago
lain	ec470c4c77	Merge branch 'openapi/admin/status' into 'develop' ... Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566	4 years ago
lain	3bec0d2e50	Factory: Set users to be ap_enabled by default.	4 years ago
lain	0c970a9d44	UserTest: Add test for user refreshing.	4 years ago
lain	d0c26956da	User: Don't error out if we want to refresh a user but can't	4 years ago
rinpatch	7bc2ec0aa2	Merge branch 'mastodon-migration-compat' into 'develop' ... Add compatibility routes for converted mastodon instances Closes #1797 See merge request pleroma/pleroma!2572	4 years ago
lain	ddbbefeb2e	Merge branch 'feature/configure-filename-truncate' into 'develop' ... Configurable filename truncation threshold Closes #1799 See merge request pleroma/pleroma!2573	4 years ago
Roman Chvanikov	cc82229ba7	Add filename_display_max_length config	4 years ago
lain	91c8467582	OStatusController: Add Mastodon activity compat route.	4 years ago
lain	355aa3bdc7	ActivityPubController: Add Mastodon activity compat route.	4 years ago
lain	8a4bd9e5d1	OStatusController: Add Mastodon compatibility route for objects.	4 years ago
rinpatch	1fa7aa9fc5	Merge branch 'emoji-react-better-errors' into 'develop' ... EmojiReactionController: Return more appropriate error. See merge request pleroma/pleroma!2569	4 years ago
Egor Kislitsyn	ba106aa9c8	Fix notifications mark as read API	4 years ago
lain	ca755f9a73	ActivityPubController: Add Mastodon compatibility route.	4 years ago
lain	bcb549531f	EmojiReactionController: Return more appropriate error.	4 years ago
Haelwenn	7b02bfca51	Merge branch 'announce-validator' into 'develop' ... Announce validator See merge request pleroma/pleroma!2567	4 years ago
Haelwenn	a57e7f3503	Merge branch '1113-op-mentioning' into 'develop' ... CommonAPI: Change public->private implicit addressing. Closes #1113 See merge request pleroma/pleroma!2563	4 years ago
Ivan Tashkinov	3a1e810aaa	[#2497] Customized `exexec` launch to support root operation (currently required by Gitlab CI).	4 years ago
lain	e0d1a942a6	Merge branch 'issue/1707' into 'develop' ... [#1707] fixed `mix pleroma.instance gen` See merge request pleroma/pleroma!2565	4 years ago
lain	ab1154e13f	Merge branch 'admin-logo-upload' into 'develop' ... Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image See merge request pleroma/pleroma!2388	4 years ago
lain	578ed3a37f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	a42a0716ec	Merge branch 'features/emoji_stealer' into 'develop' ... MRF.StealEmojiPolicy: New Policy See merge request pleroma/pleroma!2385	4 years ago
lain	f166316f50	Merge branch 'openapi/pleroma-api/pleroma' into 'develop' ... Add OpenAPI spec for PleromaAPI.PleromaAPIController See merge request pleroma/pleroma!2564	4 years ago
lain	283fb1e05b	Merge branch 'issue/749' into 'develop' ... [#749] unsubscribes of friends when user deactivated See merge request pleroma/pleroma!2513	4 years ago
Egor Kislitsyn	45d2c4157f	Add OpenAPI spec for AdminAPI.StatusController	4 years ago
lain	c4a5cead51	UploadTest: Fix test.	4 years ago
lain	cc0d462e91	Attachments: Have the mediaType on the root, too.	4 years ago
lain	814c3e5171	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	bf1b221f94	Credo fixes for the credo god.	4 years ago
lain	cdc6ba8d7b	AnnounceValidator: Check for announcability	4 years ago
lain	c76267afb9	Credo fixes.	4 years ago
lain	23e248694d	Announcements: Fix all tests.	4 years ago
lain	d9d425708e	SideEffects: Builed out Announce effects.	4 years ago
Egor Kislitsyn	9de9760aa6	Move status actions to AdminAPI.StatusController	4 years ago
Maksim Pechnikov	9bc5e18ade	rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`	4 years ago
eugenijm	b7fc61e17b	Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE	4 years ago
Maksim Pechnikov	c96f425cb0	fixed `mix pleroma.instance gen`	4 years ago
Ivan Tashkinov	6fd4f58ead	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	4 years ago
lain	39031f4860	Pipeline: Don't federate if federation is disabled.	4 years ago
lain	e42bc5f557	Announcements: Handle through common pipeline.	4 years ago
lain	265746b21f	Merge branch 'openapi/pleroma-api/emojis' into 'develop' ... Add OpenAPI spec for EmojiPackController See merge request pleroma/pleroma!2549	4 years ago
lain	c7cdc553ff	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator	4 years ago
lain	423ea497bb	Merge branch 'feature/1734-user-deletion' into 'develop' ... User deletion Closes #1734 See merge request pleroma/pleroma!2493	4 years ago
lain	eb5f428565	CommonAPI: Change public->private implicit addressing. ... This will not add the OP to the `to` field anymore when going from public to private.	4 years ago
Egor Kislitsyn	5ba6e1c322	Move notification actions to PleromaAPI.NotificationController	4 years ago
Egor Kislitsyn	f3fc8b22b1	Move conversation actions to PleromaAPI.ConversationController	4 years ago
Egor Kislitsyn	9a5de0f454	Move reaction actions to EmojiReactionController	4 years ago
Egor Kislitsyn	490a3a34b6	Add OpenAPI spec for PleromaAPI.PleromaAPIController	4 years ago
Haelwenn	94ba5a7802	Merge branch 'exposed-background-image' into 'develop' ... InstanceView: Expose background image link. See merge request pleroma/pleroma!2545	4 years ago
lain	6dd1575c64	Merge branch 'issue/1509' into 'develop' ... [#1509] purge media from cache after delete See merge request pleroma/pleroma!2539	4 years ago
Haelwenn	5a149e5788	Merge branch 'openapi/pleroma-api/scrobble' into 'develop' ... Add OpenAPI spec for PleromaAPI.ScrobbleController See merge request pleroma/pleroma!2559	4 years ago
lain	2328eff09c	UserTest: Hide warning in tests.	4 years ago
Egor Kislitsyn	6609714d66	Move Scrobble views to ScrobbleView	4 years ago
Egor Kislitsyn	524d04d921	Add OpenAPI spec for PleromaAPI.ScrobbleController	4 years ago
Haelwenn	58ccd2bbfd	Merge branch 'openapi/pleroma-api/mascot' into 'develop' ... Add OpenAPI spec for MascotController See merge request pleroma/pleroma!2553	4 years ago
Maksim Pechnikov	41f8f17260	fix api/v1/accounts/update_credentials	4 years ago
Maksim Pechnikov	5f0a3ac74d	added tests	4 years ago
lain	d19c716770	AttachmentValidator: Handle empty mediatypes	4 years ago
Egor Kislitsyn	fe5d423b43	Add OpenAPI spec for MascotController	4 years ago
Egor Kislitsyn	45c3a72404	[OpenAPI] Use BooleanLike in all request bodies	4 years ago
lain	be4db41d71	ChatMessageValidator: Allow one message in an array, too.	4 years ago
lain	0d417e005d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Egor Kislitsyn	aef31c69df	Rename EmojiAPIController to EmojiPackController	4 years ago
Egor Kislitsyn	8bde8dfec2	Cleanup Pleroma.Emoji.Pack	4 years ago
Egor Kislitsyn	6e4de715b3	Add OpenAPI spec for PleromaAPI.EmojiAPIController	4 years ago
lain	0d5bce018d	AnnounceValidator: Validate for existing announce	4 years ago
lain	17a8342c1e	ObjectValidators: Add basic Announce validator.	4 years ago
lain	63ab2743ce	TransmogrifierTest: Fix tests.	4 years ago
lain	7d381b16b7	Transmogrifier Test: Extract Announce handling.	4 years ago
Alexander Strizhakov	215daabdb4	copyright update	4 years ago
lain	188b32145e	InstanceView: Expose background image link. ... This will make it easier for more clients to support this feature.	4 years ago
lain	96f7b1b140	Merge branch 'show-media-endpoint-fixes' into 'develop' ... MediaController OAuth scope assignments fix See merge request pleroma/pleroma!2541	4 years ago
Roman Chvanikov	01bd6a1e54	Merge branch 'develop' into feature/admin-api-status-count-per-instance	4 years ago
Alexander Strizhakov	0321a3e078	test naming fix	4 years ago
Alexander Strizhakov	1671864d88	return :visible instead of boolean	4 years ago
Alexander Strizhakov	b1aa402229	removing 410 status	4 years ago
Alexander Strizhakov	e7bc2f980c	account visibility	4 years ago
Ivan Tashkinov	9b76565264	MediaController: enforced owner-only access in :show action. ... Improved error response on denied access (now 403). Adjusted tests.	4 years ago
lain	baf051a59e	SideEffects: Don't update unread count for actor in chatmessages.	4 years ago
lain	9c17109765	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	8bfd9710ae	Pleroma Authenticator: Also update passwords here.	4 years ago
lain	bfdd90f6d7	AuthenticationPlug: Also update crypt passwords.	4 years ago
lain	baef35bcc8	Authentication Plug: Update bcrypt password on login.	4 years ago
lain	4b28d812cf	Merge branch 'restricted-relations-embedding' into 'develop' ... Restricted support for embedded relationships See merge request pleroma/pleroma!2456	4 years ago
Ivan Tashkinov	af9dfdce6b	MediaController OAuth scope assignments fix. ... Typo fix (`def get_media` instead of `def show`).	4 years ago
lain	d96f8f17e8	Merge branch 'features/mastoapi_v2_media' into 'develop' ... MastodonAPI: /api/v2/media endpoints See merge request pleroma/pleroma!2439	4 years ago
lain	d15aa9d950	Merge branch 'develop' into 'remove-twitter-api' ... # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex	4 years ago
Ivan Tashkinov	978ccf8f97	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	4 years ago
lain	2dcb26a6e5	CommonAPI: Unblock a user even if we don't have an activity.	4 years ago
Alexander Strizhakov	3c29f4f957	returning partial chain	4 years ago
lain	f012c3a202	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Ivan Tashkinov	e4b12494d7	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock	4 years ago
rinpatch	e455ca3f3e	Merge branch 'feature/database-configuration-whitelist' into 'develop' ... Database configuration whitelist See merge request pleroma/pleroma!2522	4 years ago
lain	4157c459b8	Merge branch 'bcrypt-auth' into 'develop' ... Handle bcrypt passwords for Mastodon migration See merge request pleroma/pleroma!2527	4 years ago
Egor Kislitsyn	bb03dfdb03	Do not require `description` in `update` action	4 years ago
Egor Kislitsyn	0f885b4b86	Fix OpenAPI spec	4 years ago
Stephanie Wilde-Hobbs	20cbfb5cb5	Allow whitelisting whole groups	4 years ago
lain	3342846ac2	ChatView: Add update_at field.	4 years ago
Haelwenn (lanodan) Monnier	cb363f0183	MastodonAPI: /api/v2/media endpoints	4 years ago
Haelwenn (lanodan) Monnier	e688d4ee69	MRF.StealEmojiPolicy: New Policy ... Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex	4 years ago
Roman Chvanikov	8a383707ae	Merge develop	4 years ago
Alex Gleason	9cbf17d59f	Handle bcrypt passwords for Mastodon migration	4 years ago
Egor Kislitsyn	6802dc28ba	Add OpenAPI spec for PleromaAPI.AccountController	4 years ago
lain	da550be066	Merge branch 'fix/1742-random-failing-tests' into 'develop' ... Fix sporadically failing tests See merge request pleroma/pleroma!2524	4 years ago
lain	0f0acc740d	Chat: Allow posting without content if an attachment is present.	4 years ago
lain	06cad239e5	InstanceView: Add pleroma chat messages to nodeinfo	4 years ago
lain	3cff4e24cd	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Egor Kislitsyn	bcadbf964a	Add OpenAPI spec for SuggestionController	4 years ago
Ivan Tashkinov	fd2fb2bb2e	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs	4 years ago
lain	156c8a5088	Merge branch 'openapi/statuses' into 'develop' ... Add OpenAPI spec for StatusController See merge request pleroma/pleroma!2521	4 years ago
lain	1307d6ca3c	Merge branch 'openapi/timelines' into 'develop' ... Add OpenAPI spec for TimelineController See merge request pleroma/pleroma!2506	4 years ago
Alexander Strizhakov	fbe3d3aa5f	ignore order	4 years ago
Alexander Strizhakov	2c356a4bac	don't use async with global mocks	4 years ago
Alexander Strizhakov	12635bc156	don't use global mocks in setup callbacks	4 years ago
Alexander Strizhakov	b962b24e6f	don't run in async if tests depend on env config	4 years ago
Alexander Strizhakov	ec27f346ee	correct order for publised in assert	4 years ago