4020 Commits (9dda8b542723afae8dd5493b4082b8524873a14d)

Author	SHA1	Message	Date
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
Haelwenn (lanodan) Monnier	244655e884	MastoAPI: Show source field when deleting	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	a5bbfa21a1	StaticFE: Prioritize json in requests.	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
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
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