10776 Commits (1c9752cff445ab1f58cea1617d3c7ab73da60e10)

 

All Branches   

Search

Author	SHA1	Message	Date
lain	d884b6f704	Merge branch 'feature/update-description' into 'develop' ... Update settings descriptions and labels See merge request pleroma/pleroma!2709	4 years ago
lain	bad08f34ca	Credo fixes.	4 years ago
lain	ce9b7c0e0f	Changelog: Update with stream changes.	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	d889c9ca70	Merge branch 'revert-651f2695' into 'develop' ... Revert "Merge branch 'avatar-removing' into 'develop'" See merge request pleroma/pleroma!2710	4 years ago
lain	691742e62d	Revert "Merge branch 'avatar-removing' into 'develop'" ... This reverts merge request !2701	4 years ago
Angelina Filippova	df2d6564d5	Add labels, update descriptions and labels	4 years ago
Alex Gleason	8daacc9114	AutoLinker --> Linkify, update to latest version ... https://git.pleroma.social/pleroma/elixir-libraries/linkify	4 years ago
Haelwenn	9cf4bfcd81	Merge branch 'chore/rename-user-settings-column' into 'develop' ... Rename user.settings column See merge request pleroma/pleroma!2707	4 years ago
Mark Felder	5a8e0208b1	Add fields limits to instance metadata, add tests	4 years ago
Mark Felder	0883a706dc	Merge branch 'develop' into activation-meta	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	b9e6ad571a	Merge branch 'preloadfixups' into 'develop' ... Some fixups for the preload. See merge request pleroma/pleroma!2692	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
lain	34c9446cb1	Merge branch 'patch-1' into 'develop' ... Use correct PostgreSQL version command in bug template See merge request pleroma/pleroma!2706	4 years ago
normandy	27542f19c6	Use correct PostgreSQL version command in bug template	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	b2b332984c	Merge branch 'fix/cast-and-validate' into 'develop' ... Fix CastAndValidate plug Closes #1889 See merge request pleroma/pleroma!2704	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
feld	344a9b28b3	Merge branch 'fix/swoosh-sendmail' into 'develop' ... updated swoosh See merge request pleroma/pleroma!2703	4 years ago
Egor Kislitsyn	979f02ec94	Fix CastAndValidate plug	4 years ago
Maksim Pechnikov	dc60b1ee58	updated swoosh	4 years ago
Egor Kislitsyn	67d92ac7b7	Remove `/statusnet/config`	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
Egor Kislitsyn	8693e01799	Fix warning	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	59540131c1	Credo fixes.	4 years ago
lain	f308196b75	Token Response: Remove empty file.	4 years ago
lain	e374872fe7	AccountOperation: Correctly describe create response.	4 years ago
lain	bb168ed94a	OAuth: Extract view-type functions to a view.	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
lain	e229640372	Merge branch 'openapi/schema-account-pleromafields' into 'develop' ... ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses See merge request pleroma/pleroma!2700	4 years ago
Haelwenn (lanodan) Monnier	9f51b03eed	ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses	4 years ago
Haelwenn	cf1bd386c6	Merge branch 'docs/mastoapi-account-fields' into 'develop' ... differences_in_mastoapi_responses: Update account fields See merge request pleroma/pleroma!2699	4 years ago