Maksim Pechnikov [Tue, 29 Oct 2019 19:23:19 +0000 (22:23 +0300)]
Merge branch 'develop' into issue/1276
rinpatch [Tue, 29 Oct 2019 14:17:09 +0000 (14:17 +0000)]
Merge branch 'fix/migrations-same-module-name' into 'develop'
Fix two migrations sharing the same module name
See merge request pleroma/pleroma!1919
rinpatch [Tue, 29 Oct 2019 13:56:24 +0000 (16:56 +0300)]
Fix two migrations sharing the same module name
This makes ecto execute only the latter one.
rinpatch [Tue, 29 Oct 2019 11:24:07 +0000 (11:24 +0000)]
Merge branch 'fix-follow-requests' into 'develop'
FIx follow requests
Closes #1357
See merge request pleroma/pleroma!1918
kPherox [Tue, 29 Oct 2019 10:16:34 +0000 (19:16 +0900)]
Migrate missing follow requests
kPherox [Tue, 29 Oct 2019 09:46:22 +0000 (18:46 +0900)]
Add test follow activity for locked account
kPherox [Tue, 29 Oct 2019 08:12:49 +0000 (17:12 +0900)]
Add pending to handle incoming for Follow activity
lain [Mon, 28 Oct 2019 08:05:14 +0000 (08:05 +0000)]
Merge branch 'fix/migration' into 'develop'
Fix `SetNotNullForUsers` migration
See merge request pleroma/pleroma!1913
Egor Kislitsyn [Mon, 28 Oct 2019 07:45:50 +0000 (14:45 +0700)]
Fix `SetNotNullForUsers` migration
lain [Mon, 28 Oct 2019 07:27:45 +0000 (07:27 +0000)]
Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
kaniini [Sun, 27 Oct 2019 05:33:41 +0000 (05:33 +0000)]
Merge branch 'improve-user-info-migration' into 'develop'
User info migration improvements
See merge request pleroma/pleroma!1887
kaniini [Sun, 27 Oct 2019 05:32:01 +0000 (05:32 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'
Add NOT NULL constraints for users table
See merge request pleroma/pleroma!1910
kaniini [Sun, 27 Oct 2019 05:31:52 +0000 (05:31 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'
Add NOT NULL constraints for user_invite_tokens table
See merge request pleroma/pleroma!1909
kaniini [Sun, 27 Oct 2019 05:31:41 +0000 (05:31 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'
Add NOT NULL constraints for thread_mutes table
See merge request pleroma/pleroma!1908
kaniini [Sun, 27 Oct 2019 05:31:31 +0000 (05:31 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'
Add NOT NULL constraints for scheduled_activities table
See merge request pleroma/pleroma!1907
kaniini [Sun, 27 Oct 2019 05:31:21 +0000 (05:31 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'
Add NOT NULL constraints for registrations table
See merge request pleroma/pleroma!1906
kaniini [Sun, 27 Oct 2019 05:31:09 +0000 (05:31 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'
Add NOT NULL constraints for push_subscriptions table
See merge request pleroma/pleroma!1905
kaniini [Sun, 27 Oct 2019 05:30:59 +0000 (05:30 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'
Add NOT NULL constraints for password_reset_tokens table
See merge request pleroma/pleroma!1904
kaniini [Sun, 27 Oct 2019 05:30:47 +0000 (05:30 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
Add NOT NULL constraints for objects table
See merge request pleroma/pleroma!1903
kaniini [Sun, 27 Oct 2019 05:30:36 +0000 (05:30 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'
Add NOT NULL constraints for oauth_authorizations table
See merge request pleroma/pleroma!1902
kaniini [Sun, 27 Oct 2019 05:30:25 +0000 (05:30 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'
Add NOT NULL constraints for oauth_tokens table
See merge request pleroma/pleroma!1901
kaniini [Sun, 27 Oct 2019 05:30:09 +0000 (05:30 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
Add NOT NULL constraints for notifications table
See merge request pleroma/pleroma!1900
kaniini [Sun, 27 Oct 2019 05:29:56 +0000 (05:29 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
Add NOT NULL constraints for moderation_log table
See merge request pleroma/pleroma!1899
kaniini [Sun, 27 Oct 2019 05:29:45 +0000 (05:29 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'
Add NOT NULL constraints for markers table
See merge request pleroma/pleroma!1898
kaniini [Sun, 27 Oct 2019 05:29:33 +0000 (05:29 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'
Add NOT NULL constraints for lists table
See merge request pleroma/pleroma!1897
kaniini [Sun, 27 Oct 2019 05:29:18 +0000 (05:29 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'
Add NOT NULL constraints for instances table
See merge request pleroma/pleroma!1896
kaniini [Sun, 27 Oct 2019 05:29:05 +0000 (05:29 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
Add NOT NULL constraints for filters table
See merge request pleroma/pleroma!1895
kaniini [Sun, 27 Oct 2019 05:28:45 +0000 (05:28 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'
Add NOT NULL constraints for conversation_participations table
See merge request pleroma/pleroma!1894
kaniini [Sun, 27 Oct 2019 05:28:32 +0000 (05:28 +0000)]
Merge branch '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
kaniini [Sun, 27 Oct 2019 05:28:18 +0000 (05:28 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'
Add NOT NULL constraints for config table
See merge request pleroma/pleroma!1892
kaniini [Sun, 27 Oct 2019 05:28:03 +0000 (05:28 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'
Add NOT NULL constraints for bookmarks table
See merge request pleroma/pleroma!1891
kaniini [Sun, 27 Oct 2019 05:27:43 +0000 (05:27 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'
Add NOT NULL constraints for apps table
See merge request pleroma/pleroma!1890
kaniini [Sun, 27 Oct 2019 05:27:24 +0000 (05:27 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'
Add NOT NULL constraints for activity_expirations table
See merge request pleroma/pleroma!1889
kaniini [Sun, 27 Oct 2019 05:26:31 +0000 (05:26 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-activities' into 'develop'
Add NOT NULL constraints for activities table
See merge request pleroma/pleroma!1888
kaniini [Sun, 27 Oct 2019 04:40:06 +0000 (04:40 +0000)]
Merge branch 'readme-pg-contrib' into 'develop'
Clarify that postgres contrib modules are required, not just postgres.
See merge request pleroma/pleroma!1911
Phil Hagelberg [Sat, 26 Oct 2019 23:19:58 +0000 (16:19 -0700)]
Clarify that postgres contrib modules are required, not just postgres.
Roman Chvanikov [Sat, 26 Oct 2019 19:59:24 +0000 (22:59 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:58:37 +0000 (22:58 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:57:43 +0000 (22:57 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:56:48 +0000 (22:56 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:55:29 +0000 (22:55 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:54:37 +0000 (22:54 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:53:41 +0000 (22:53 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:52:49 +0000 (22:52 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:50:52 +0000 (22:50 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:49:25 +0000 (22:49 +0300)]
Put correct migration
Roman Chvanikov [Sat, 26 Oct 2019 19:46:09 +0000 (22:46 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:45:24 +0000 (22:45 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:44:42 +0000 (22:44 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:43:32 +0000 (22:43 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:42:24 +0000 (22:42 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:40:51 +0000 (22:40 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:39:24 +0000 (22:39 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:38:07 +0000 (22:38 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:37:30 +0000 (22:37 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:36:43 +0000 (22:36 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:33:18 +0000 (22:33 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:32:31 +0000 (22:32 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:31:25 +0000 (22:31 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:28:18 +0000 (22:28 +0300)]
Add migration
kaniini [Sat, 26 Oct 2019 10:37:27 +0000 (10:37 +0000)]
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
rinpatch [Sat, 26 Oct 2019 00:45:24 +0000 (03:45 +0300)]
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)
eugenijm [Fri, 25 Oct 2019 18:29:23 +0000 (21:29 +0300)]
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`.
rinpatch [Fri, 25 Oct 2019 14:51:02 +0000 (14:51 +0000)]
Merge branch 'remove-unsed-info-fields-fn' into 'develop'
Remove unused Pleroma.User.info_fields/0
See merge request pleroma/pleroma!1882
Egor Kislitsyn [Fri, 25 Oct 2019 09:48:01 +0000 (16:48 +0700)]
Remove unused Pleroma.User.info_fields/0
kaniini [Fri, 25 Oct 2019 00:24:01 +0000 (00:24 +0000)]
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
kaniini [Fri, 25 Oct 2019 00:22:50 +0000 (00:22 +0000)]
Merge branch 'object-fetch-errors' into 'develop'
Object fetch errors
See merge request pleroma/pleroma!1881
rinpatch [Thu, 24 Oct 2019 20:28:59 +0000 (23:28 +0300)]
pleroma_ctl: fix crashes due to different shift(1) behavior on dash
stwf [Thu, 24 Oct 2019 16:48:17 +0000 (12:48 -0400)]
fix test
stwf [Thu, 24 Oct 2019 16:08:34 +0000 (12:08 -0400)]
object fetcher error handling
Maksim Pechnikov [Thu, 24 Oct 2019 06:50:41 +0000 (09:50 +0300)]
add test
kaniini [Thu, 24 Oct 2019 08:34:35 +0000 (08:34 +0000)]
Merge branch 'fix/readme' into 'develop'
fix link on docs-develop.pleroma.social
See merge request pleroma/pleroma!1876
Egor Kislitsyn [Thu, 24 Oct 2019 07:42:14 +0000 (14:42 +0700)]
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
Maksim Pechnikov [Thu, 24 Oct 2019 06:58:37 +0000 (09:58 +0300)]
fix link on docs-develop.pleroma.social
Maksim Pechnikov [Thu, 24 Oct 2019 06:23:59 +0000 (09:23 +0300)]
Merge branch 'develop' into issue/1276
Maksim Pechnikov [Wed, 23 Oct 2019 19:48:04 +0000 (22:48 +0300)]
add tests
Maksim Pechnikov [Wed, 23 Oct 2019 08:54:52 +0000 (11:54 +0300)]
fix migrate
feld [Wed, 23 Oct 2019 17:34:42 +0000 (17:34 +0000)]
Merge branch '1304-user-info-deprecation' into 'develop'
[#1304] User.Info deprecation
Closes #1304
See merge request pleroma/pleroma!1851
Ivan Tashkinov [Wed, 23 Oct 2019 16:30:02 +0000 (19:30 +0300)]
[#1304] Extra bullet-proofing.
Ivan Tashkinov [Wed, 23 Oct 2019 14:31:02 +0000 (17:31 +0300)]
[#1304] Adjusted User.Info references from Notification.
Ivan Tashkinov [Wed, 23 Oct 2019 14:22:42 +0000 (17:22 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
Ivan Tashkinov [Wed, 23 Oct 2019 14:15:48 +0000 (17:15 +0300)]
[#1304] Fixed null::jsonb handling in User.Info migration.
Maksim Pechnikov [Tue, 22 Oct 2019 13:13:22 +0000 (16:13 +0300)]
added update unread_count for notifications
kaniini [Wed, 23 Oct 2019 02:25:08 +0000 (02:25 +0000)]
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
Ariadne Conill [Wed, 23 Oct 2019 01:50:25 +0000 (20:50 -0500)]
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
kaniini [Wed, 23 Oct 2019 00:47:28 +0000 (00:47 +0000)]
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
Ariadne Conill [Wed, 23 Oct 2019 00:43:31 +0000 (19:43 -0500)]
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.
Maksim Pechnikov [Tue, 22 Oct 2019 10:42:59 +0000 (13:42 +0300)]
Marker: added unread_count field
kaniini [Mon, 21 Oct 2019 23:50:01 +0000 (23:50 +0000)]
Merge branch 'feature/push-subject-for-dm' into 'develop'
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
Mark Felder [Mon, 21 Oct 2019 23:35:43 +0000 (18:35 -0500)]
Spelling
Mark Felder [Mon, 21 Oct 2019 23:34:20 +0000 (18:34 -0500)]
Add tests for the subject of push notifications
rinpatch [Mon, 21 Oct 2019 16:44:17 +0000 (16:44 +0000)]
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
rinpatch [Mon, 21 Oct 2019 09:38:35 +0000 (12:38 +0300)]
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.
kaniini [Mon, 21 Oct 2019 09:26:17 +0000 (09:26 +0000)]
Merge branch 'feature/masto_api_markers' into 'develop'
[#1275] Markers /api/v1/markers
See merge request pleroma/pleroma!1852
Ivan Tashkinov [Mon, 21 Oct 2019 08:58:22 +0000 (11:58 +0300)]
[#1304] Merged `develop`, handled User.Info.invisible.
Egor Kislitsyn [Mon, 21 Oct 2019 08:55:28 +0000 (15:55 +0700)]
Fix benchmarks
Maksim Pechnikov [Mon, 21 Oct 2019 08:53:11 +0000 (11:53 +0300)]
update changelog
Maksim Pechnikov [Mon, 21 Oct 2019 08:32:28 +0000 (11:32 +0300)]
Merge branch 'develop' into feature/masto_api_markers
Ivan Tashkinov [Mon, 21 Oct 2019 08:05:09 +0000 (11:05 +0300)]
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
Egor Kislitsyn [Mon, 21 Oct 2019 07:56:39 +0000 (14:56 +0700)]
Fix typos
projects / akkoma / log