7613 Commits (565f2613380a676c7a88850b869b219052f445a1)

 

All Branches   

Search

Author	SHA1	Message	Date
Ivan Tashkinov	065e9fac12	[#1304] Adjusted User.Info references from Notification.	5 years ago
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
Ivan Tashkinov	11cd994425	[#1304] Fixed null::jsonb handling in User.Info migration.	5 years ago
kaniini	54077677ea	Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop' ... activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors Closes #1326 See merge request pleroma/pleroma!1874	5 years ago
Ariadne Conill	3f6a596922	activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors	5 years ago
kaniini	894fb806e9	Merge branch 'chore/add-single-value-deserialization-tests' into 'develop' ... tests: transmogrifier: add explicit regression tests for JSON-LD strings as single-element array fuckery See merge request pleroma/pleroma!1873	5 years ago
Ariadne Conill	277aea45b9	tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization ... There appears to be confusion on whether or not Pleroma can handle this particular sin of JSON-LD. It can, and we will add regression tests to prove that it can handle this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD, but whatever.	5 years ago
kaniini	6281e4795a	Merge branch 'feature/push-subject-for-dm' into 'develop' ... Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864	5 years ago
Mark Felder	0c628fafc5	Spelling	5 years ago
Mark Felder	2cbb3f2364	Add tests for the subject of push notifications	5 years ago
rinpatch	6712b6e4de	Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' ... Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869	5 years ago
rinpatch	2dbee29cf5	Do not include notifications from blocked users when with_muted is set ... This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.	5 years ago
kaniini	ce750dbab5	Merge branch 'feature/masto_api_markers' into 'develop' ... [#1275] Markers /api/v1/markers See merge request pleroma/pleroma!1852	5 years ago
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged `develop`, handled User.Info.invisible.	5 years ago
Egor Kislitsyn	478f0883eb	Fix benchmarks	5 years ago
Maksim Pechnikov	31d6ef6f92	update changelog	5 years ago
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	5 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	5 years ago
Egor Kislitsyn	f726d953d5	Fix typos	5 years ago
kaniini	2ebe8c416a	Merge branch 'feature/activitypub-semantics' into 'develop' ... activitypub semantics See merge request pleroma/pleroma!1798	5 years ago
Egor Kislitsyn	e37d4b2ddf	Revert "Skip deactivated users in followers import" ... This reverts commit 8ad015ef64.	5 years ago
Egor Kislitsyn	c6fba62666	Fix Relay	5 years ago
Ivan Tashkinov	75da202ab7	[#1304] Typo fix.	5 years ago
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	5 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	5 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	5 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	5 years ago
Ivan Tashkinov	b4cbf0568b	[#1304] Analysis issue fix.	5 years ago
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	5 years ago
Ariadne Conill	34754938ba	add missing migration to drop websub table	5 years ago
Ariadne Conill	05c58eaece	change Maksim's test description	5 years ago
Ariadne Conill	ba92522c69	tests: add test to ensure invisible actors are rendered with the invisible hint set to true	5 years ago
Ariadne Conill	52d56ed705	tests: add test verifying the relay user is invisible	5 years ago
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	5 years ago
Maksim Pechnikov	189a288925	fix test	5 years ago
Maksim Pechnikov	9694d51437	added test fo Pleroma.Web.MastodonAPI.StatusController	5 years ago
Ariadne Conill	80d3912a56	test: activitypub: use User.invisible?/1 for testing invisibility	5 years ago
Ariadne Conill	ef659331b0	implement invisible support for remote users	5 years ago
Ariadne Conill	95871cb462	user: implement User.invisible?/1	5 years ago
Ariadne Conill	1469a084d4	relay: set invisible to true	5 years ago
Ariadne Conill	e7333db72a	user info: add invisible field	5 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	5 years ago
Ariadne Conill	cd90735a4b	tests: ostatus controller tests: fix sporadic compilation failure	5 years ago
Haelwenn	f01dbc450c	Merge branch 'feature/mastofe-pwa' into 'develop' ... MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834	5 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	5 years ago
rinpatch	289f011e0a	Merge branch 'develop-version-bump' into 'develop' ... mix.exs: Bump version for develop builds See merge request pleroma/pleroma!1866	5 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.	5 years ago
eugenijm	52ed2f8f2d	Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read	5 years ago
KokaKiwi	df3c2dfd8b	Add documentation for PWA manifest configuration.	5 years ago
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	5 years ago