summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-27Merge branch ↵kaniini
'refactor/db-not-null-constraints-for-conversation_participations' into 'develop' Add NOT NULL constraints for conversation_participations table See merge request pleroma/pleroma!1894
2019-10-27Merge branch ↵kaniini
'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop' Add NOT NULL constraints for conversation_participation_recipient_ships table See merge request pleroma/pleroma!1893
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'kaniini
Add NOT NULL constraints for config table See merge request pleroma/pleroma!1892
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'kaniini
Add NOT NULL constraints for bookmarks table See merge request pleroma/pleroma!1891
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'kaniini
Add NOT NULL constraints for apps table See merge request pleroma/pleroma!1890
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' ↵kaniini
into 'develop' Add NOT NULL constraints for activity_expirations table See merge request pleroma/pleroma!1889
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-activities' into 'develop'kaniini
Add NOT NULL constraints for activities table See merge request pleroma/pleroma!1888
2019-10-27Merge branch 'readme-pg-contrib' into 'develop'kaniini
Clarify that postgres contrib modules are required, not just postgres. See merge request pleroma/pleroma!1911
2019-10-26Clarify that postgres contrib modules are required, not just postgres.Phil Hagelberg
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Merge branch 'conversation-read-status-for-blocking-user' into 'develop'kaniini
Count only visible conversations in the user's unread_conversation_count See merge request pleroma/pleroma!1886
2019-10-26Mark the conversations with the blocked user as read and update the blocking ↵eugenijm
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`.
2019-10-25Merge branch 'remove-unsed-info-fields-fn' into 'develop'rinpatch
Remove unused Pleroma.User.info_fields/0 See merge request pleroma/pleroma!1882
2019-10-25Remove unused Pleroma.User.info_fields/0Egor Kislitsyn
2019-10-25Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop'kaniini
pleroma_ctl: fix crashes due to different shift(1) behavior on dash See merge request pleroma/pleroma!1880
2019-10-25Merge branch 'object-fetch-errors' into 'develop'kaniini
Object fetch errors See merge request pleroma/pleroma!1881
2019-10-24pleroma_ctl: fix crashes due to different shift(1) behavior on dashrinpatch
2019-10-24fix teststwf
2019-10-24object fetcher error handlingstwf
2019-10-24Merge branch 'fix/readme' into 'develop'kaniini
fix link on docs-develop.pleroma.social See merge request pleroma/pleroma!1876
2019-10-24fix link on docs-develop.pleroma.socialMaksim Pechnikov
2019-10-23Merge branch '1304-user-info-deprecation' into 'develop'feld
[#1304] User.Info deprecation Closes #1304 See merge request pleroma/pleroma!1851
2019-10-23[#1304] Extra bullet-proofing.Ivan Tashkinov
2019-10-23[#1304] Adjusted User.Info references from Notification.Ivan Tashkinov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-23[#1304] Fixed null::jsonb handling in User.Info migration.Ivan Tashkinov
2019-10-23Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'kaniini
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors Closes #1326 See merge request pleroma/pleroma!1874
2019-10-22activitypub: visibility: refactor is_public?() to use JSON-LD safe accessorsAriadne Conill
2019-10-23Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'kaniini
tests: transmogrifier: add explicit regression tests for JSON-LD strings as single-element array fuckery See merge request pleroma/pleroma!1873
2019-10-22tests: transmogrifier: add explicit regression tests for JSON-LD string to ↵Ariadne Conill
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.
2019-10-21Merge branch 'feature/push-subject-for-dm' into 'develop'kaniini
Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864
2019-10-21SpellingMark Felder
2019-10-21Add tests for the subject of push notificationsMark Felder
2019-10-21Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'rinpatch
Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869
2019-10-21Do not include notifications from blocked users when with_muted is setrinpatch
This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.
2019-10-21Merge branch 'feature/masto_api_markers' into 'develop'kaniini
[#1275] Markers /api/v1/markers See merge request pleroma/pleroma!1852
2019-10-21[#1304] Merged `develop`, handled User.Info.invisible.Ivan Tashkinov
2019-10-21update changelogMaksim Pechnikov
2019-10-21Merge branch 'develop' into feature/masto_api_markersMaksim Pechnikov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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
2019-10-21Merge branch 'feature/activitypub-semantics' into 'develop'kaniini
activitypub semantics See merge request pleroma/pleroma!1798
2019-10-21[#1304] Typo fix.Ivan Tashkinov
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
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
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 15:44:31 +0000