pleroma

Commit Graph

Author	SHA1	Message	Date
Egor Kislitsyn	478f0883eb	Fix benchmarks	4 years ago
Maksim Pechnikov	31d6ef6f92	update changelog	4 years ago
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	4 years ago
Ivan Tashkinov	a11a7176d5	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex	4 years ago
Egor Kislitsyn	f726d953d5	Fix typos	4 years ago
kaniini	2ebe8c416a	Merge branch 'feature/activitypub-semantics' into 'develop' activitypub semantics See merge request pleroma/pleroma!1798	4 years ago
Egor Kislitsyn	e37d4b2ddf	Revert "Skip deactivated users in followers import" This reverts commit `8ad015ef64`.	4 years ago
Egor Kislitsyn	c6fba62666	Fix Relay	4 years ago
Ivan Tashkinov	75da202ab7	[#1304 ] Typo fix.	4 years ago
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	4 years ago
Ivan Tashkinov	ee04fbc35a	[#1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	4 years ago
Ivan Tashkinov	c6fdfbc4f1	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	4 years ago
kaniini	62e3d76a45	Merge branch 'chore/add-missing-websub-drop-migration' into 'develop' add missing migration to drop websub table See merge request pleroma/pleroma!1868	4 years ago
Ivan Tashkinov	b4cbf0568b	[#1304 ] Analysis issue fix.	4 years ago
Ivan Tashkinov	e8843974cb	[#1304 ] Moved remaining fields from User.Info to User. Misc. fixes / improvements.	4 years ago
Ariadne Conill	34754938ba	add missing migration to drop websub table	4 years ago
Ariadne Conill	05c58eaece	change Maksim's test description	4 years ago
Ariadne Conill	ba92522c69	tests: add test to ensure invisible actors are rendered with the invisible hint set to true	4 years ago
Ariadne Conill	52d56ed705	tests: add test verifying the relay user is invisible	4 years ago
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	4 years ago
Maksim Pechnikov	189a288925	fix test	4 years ago
Maksim Pechnikov	9694d51437	added test fo Pleroma.Web.MastodonAPI.StatusController	4 years ago
Ariadne Conill	80d3912a56	test: activitypub: use User.invisible?/1 for testing invisibility	4 years ago
Ariadne Conill	ef659331b0	implement invisible support for remote users	4 years ago
Ariadne Conill	95871cb462	user: implement User.invisible?/1	4 years ago
Ariadne Conill	1469a084d4	relay: set invisible to true	4 years ago
Ariadne Conill	e7333db72a	user info: add invisible field	4 years ago
kaniini	1311884a1d	Merge branch 'chore/fixup-testsuite-import' into 'develop' tests: ostatus controller tests: fix sporadic compilation failure See merge request pleroma/pleroma!1867	4 years ago
Ariadne Conill	cd90735a4b	tests: ostatus controller tests: fix sporadic compilation failure	4 years ago
Haelwenn	f01dbc450c	Merge branch 'feature/mastofe-pwa' into 'develop' MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834	4 years ago
Haelwenn	cec4b00140	Merge branch 'mark-all-conversations-as-read' into 'develop' Pleroma API: `POST /api/v1/pleroma/conversations/read` See merge request pleroma/pleroma!1830	4 years ago
rinpatch	289f011e0a	Merge branch 'develop-version-bump' into 'develop' mix.exs: Bump version for develop builds See merge request pleroma/pleroma!1866	4 years ago
rinpatch	f94e28e8b6	mix.exs: Bump version for develop builds As per discussion on irc, we already used GNU-style versioning system for release candidates, so it makes sense to use it for develop builds as well.	4 years ago
eugenijm	52ed2f8f2d	Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read	4 years ago
KokaKiwi	df3c2dfd8b	Add documentation for PWA manifest configuration.	4 years ago
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	4 years ago
rinpatch	fd6d05dc45	Merge branch 'mix-emoji-task-pack-json' into 'develop' For pleroma.emoji downloaded packs, generate pack.json instead See merge request pleroma/pleroma!1748	4 years ago
Mark Felder	dcb23a85b6	Merge branch 'develop' into feature/push-subject-for-dm	4 years ago
Mark Felder	152caef51d	Direct messages should provide a distinct push notification subject	4 years ago
rinpatch	5c6c3026ea	Merge branch 'patch-1' into 'develop' Fix a typo in default static directory configuration for OTP releases Closes #1289 See merge request pleroma/pleroma!1829	4 years ago
rinpatch	0341f6f779	Merge branch 'fix/pleroma-ctl-rpc' into 'develop' pleroma_ctl: Fix attempting to use RPC for config generation See merge request pleroma/pleroma!1862	4 years ago
rinpatch	901bf0fb8c	pleroma_ctl: Fix attempting to use RPC for config generation	4 years ago
kaniini	c25a81b173	Merge branch 'feature/relay-list' into 'develop' Admin API: Ability to list all followed relays See merge request pleroma/pleroma!1835	4 years ago
Maxim Filippov	019147f115	Merge branch 'develop' into feature/relay-list	4 years ago
kaniini	4053a82f41	Merge branch 'feature/ostatus-removal' into 'develop' ostatus removal Closes #1145 See merge request pleroma/pleroma!1854	4 years ago
Ariadne Conill	c2ae6310dc	tests: mastodon api: fix broken test that used OStatus	4 years ago
Ariadne Conill	44e64af5e7	object: containment: simplify the pattern match for OStatus testsuite hack	4 years ago
Ariadne Conill	e99fdfc32d	object: containment: only allow OStatus references in test suite environment	4 years ago
Ariadne Conill	a8eb1f0975	tests: mastodon search: search for an account that is visible via activitypub, not ostatus	4 years ago
Ariadne Conill	3c785b85a6	object: fetcher: fix up formatting	4 years ago

... 3 4 5 6 7 ...

7453 Commits (7ba30cf8b6ee86297562d6af50b267ec0967a63b) All Branches Search

7453 Commits (7ba30cf8b6ee86297562d6af50b267ec0967a63b)

All Branches