Commit graph

557 commits

Author SHA1 Message Date
Egor Kislitsyn
40d5fb6ef8
Add a migration to fix blocked follows 2019-10-30 15:52:37 +07:00
rinpatch
3e09b7c5ae Fix two migrations sharing the same module name
This makes ecto execute only the latter one.
2019-10-29 16:56:24 +03:00
kPherox
5334190056
Migrate missing follow requests 2019-10-29 19:22:34 +09:00
Roman Chvanikov
435d220700 Move setDefaultsToTables to past to run before notNull migrations 2019-10-28 19:17:50 +03:00
Roman Chvanikov
4b0893631f Complete defaults 2019-10-28 19:16:19 +03:00
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity 2019-10-28 15:10:47 +07:00
Egor Kislitsyn
3c86a0ab24
Fix SetNotNullForUsers migration 2019-10-28 14:45:50 +07:00
lain
2480200759 Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table

Closes #1233

See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
Roman Chvanikov
0be9cb086b Add migration 2019-10-27 19:29:35 +03:00
kaniini
060adfd762 Merge branch 'improve-user-info-migration' into 'develop'
User info migration improvements

See merge request pleroma/pleroma!1887
2019-10-27 05:33:41 +00:00
kaniini
fbadd36cc0 Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'
Add NOT NULL constraints for users table

See merge request pleroma/pleroma!1910
2019-10-27 05:32:01 +00:00
kaniini
a9cadf3905 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
2019-10-27 05:31:52 +00:00
kaniini
4a72d39ca6 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
2019-10-27 05:31:41 +00:00
kaniini
e94144669a 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
2019-10-27 05:31:31 +00:00
kaniini
9e084771c6 Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'
Add NOT NULL constraints for registrations table

See merge request pleroma/pleroma!1906
2019-10-27 05:31:21 +00:00
kaniini
3ac6160299 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
2019-10-27 05:31:09 +00:00
kaniini
26daaa9f04 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
2019-10-27 05:30:59 +00:00
kaniini
1fc591fcfc Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
Add NOT NULL constraints for objects table

See merge request pleroma/pleroma!1903
2019-10-27 05:30:47 +00:00
kaniini
8b204b4d71 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
2019-10-27 05:30:36 +00:00
kaniini
fe97493d91 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
2019-10-27 05:30:25 +00:00
kaniini
84e992d85b Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
Add NOT NULL constraints for notifications table

See merge request pleroma/pleroma!1900
2019-10-27 05:30:09 +00:00
kaniini
19a625459b 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
2019-10-27 05:29:56 +00:00
kaniini
79702b54b6 Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'
Add NOT NULL constraints for markers table

See merge request pleroma/pleroma!1898
2019-10-27 05:29:45 +00:00
kaniini
2e7e43c853 Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'
Add NOT NULL constraints for lists table

See merge request pleroma/pleroma!1897
2019-10-27 05:29:33 +00:00
kaniini
75dab79183 Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'
Add NOT NULL constraints for instances table

See merge request pleroma/pleroma!1896
2019-10-27 05:29:18 +00:00
kaniini
24699b991a Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
Add NOT NULL constraints for filters table

See merge request pleroma/pleroma!1895
2019-10-27 05:29:05 +00:00
kaniini
3ac8eb4046 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
2019-10-27 05:28:45 +00:00
kaniini
6be16b8617 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
2019-10-27 05:28:32 +00:00
kaniini
b05fbc890e Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'
Add NOT NULL constraints for config table

See merge request pleroma/pleroma!1892
2019-10-27 05:28:18 +00:00
kaniini
8785d7ba5d Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'
Add NOT NULL constraints for bookmarks table

See merge request pleroma/pleroma!1891
2019-10-27 05:28:03 +00:00
kaniini
93f6f173ce Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'
Add NOT NULL constraints for apps table

