7525 Commits (55cc96bcf9331b8b56c64251cec0878529a543a6)

 

All Branches   

Search

Author	SHA1	Message	Date
Roman Chvanikov	5cb03fe801	Add migration	5 years ago
Roman Chvanikov	cd0218c205	Add migration	5 years ago
Roman Chvanikov	6e7fd364a4	Add migration	5 years ago
kaniini	beee3e75a8	Merge branch 'conversation-read-status-for-blocking-user' into 'develop' ... Count only visible conversations in the user's unread_conversation_count See merge request pleroma/pleroma!1886	5 years ago
rinpatch	12ab7b3280	User info migration improvements ... - Move column additions into a separate migration, so postgres doesn't need an exclusive lock on the table for the main part - Fill in columns by using one big update statement instead of a bunch of small ones because it's much faster (the migration took 140s on patch.cx database)	5 years ago
eugenijm	0580654485	Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`. ... Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.	5 years ago
rinpatch	653054d301	Merge branch 'remove-unsed-info-fields-fn' into 'develop' ... Remove unused Pleroma.User.info_fields/0 See merge request pleroma/pleroma!1882	5 years ago
sadposter	1d85dc62aa	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	16107a0319	update tos	5 years ago
Egor Kislitsyn	dbee53c2df	Remove unused Pleroma.User.info_fields/0	5 years ago
kaniini	96cd66ac1b	Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop' ... pleroma_ctl: fix crashes due to different shift(1) behavior on dash See merge request pleroma/pleroma!1880	5 years ago
kaniini	40a2a92a1f	Merge branch 'object-fetch-errors' into 'develop' ... Object fetch errors See merge request pleroma/pleroma!1881	5 years ago
rinpatch	f3451e723b	pleroma_ctl: fix crashes due to different shift(1) behavior on dash	5 years ago
stwf	5329b361ec	fix test	5 years ago
stwf	2ab072f949	object fetcher error handling	5 years ago
kaniini	07a6f8b8a3	Merge branch 'fix/readme' into 'develop' ... fix link on docs-develop.pleroma.social See merge request pleroma/pleroma!1876	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Maksim Pechnikov	a57f0dbd42	fix link on docs-develop.pleroma.social	5 years ago
Maxim Filippov	b08b1d5d91	Store status data inside Flag activity	5 years ago
feld	17c237ba80	Merge branch '1304-user-info-deprecation' into 'develop' ... [#1304] User.Info deprecation Closes #1304 See merge request pleroma/pleroma!1851	5 years ago
Ivan Tashkinov	c0246309a5	[#1304] Extra bullet-proofing.	5 years ago
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
sadposter	4f9dad053b	tago	5 years ago
sadposter	85b9992f86	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	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