6693 Commits (48f8b26c92880c0898daac3d691c61be0b891d0b)

Author	SHA1	Message	Date
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	8cfb58a8c0	AccountController: Extract blocking to CommonAPI.	4 years ago
lain	e38293c8f1	Transmogrifier: Switch to pipeline for Blocks.	4 years ago
lain	89e5b2046b	ObjectValidator: Basic `Block` support.	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
Maksim Pechnikov	cc837f9d15	fixed config/descpiption.exs	4 years ago
Alexander Strizhakov	aae1af8cf1	fix for emoji pagination in pack show	4 years ago
lain	4c5fb831b3	Status schema: Add parent_visible.	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
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	aee815b478	ObjectValidator: Clarify type of object.	4 years ago
lain	2c603f2009	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator	4 years ago
Maksim Pechnikov	2715c40e1d	added tests	4 years ago
Haelwenn (lanodan) Monnier	c116b6d6d6	ActivityPubController: Update upload_media @doc ... Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810	4 years ago
Haelwenn	d21ef5e66b	Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop' ... Add missing default config value for :instance, instance_thumbnail See merge request pleroma/pleroma!2672	4 years ago
Mark Felder	df5e048cbb	Do not need a function to provide fallback value with default defined in config.exs	4 years ago
Haelwenn	98f014d3be	Merge branch 'warning/mastofe-settings-blob' into 'develop' ... Add warning against parsing/reusing MastoFE settings blob See merge request pleroma/pleroma!2671	4 years ago
Haelwenn (lanodan) Monnier	8f6ba4b22f	Add warning against parsing/reusing MastoFE settings blob	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	b3a549e916	Update NotificationOperation spec	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	b05f795326	Credo fixes	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	9438f83f83	Transmogrifier: Handle `Update` with the pipeline.	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	b5f13af7ba	Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex	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	0e789bc55f	Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex	4 years ago
lain	4cb7b1ebc6	Apply suggestion to lib/mix/tasks/pleroma/config.ex	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	ac0344dd24	Only accounts with Service actor_type are considered as bots	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	cafdf18408	Merge branch '1873-pagination-fixes' into 'develop' ... [#1873] :offset pagination param support, hashtags pagination Closes #1873 See merge request pleroma/pleroma!2659	4 years ago
lain	372533b7c3	Merge branch 'dry-up-follower-update' into 'develop' ... User: update_follower_count refactor. See merge request pleroma/pleroma!2649	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
Alexander Strizhakov	02ca8a363f	default page size for files	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	c9b5e3feda	revert 'database' option to rejected keys	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	c08c9db0c1	Remove misleading is_ prefix from boolean function	4 years ago
Mark Felder	71a5d9bffb	Empty list as default	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
Egor Kislitsyn	d4b5a9730e	Remove `poll` from `notification_type` OpenAPI spec	4 years ago
Maksim	9a371bf5f6	Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex	4 years ago
Maksim	44ce97a9c9	Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex	4 years ago
Maksim	74fd761637	Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex	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
Alexander Strizhakov	a77b0388f4	credo fix	4 years ago
Maksim Pechnikov	02a5648feb	fixed migration the settings to DB	4 years ago
rinpatch	5c0e1039ce	Chunk the notification type backfill migration ... Long-term we want that migration to be done entirely in SQL, but for now this is a hotfix to not cause OOMs on large databases. This is using a homegrown version of `Repo.stream`, it's worse in terms of performance than the upstream since it doesn't use the same prepared query for chunk queries, but unlike the upstream it supports preloads.	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
Alexander Strizhakov	32c6576b60	naming	4 years ago
Alexander Strizhakov	e1603ac8fe	fix attemps to merge map	4 years ago
Alexander Strizhakov	9a4fde9766	Mogrify args as custom tuples	4 years ago
lain	1eb6cedaad	ActivityPub: When restricting to media posts, only show 'Creates'.	4 years ago
Maksim Pechnikov	b023110799	fixed a visibility of functions	4 years ago
stwf	faba1a6e33	fix tests	4 years ago
lain	e1ee8bc1da	User: update_follower_count refactor.	4 years ago
Maksim Pechnikov	579763126f	Merge branch 'develop' into issue/1855	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
lain	1d625c29a0	ControllerHelper: Always return id field.	4 years ago
lain	4b865bba10	Apply suggestion to lib/pleroma/web/controller_helper.ex	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	09d31d24de	Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2	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
lain	1419c67f4d	Merge branch 'feature/cli-reload-emoji' into 'develop' ... Add command to reload emoji packs from cli for OTP users Closes #1814 See merge request pleroma/pleroma!2639	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	2419776e19	Deprecate Pleroma.Web.RichMedia.Parsers.OGP	4 years ago
Mark Felder	7f7a1a4676	Check for media proxy base_url, not Upload base_url	4 years ago
Mark Felder	8a59fde0e5	Merge branch 'develop' into fix/csp-mediaproxy-base-url	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	5e44e9d698	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
Mark Felder	7c47f791a8	Add command to reload emoji packs from cli for OTP users ... Not useful for source releases as we don't have a way to automate connecting to the running instance.	4 years ago
rinpatch	99afc7f4e4	HTTP security plug: add media proxy base url host to csp	4 years ago
rinpatch	7aa6c82937	Merge branch 'remake-remodel-dms' into 'develop' ... Chats / ChatMessages See merge request pleroma/pleroma!2429	4 years ago
lain	9e411372d0	ActivityPub: Don't show announces of your own objects in timeline.	4 years ago
lain	86fec45f40	ControllerHelper: Fix wrong comparison.	4 years ago
lain	b4c50be9df	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
lain	be7c322865	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
lain	c4f267b3be	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
lain	1b746cfbbb	Merge branch 'add-url-to-admin-account-view' into 'develop' ... Add `url` field to AdminAPI.AccountView See merge request pleroma/pleroma!2633	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	40d5058cc4	Merge branch 'remake-remodel-dms' 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
lain	fc04a138d4	Apply suggestion to lib/pleroma/notification.ex	4 years ago
Haelwenn (lanodan) Monnier	fe1cb56fdc	transmogrifier: MIME.valid?/1 for mediaType ... No issues with the rest of the network yet but this makes sure it will work once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429 is merged.	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	1a11f0e453	Chats: Change id to flake id.	4 years ago
lain	0365053c8d	AttachmentValidator: Check if the mime type is valid.	4 years ago
lain	40fc4e974e	Notfication: Add validation of notification types	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	f77d4a302d	Credo fixes.	4 years ago
lain	9189b489ee	Migrations: Move Notification migration code to helper	4 years ago
lain	9fa3f0b156	Notification: Change type of `type` to an enum.	4 years ago
lain	ca0e6e702b	ChatMessageReference -> Chat.MessageReference	4 years ago
lain	137adef6e0	ChatMessageReference: Use FlakeId.Ecto.Type ... No need for compat because this is brand new.	4 years ago
lain	239d03499e	Chat: creation_cng -> changeset ... Make our usage of this more uniform.	4 years ago
lain	4e8c0eecd5	WebPush: Don't break on contentless chat messages.	4 years ago
Egor Kislitsyn	167812a3f2	Fix pagination	4 years ago
Egor Kislitsyn	b02df1803e	Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys	4 years ago
lain	f24d2f714f	Credo fixes	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
Haelwenn	54bae06b4f	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1}) ... Unifies all the similar functions to one and simplify some blocks with it.	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	65689ba9bd	If Credo fixes is so good, why is there no Credo fixes 2?	4 years ago
lain	f3ea6ee2c8	Credo fixes.	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	56dfa0e0fb	Transmogrifier: Update notification after accepting.	4 years ago
lain	00748e9650	ChatMessageReferences: Change seen -> unread	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
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	5677b21e82	clean up	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	e46aecda55	Notification: Fix notifications backfill for compacted activities	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
Haelwenn	18b050dfd1	Merge branch 'openapi/update-admin-api/status' into 'develop' ... Update OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2624	4 years ago
lain	903955b189	FollowingRelationship: Remove meaningless change	4 years ago
lain	7f5c5b11a5	Chats: Remove `unread` from the db, calculate from unseen messages.	4 years ago
lain	73127cff75	Credo fixes.	4 years ago
lain	2591745fc2	ChatMessageReferences: Move tests	4 years ago
Egor Kislitsyn	8a43611e01	Use AdminAPI.StatusView in api/admin/users	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	7922e63825	Update OpenAPI spec for AdminAPI.StatusController	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	6977500ef7	Merge branch 'tagline' into 'develop' ... Update default instance description See merge request pleroma/pleroma!2600	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	2860c66e88	Merge branch 'feature/embeddable-posts' into 'develop' ... Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319	4 years ago
lain	2c6ebe709a	Credo fixes	4 years ago
lain	6cd2fa2a4c	Migrations: Add a migration to backfill notification types.	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
Egor Kislitsyn	6b84c62d4a	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	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
Alex Gleason	954acdda20	Add `account_activation_required` to /api/v1/instance	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
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
rinpatch	d23b3701d8	Merge branch 'bugfix/csp-unproxied' into 'develop' ... http_security_plug.ex: Fix non-proxied media See merge request pleroma/pleroma!2610	4 years ago
rinpatch	109af93227	Apply suggestion to lib/pleroma/plugs/http_security_plug.ex	4 years ago
rinpatch	660d49227b	Merge branch 'connect-src' into 'develop' ... Add blob: to connect-src CSP, fixes #1827 Closes #1827 See merge request pleroma/pleroma!2608	4 years ago
Ivan Tashkinov	c181e555db	[#1794] Improvements to hashtags extraction from search query.	4 years ago
Alex Gleason	d38f28870e	Add blob: to connect-src CSP	4 years ago
lain	219d2b3146	Merge branch 'fix-streaming' into 'develop' ... Fix argument error in streamer See merge request pleroma/pleroma!2609	4 years ago
feld	81db758e8e	Merge branch 'mix/database-vacuum-options' into 'develop' ... Database vacuum mix task See merge request pleroma/pleroma!2599	4 years ago
kPherox	de0e262839	Fix argument error in streamer ... `Repo.exists` can't use `nil` as it is unsafe. Use parent object instead of activity because currently Announce activity's context is null.	4 years ago
Haelwenn (lanodan) Monnier	da1e31fae3	http_security_plug.ex: Fix non-proxied media	4 years ago
Haelwenn (lanodan) Monnier	a43b435c0a	AP C2S: allow limit & order on outbox & read_inbox	4 years ago
Haelwenn (lanodan) Monnier	2c18830d0d	Bugfix: router: allow basic_auth for outbox	4 years ago
Haelwenn (lanodan) Monnier	b3b367b894	Bugfix: Reuse Controller.Helper pagination for APC2S	4 years ago
lain	3898dd69a6	SideEffects: Ensure a chat is present before streaming something out.	4 years ago
lain	767ce8b803	StreamerView: Actually send Chats, not ChatMessages.	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