See merge request pleroma/pleroma!1890
2019-10-27 05:27:43 +00:00
kaniini
5cb5f9a270 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
2019-10-27 05:27:24 +00:00
Roman Chvanikov
175f6c8355 Add migration 2019-10-26 22:59:24 +03:00
Roman Chvanikov
bdb2039453 Add migration 2019-10-26 22:58:37 +03:00
Roman Chvanikov
f5f9197fce Add migration 2019-10-26 22:57:43 +03:00
Roman Chvanikov
2e608f7cbf Add migration 2019-10-26 22:56:48 +03:00
Roman Chvanikov
2810729218 Add migration 2019-10-26 22:55:29 +03:00
Roman Chvanikov
cf72b7649e Add migration 2019-10-26 22:54:37 +03:00
Roman Chvanikov
a4cf664385 Add migration 2019-10-26 22:53:41 +03:00
Roman Chvanikov
776c31267f Add migration 2019-10-26 22:52:49 +03:00
Roman Chvanikov
c0b0fb19c8 Add migration 2019-10-26 22:50:52 +03:00
Roman Chvanikov
5fece5f8bc Put correct migration 2019-10-26 22:49:37 +03:00
Roman Chvanikov
d58cca5f0a Add migration 2019-10-26 22:46:09 +03:00
Roman Chvanikov
cf0fa124a2 Add migration 2019-10-26 22:45:24 +03:00
Roman Chvanikov
13cc52dc60 Add migration 2019-10-26 22:44:42 +03:00
Roman Chvanikov
55203c198b Add migration 2019-10-26 22:43:32 +03:00
Roman Chvanikov
b85bee32da Add migration 2019-10-26 22:42:24 +03:00
Roman Chvanikov
b33aacc4fb Add migration 2019-10-26 22:40:51 +03:00
Roman Chvanikov
382e83fab5 Add migration 2019-10-26 22:39:24 +03:00
Roman Chvanikov
0223dc4e02 Add migration 2019-10-26 22:38:07 +03:00
Roman Chvanikov
d12555a69e Add migration 2019-10-26 22:37:30 +03:00
Roman Chvanikov
7ac42fefe3 Add migration 2019-10-26 22:36:43 +03:00
Roman Chvanikov
c1ff8472fd Add migration 2019-10-26 22:33:18 +03:00
Roman Chvanikov
5cb03fe801 Add migration 2019-10-26 22:32:31 +03:00
Roman Chvanikov
cd0218c205 Add migration 2019-10-26 22:31:25 +03:00
Roman Chvanikov
6e7fd364a4 Add migration 2019-10-26 22:28:18 +03:00
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)
2019-10-26 03:45:24 +03:00
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User 2019-10-25 19:14:18 +07:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Ivan Tashkinov
8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Ivan Tashkinov
11cd994425 [#1304] Fixed null::jsonb handling in User.Info migration. 2019-10-23 17:15:48 +03:00
Ivan Tashkinov
7c7f90bc4f [#1304] Merged develop, handled User.Info.invisible. 2019-10-21 11:58:22 +03:00
Maksim Pechnikov
243719a965 Merge branch 'develop' into feature/masto_api_markers 2019-10-21 11:32:28 +03:00
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
2019-10-21 11:05:09 +03:00
Egor Kislitsyn
f726d953d5
Fix typos 2019-10-21 14:56:39 +07:00
kaniini
2ebe8c416a Merge branch 'feature/activitypub-semantics' into 'develop'
activitypub semantics

See merge request pleroma/pleroma!1798
2019-10-21 07:54:48 +00:00
Egor Kislitsyn
e37d4b2ddf
Revert "Skip deactivated users in followers import"
This reverts commit 8ad015ef64.
2019-10-21 14:52:52 +07:00
Ivan Tashkinov
75da202ab7 [#1304] Typo fix. 2019-10-21 10:20:28 +03:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships 2019-10-21 14:19:15 +07:00
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
2019-10-20 22:29:56 +03:00
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
2019-10-20 20:43:18 +03:00
Ivan Tashkinov
e8843974cb [#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
Ariadne Conill
34754938ba add missing migration to drop websub table 2019-10-20 10:39:03 +00:00
Ariadne Conill
c9280b9730 rework to use properties instead of compound typing, per SocialCG 2019-10-19 23:21:37 +00:00
rinpatch
39e996528c Fix a migration wiping user info of users that don't have any mutes
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
Maksim Pechnikov
66b5d0ff55 add Markers /api/v1/markers 2019-10-17 15:26:59 +03:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
Egor Kislitsyn
8ad015ef64
Skip deactivated users in followers import 2019-10-14 14:16:57 +07:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
Egor Kislitsyn
2c7ff32e5b
Add thread_visibility to migrations 2019-10-10 21:11:34 +07:00
lain
d7f9679ff2 Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-10 12:38:51 +00:00
Egor Kislitsyn
761ad0b48e
Split CreateFollowingRelationships to multiple migrations 2019-10-08 20:27:42 +07:00
Egor Kislitsyn
6291eaa590 Update CreateFollowingRelationships 2019-10-08 20:19:38 +07:00
rinpatch
32808208be Enable mix format for migrations 2019-10-08 15:16:39 +03:00
Egor Kislitsyn
12ebeef130
Add CreateFollowingRelationships migration 2019-10-08 18:05:23 +07:00
rinpatch
a502155274 Bump pleroma-fe bundle to 122323f35c 2019-10-07 17:42:33 +03:00
lain
e8395bedd2 Merge branch 'develop' into 'reactions'
# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
2019-10-07 12:10:27 +00:00
Ariadne Conill
19962d2022 clean up bundled litepub schema (closes #1303) 2019-10-07 11:33:58 +00:00
lain
73b6512907 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-07 12:30:59 +02:00
rinpatch
ee88afb2e2 Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
2019-10-06 18:06:04 +03:00
rinpatch
125f96e706 Fix the use of queries with a schema in a migration 2019-10-06 17:23:43 +03:00
rinpatch
fefbd31c6e Move local keys out of user.info 2019-10-06 16:56:36 +03:00
lain
61097ba6ab Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-06 08:11:47 +00:00
eugenijm
8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
lain
557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-02 13:27:55 +02:00
Mark Felder
a562cb2c34 Update AdminFE bundle 2019-10-01 18:29:39 -05:00
Ariadne Conill
28be12b38e update admin fe 2019-09-30 12:52:28 +00:00
lain
0aef18bcf4 Litepub Context: Add EmojiReaction. 2019-09-30 14:26:59 +02:00
kaniini
26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
rinpatch
1fba66178d Merge branch 'develop' into cleanup/drop-subscription-table-if-exists 2019-09-30 00:26:49 +03:00