4848 Commits (2f8ec8a9ccf7aeec198642b23598b3d7fb4aa10d)

Author	SHA1	Message	Date
Ivan Tashkinov	ccc2cf0e87	Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.	4 years ago
feld	ecd1ef8cb5	Merge branch 'fix/2302-report-duplicates' into 'develop' ... Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146	4 years ago
lain	8532325d65	SearchController Test: Fix test.	4 years ago
lain	9a1e5f5d48	Search: Change search method based on detected pg version	4 years ago
feld	79a509ee61	Merge branch '2301-users-search-discoverability-fix' into 'develop' ... [#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162	4 years ago
feld	cd1b4155d5	Merge branch 'oban-jobs-to-simple-tasks' into 'develop' ... Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129	4 years ago
Maksim Pechnikov	66f411fba0	added subject actor to moderation log	4 years ago
Ivan Tashkinov	b27d8f7437	Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix ... # Conflicts: # CHANGELOG.md	4 years ago
lain	5e04f4156c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	4 years ago
Ivan Tashkinov	e164c37139	[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.	4 years ago
Haelwenn	c8d11c3064	Merge branch '2317-old-reset-tokens' into 'develop' ... Resolve "Don't allow old password reset tokens" Closes #2317 See merge request pleroma/pleroma!3160	4 years ago
lain	783fa797bb	SearchController Test: Fix test	4 years ago
lain	81b6f02a5e	Search Test: linting	4 years ago
lain	a60242464e	Search: Add option to search with the websearch function	4 years ago
Ivan Tashkinov	fcad3e716a	[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.	4 years ago
Alexander Strizhakov	46dab37351	little fix	4 years ago
lain	11e0d5f9ac	Password Resets: Don't accept tokens above a certain age. ... By default, one day	4 years ago
Alexander Strizhakov	4aaffe3a10	log capture	4 years ago
Alexander Strizhakov	be0b874e1d	fix for mastodon forwarded reports	4 years ago
Alexander Strizhakov	a840aefda8	formatting	4 years ago
Alexander Strizhakov	e2bf6b1f7e	fix for forwarded reports	4 years ago
minibikini	6669ac5bf7	Merge branch 'develop' into 'hide-muted-reactions' ... # Conflicts: # CHANGELOG.md	4 years ago
lain	aae669d05e	Merge branch 'fix/webpush-and-emojireact' into 'develop' ... Push notifications: add pleroma:emoji_reaction, improve tests Closes #2185 See merge request pleroma/pleroma!3141	4 years ago
lain	6b32e1de23	Merge branch 'frontend-admin-api' into 'develop' ... Add an API to manage frontends Closes #2238 See merge request pleroma/pleroma!3108	4 years ago
Maksim Pechnikov	9c5d1cb9ed	fix tests	4 years ago
Mark Felder	415481a4d9	Add test for POST when push is disabled ... Also group together the tests verifiying failure when disabled	4 years ago
Mark Felder	3eaa5335c9	Revert adding extra alert types here	4 years ago
Mark Felder	d9732fb7d3	Fix incorrect test description	4 years ago
Mark Felder	ff7a4b6aa2	Test that we ignore invalid subscription alert types separately.	4 years ago
Mark Felder	30f140e570	Ensure all supported push notification subscription alert types are tested	4 years ago
Mark Felder	499faa82f6	Synchronize reaction notification text with PleromaFE's style	4 years ago
Mark Felder	67a6abd071	Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions	4 years ago
Mark Felder	3ce11b830e	Add capability for emoji reaction push notifications	4 years ago
lain	bb9650f3c2	FrontendController: Return error on installation error.	4 years ago
feld	d33b9e7b33	Merge branch 'remove/fedsockets' into 'develop' ... Remove FedSockets See merge request pleroma/pleroma!3155	4 years ago
Egor Kislitsyn	f69fe36ebf	Merge branch 'develop' into frontend-admin-api	4 years ago
Egor Kislitsyn	d48dbfab2b	Merge remote-tracking branch 'origin/develop' into hide-muted-reactions	4 years ago
Egor Kislitsyn	79d2d3f609	Merge branch 'develop' into hide-muted-reactions	4 years ago
rinpatch	2c55f7d7cb	Remove FedSockets ... Current FedSocket implementation has a bunch of problems. It doesn't have proper error handling (in case of an error the server just doesn't respond until the connection is closed, while the client doesn't match any error messages and just assumes there has been an error after 15s) and the code is full of bad descisions (see: fetch registry which uses uuids for no reason and waits for a response by recursively querying a ets table until the value changes, or double JSON encoding). Sometime ago I almost completed rewriting fedsockets from scrach to adress these issues. However, while doing so, I realized that fedsockets are just too overkill for what they were trying to accomplish, which is reduce the overhead of federation by not signing every message. This could be done without reimplementing failure states and endpoint logic we already have with HTTP by, for example, using TLS cert auth, or switching to a more performant signature algorithm. I opened https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further discussion on alternatives to fedsockets. From discussions I had with other Pleroma developers it seems like they would approve the descision to remove them as well, therefore I am submitting this patch.	4 years ago
lain	61f86774d1	Merge branch 'chores/note-handling-move' into 'develop' ... Chores/note handling move See merge request pleroma/pleroma!3122	4 years ago
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
lain	81293e5aad	ActivityPubController: Don't return local only objects	4 years ago
Mark Felder	b1466661eb	Use absolute URLs to thumbnail and background in /api/v1/instance	4 years ago
Maksim Pechnikov	e4b202d905	added test	4 years ago
Egor Kislitsyn	fb41bd1a85	Hide reactions from muted and blocked users	4 years ago
Maksim Pechnikov	e1d25bad0c	fix tests	4 years ago
Haelwenn	28da36975d	Merge branch 'bugfix/instance-gen_exiftool' into 'develop' ... pleroma.instance: Fix Exiftool module name See merge request pleroma/pleroma!3143	4 years ago
Haelwenn (lanodan) Monnier	e2f573d68b	pleroma.instance: Fix Exiftool module name	4 years ago
Maksim Pechnikov	36ec604521	added test	4 years ago
lain	0d149502fe	Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' ... fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912	4 years ago
Ilja	70e4b86250	Make notifs view work for reports ... * These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)	4 years ago
rinpatch	6ca709816f	Fix object spoofing vulnerability in attachments ... Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948	4 years ago
Haelwenn	99bc175f02	Merge branch 'title-injection-change' into 'develop' ... Title injection change See merge request pleroma/pleroma!3132	4 years ago
Mark Felder	966663c3f8	Fix tests for other attachment types	4 years ago
Mark Felder	2254e5e595	Render blurhashes in Mastodon API	4 years ago
Mark Felder	6fd72e9e85	Ingest blurhash for attachments if they were federated	4 years ago
Egor Kislitsyn	d26a449396	Change endpoint path	4 years ago
Egor Kislitsyn	435bf1f945	Remove FrontendInstallerWorker	4 years ago
lain	631def2df2	RedirectController: Don't replace title, but inject into the meta	4 years ago
Egor Kislitsyn	08cbd655d1	Merge branch 'develop' into frontend-admin-api	4 years ago
Egor Kislitsyn	0118ccb53c	Add `local` visibility	4 years ago
feld	3cd7ea693f	Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop' ... Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128	4 years ago
Alexander Strizhakov	8d218ebaf5	Moving some background jobs into simple tasks ... - fetching activity data - attachment prefetching - using limiter to prevent overload	4 years ago
Alexander Strizhakov	f97f24b067	making credo happy and test fix	4 years ago
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	4 years ago
lain	88f6b61a5e	Merge branch '2260-wrong-report-link' into 'develop' ... Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121	4 years ago
Alexander Strizhakov	0c68b9ac13	escaping summary and other fields in xml templates	4 years ago
rinpatch	cc45c69fff	Remove release_env ... While taking a final look at instance.gen before releasing I noticed that the release_env task outputs messages in broken english. Upon further inspection it seems to have even more severe issues which, in my opinion, warrant it's at least temporary removal: - We do not explain what it actually does, anywhere. Neither the task docs nor instance.gen, nor installation instructions. - It does not respect FHS on OTP releases (uses /opt/pleroma/config even though we store the config in /etc/pleroma/config.exs). - It doesn't work on OTP releases, which is the main reason it exists. Neither systemd nor openrc service files for OTP include it. - It is not mentioned in install guides other than the ones for Debian and OTP releases.	4 years ago
Haelwenn (lanodan) Monnier	e010bb292b	NoteHandlingTest: Poison → Jason	4 years ago
Haelwenn (lanodan) Monnier	fa1f5d4442	Move TransmogrifierTest for Note to NoteHandlingTest	4 years ago
lain	6d850c46dc	AdminEmail: Use AP id as user url.	4 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	4 years ago
lain	4800ee656b	Merge branch 'features/federation-status' into 'develop' ... Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086	4 years ago
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' ... View a remote server's timeline See merge request pleroma/pleroma!2713	4 years ago
Ivan Tashkinov	73e66fd31f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' ... Always return voters_count in polls See merge request pleroma/pleroma!3120	4 years ago
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	4 years ago
lain	cb3cd3a761	TopicsTest: Small addition.	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' ... Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	4 years ago
Egor Kislitsyn	ca95cbe0b4	Add `with_muted` param to ChatController.index/2	4 years ago
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	4 years ago
lain	c7bcbfbc1d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
lain	1cfc3278c0	Poll View: Always return `voters_count`.	4 years ago
lain	c37118e6f2	Conversations: A few refactors	4 years ago
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	4 years ago
Mark Felder	53dd048590	Test the note is returned when fetching a single report	4 years ago
Egor Kislitsyn	be52819a11	Hide chats from muted users	4 years ago
lain	24ce324973	Merge branch 'bugfix/poll_replies_count' into 'develop' ... side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114	4 years ago
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	4 years ago
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	4 years ago
feld	38b481d112	Merge branch 'feature/account-export' into 'develop' ... Add account export Closes #847 See merge request pleroma/pleroma!2918	4 years ago
Ivan Tashkinov	04f6b48ac1	Auth subsystem refactoring and tweaks. ... Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.	4 years ago
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	4 years ago
Egor Kislitsyn	a2a7a1f2ff	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	1a98476f48	Remove unused aliases	4 years ago
Alibek Omarov	1042c30fa5	ConversationViewTest: fix test	4 years ago
Alibek Omarov	0552a08dfd	ConversationControllerTest: fix test, fix formatting	4 years ago
Alibek Omarov	9b93eef715	ConversationView: fix last_status.account being empty, fix current user being included in group conversations	4 years ago