summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' ↵kaniini
into 'develop' Add NOT NULL constraints for oauth_authorizations table See merge request pleroma/pleroma!1902
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'kaniini
Add NOT NULL constraints for oauth_tokens table See merge request pleroma/pleroma!1901
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'kaniini
Add NOT NULL constraints for notifications table See merge request pleroma/pleroma!1900
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into ↵kaniini
'develop' Add NOT NULL constraints for moderation_log table See merge request pleroma/pleroma!1899
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'kaniini
Add NOT NULL constraints for markers table See merge request pleroma/pleroma!1898
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'kaniini
Add NOT NULL constraints for lists table See merge request pleroma/pleroma!1897
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'kaniini
Add NOT NULL constraints for instances table See merge request pleroma/pleroma!1896
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'kaniini
Add NOT NULL constraints for filters table See merge request pleroma/pleroma!1895
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-26Put correct 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-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-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