pleroma

Commit Graph

Author	SHA1	Message	Date
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations # Conflicts: # mix.lock	4 years ago
rinpatch	d7b40dd4ba	Merge branch 'bugfix/1447-set-following' into 'develop' Migrations: Set users.following_count to NOT NULL Closes #1447 See merge request pleroma/pleroma!2021	4 years ago
rinpatch	ca1acfa314	Merge branch 'chore/manual-benchmark' into 'develop' CI: Make benchmarks manually triggered. See merge request pleroma/pleroma!2020	4 years ago
lain	20564600e8	Merge branch 'use-pg12-in-ci' into 'develop' Use PosgreSQL v12 in the federated tests See merge request pleroma/pleroma!2022	4 years ago
Egor Kislitsyn	798aa0c335	Use PosgreSQL v12 in the federated tests	4 years ago
lain	f0bdbe3f61	Migrations: Set users.following_count to NOT NULL Also set following_count for local users to the correct value and for remote users to 0.	4 years ago
lain	98990d2d61	Merge branch 'fed-testing-updates' into 'develop' Add federated test infrastructure See merge request pleroma/pleroma!2014	4 years ago
lain	9a2d38107c	CI: Make benchmarks manually triggered.	4 years ago
lain	8627fb0bb5	Merge branch 'cleanup-tests-output' into 'develop' Cleanup tests output See merge request pleroma/pleroma!2018	4 years ago
Egor Kislitsyn	c4b468a95b	Cleanup tests output	4 years ago
kaniini	cb656938ca	Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop' User: Never return nil for user follower counts. Closes #1442 See merge request pleroma/pleroma!2017	4 years ago
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	4 years ago
lain	ef1718a045	Merge branch 'remove-user-info' into 'develop' Remove User.user_info/2 See merge request pleroma/pleroma!2016	4 years ago
lain	f36724efb1	User: Never return nil for user follower counts.	4 years ago
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	4 years ago
stwf	bd1984f054	update tests and Oban	4 years ago
lain	bbec9bb727	Tests: Run the daemon	5 years ago
lain	74aa42998f	CI: Add testing stage for federated tests.	5 years ago
lain	717d246491	Tests: Don't run federated tests by default	5 years ago
Chris McCord	f01881e82a	Add federated test infrastructure	5 years ago
lain	139b1feda1	Merge branch 'feature/direct_conversation_id_web_push' into 'develop' Add `direct_conversation_id` to web push payload See merge request pleroma/pleroma!2012	4 years ago
Egor Kislitsyn	4af69f047d	Remove `account` field from web push payload	4 years ago
Egor Kislitsyn	80ededc04f	Add `direct_conversation_id` to web push payload	4 years ago
feld	eb3c47f1d8	Merge branch 'fix/prod-syslog-level' into 'develop' Default log level for syslog in prod should also be :warn See merge request pleroma/pleroma!2011	4 years ago
Mark Felder	f673e3deef	Default log level for syslog in prod should also be :warn	4 years ago
Ivan Tashkinov	c8d3c3bfec	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex	4 years ago
lain	dc9090810d	Merge branch 'fix/ap-disable-remote-render' into 'develop' Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010	4 years ago
rinpatch	4b10804f21	OStatus controller: don't serve json at /notice/, redirect instead	4 years ago
rinpatch	02f7383891	ActivityPub controller: do not render remote users	4 years ago
feld	5f981178d0	Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981	4 years ago
feld	9374b52756	Merge branch 'fix/update-reports-old-format' into 'develop' Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986	4 years ago
rinpatch	756bdef5f5	Merge branch 'feature/useragent-override' into 'develop' Add ability to set a custom user-agent string See merge request pleroma/pleroma!2009	4 years ago
Sadposter	e2dc89069d	move documentation section for http client	4 years ago
Sadposter	d3656c2725	add ability to set a custom user-agent string	4 years ago
Maxim Filippov	82f4e4760e	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	4 years ago
Maxim Filippov	fd24467b92	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	4 years ago
rinpatch	9f29930440	fetcher: move local object checking into a reusable function	4 years ago
rinpatch	34cdbcbb64	Merge branch 'fix/release-envvars' into 'develop' OTP releases: only set name and distribution type if not set already See merge request pleroma/pleroma!2004	4 years ago
rinpatch	4a5bb7eb02	OTP releases: only set name and distribution type if not set already Fixes not being able to run two OTP releases on one machine because of the name conflict.	4 years ago
lain	bd62946020	Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994	4 years ago
Maxim Filippov	b64c7b35d4	Swap map with each	4 years ago
rinpatch	c2ad9fd5f9	Merge branch 'list-users' into 'develop' Add CLI list users command See merge request pleroma/pleroma!1990	4 years ago
Alex Schroeder	fbc379d689	Add CLI list users command	4 years ago
rinpatch	dedb1ad5d6	Merge branch 'revert-5c6c3026' into 'develop' Revert "Merge branch 'patch-1' into 'develop'" See merge request pleroma/pleroma!2002	4 years ago
lain	19b727bf8f	Merge branch 'fix/mix-task-logging' into 'develop' Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997	4 years ago
rinpatch	dc9303eac5	Revert "Merge branch 'patch-1' into 'develop'" This reverts merge request !1829	4 years ago
Ivan Tashkinov	cad9b325e5	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs	4 years ago
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	4 years ago
lain	320690f7a5	Object: Use inspect to log missing preload.	4 years ago
lain	1680a3479e	Merge branch 'fix/user-following-count' into 'develop' Fix user.following_count See merge request pleroma/pleroma!2000	4 years ago

1 2 3 4 5 ...

7691 Commits (52cc7de82cf3aa637d599edc357909be8c9366eb) All Branches Search

7691 Commits (52cc7de82cf3aa637d599edc357909be8c9366eb)

All Branches