6507 Commits (fa7a0be2252fc52202cf84b6549e2ff2e731c4ff)

Author	SHA1	Message	Date
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
Mark Felder	d69af7f742	Rename user.settings column ... This is used exclusively by MastoFE/GlitchFE now	4 years ago
lain	8b7055e25e	Credo fixes	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	09c5991f82	Apply suggestion to lib/pleroma/notification.ex	4 years ago
lain	90083a754d	Notifications: Never return `nil` in the notification list.	4 years ago
Egor Kislitsyn	979f02ec94	Fix CastAndValidate plug	4 years ago
Alexander Strizhakov	6512ef6879	excluding attachment links from RichMedia	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
Haelwenn (lanodan) Monnier	9f51b03eed	ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses	4 years ago
Haelwenn (lanodan) Monnier	1566543bec	object/fetcher: Pass full Transmogrifier error	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
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	d6c958b4c2	nodeinfo: Fix MRF transparency	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
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
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
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