9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
8d56fb6d22
Migrate in-db config after updating to Oban 2.0
2020-07-14 13:15:46 +03:00
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
2020-07-14 00:22:12 -05:00
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
a62f17da17
Add `approval_pending` field to User
2020-07-12 20:27:14 -05:00
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
5ea6387572
Merge branch 'user-search-nickname-rank-boost' into 'develop'
...
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
2020-07-10 08:49:14 +00:00
123352ffa1
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
2020-07-08 22:50:15 +03:00
013e2c5057
Use instances table instead of Cachex
2020-07-08 06:28:39 +02:00
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
465ddcfd20
migration to delete migrated tesla setting
2020-07-06 09:12:29 +03:00
37fdb05058
User, Migration: Change `accepts_chat_messages` to be nullable
...
This is to model the ambiguous state of most users.
2020-07-03 13:12:23 +02:00
8ad166e8e3
Migrations: Add `accepts_chat_messages` to users.
2020-07-03 12:46:28 +02:00
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
2020-06-24 10:42:07 +00:00
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
cb96c82f70
moving to mrf namespace migration fix
2020-06-23 20:28:48 +03:00
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
b7f297f0bd
Merge branch 'issue/1798' into 'develop'
...
[#1798 ] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
2020-06-23 10:54:15 +00:00
b0a40fc2e4
added verify RUM settings before start app
2020-06-22 17:27:49 +03:00
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
02a5648feb
fixed migration the settings to DB
2020-06-17 09:15:35 +03:00
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
2020-06-14 18:27:11 +03:00
e1bc37d118
MigrationHelper: Move notification backfilling to own module.
2020-06-09 09:20:55 +02:00
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
1a11f0e453
Chats: Change id to flake id.
2020-06-07 14:25:30 +02:00
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
9189b489ee
Migrations: Move Notification migration code to helper
2020-06-06 15:33:02 +02:00
9fa3f0b156
Notification: Change type of `type` to an enum.
2020-06-06 13:08:45 +02:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
7b79871e97
Migrations: Add chat_id, seen index to ChatMessageReferences
...
This ensures fast count of unseen messages
2020-06-03 14:34:33 +02:00
1e9efcf7c3
Migrations: Fix migration module name
2020-06-03 14:27:54 +02:00
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
8edead7c1d
Migration: Remove superfluous imports
2020-06-03 13:19:38 +02:00
6413e06a86
Migrations: Add unique index to ChatMessageReferences.
2020-06-03 13:13:44 +02:00
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
2020-06-03 12:30:12 +02:00
6cd2fa2a4c
Migrations: Add a migration to backfill notification types.
2020-06-02 15:13:19 +02:00
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
d4b20c96c4
Migrate old notification settings to new variants
2020-05-28 15:34:11 -05:00
91f73a7592
Merge branch 'notification-fixes' into 'develop'
...
Notification performance fixes
See merge request pleroma/pleroma!2595
2020-05-27 13:45:14 +00:00
73f222d76a
Migrations: Make user_id index on notifications better for query.
2020-05-27 12:56:15 +02:00
acba7043be
Migrations: Add index on client_id and client_secret for apps.
...
Greatly speeds up app lookup.
2020-05-26 16:46:57 +02:00
1be6b3056e
Use indexed split_part/3 to get a hostname rather than ts_ functions
2020-05-18 12:38:16 +03:00
8a383707ae
Merge develop
2020-05-13 19:56:40 +03:00
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-12 13:13:43 +02:00
f6aa0b4a07
Migration: Fix typo
2020-05-11 22:03:29 +02:00
f71376e30e
Migration: Enum.chunk is deprecated.
2020-05-11 22:00:01 +02:00
d8dd945a03
Markers migration: Fix migration for very large list of markers
2020-05-11 21:52:47 +02:00
c272669909
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-10 12:32:57 +02:00
0ad89762a1
insert skeletons migration: fix for non-local locals
...
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
2020-05-09 22:07:35 +03:00
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-09 11:31:34 +03:00
cbe383ae83
Update stats admin endpoint
2020-05-09 11:30:37 +03:00
0c2b09a9ba
Add migration for counter_cache table update
2020-05-08 22:08:11 +03:00
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-08 13:13:37 +02:00
b078e0567d
Merge branch 'develop' into issue/1276-2
2020-05-08 08:51:09 +03:00
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-07 15:05:40 +02:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 11:44:30 +02:00
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 10:43:20 +02:00
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
e55876409b
Deactivate local users on deletion instead of deleting the record
...
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
2020-05-02 19:05:13 +03:00
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-20 12:37:17 +02:00
79445ae5d2
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
2020-04-18 06:59:23 +00:00
d698ecef9b
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
2020-04-17 22:48:40 +00:00
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
2020-04-17 23:57:22 +02:00
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-17 15:51:24 +02:00
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
2020-04-17 13:40:25 +00:00
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
2020-04-17 14:32:15 +02:00
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-15 14:41:43 +02:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
7c060432fc
Revert "Merge branch 'marker-update-fix' into 'develop'"
...
This reverts merge request !2380
2020-04-14 16:31:30 +00:00
d8b12ffd59
Marker update migration: Don't try to update virtual field.
2020-04-14 15:06:09 +02:00
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
ad92cef844
fix Oban migration
2020-04-10 21:27:50 +03:00
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
fd97b0e634
Chats: Basic implementation.
2020-04-02 15:19:09 +02:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
2020-03-31 09:21:42 +03:00
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
2020-03-07 17:00:58 +03:00
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
2020-02-24 21:46:37 +03:00
2d5cf0f8cd
Migrations: Make them not fail for old databases
2020-02-20 16:44:31 +01:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
2019-11-30 10:42:51 +00:00
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
f0bdbe3f61
Migrations: Set users.following_count to NOT NULL
...
Also set following_count for local users to the correct value and for remote
users to 0.
2019-11-28 17:01:43 +01:00
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
2019-11-21 16:47:52 +03:00
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03:00
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
e6d7e27bd6
Add `allow_following_move` setting to User
2019-11-12 18:45:28 +07:00
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
57995fa8cf
fix migrate
...
update migrate
2019-11-03 20:44:59 +03:00
9d8da9ea15
Merge branch 'fix/migration-schema' into 'develop'
...
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
2019-11-02 15:07:47 +00:00
fd8099fb68
Merge branch 'develop' into issue/1276
2019-10-31 21:09:46 +03:00
e14cae25aa
Merge branch 'refactor/db-add-defaults' into 'develop'
...
Set defaults to fields with NULL values
Closes #1358
See merge request pleroma/pleroma!1914
2019-10-31 13:34:57 +00:00
1b82eb6d41
move sql (update_markers) from migrate to mix task
2019-10-30 23:22:38 +03:00
d719078699
Merge branch 'develop' into issue/1276
2019-10-30 23:07:18 +03:00
8bb6da7cd6
Remove following column from the migrations
2019-10-30 18:34:14 +03:00
c546da7cfe
Fix bookmark migration using a query with a schema
...
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
2019-10-30 12:59:14 +03:00
40d5fb6ef8
Add a migration to fix blocked follows
2019-10-30 15:52:37 +07:00
b27a92e8fa
Merge branch 'develop' into issue/1276
2019-10-29 22:23:19 +03:00
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
5334190056
Migrate missing follow requests
2019-10-29 19:22:34 +09:00
435d220700
Move setDefaultsToTables to past to run before notNull migrations
2019-10-28 19:17:50 +03:00
4b0893631f
Complete defaults
2019-10-28 19:16:19 +03:00
4270861085
Merge branch 'develop' into feature/move-activity
2019-10-28 15:10:47 +07:00
3c86a0ab24
Fix `SetNotNullForUsers` migration
2019-10-28 14:45:50 +07:00
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
0be9cb086b
Add migration
2019-10-27 19:29:35 +03:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
175f6c8355
Add migration
2019-10-26 22:59:24 +03:00
bdb2039453
Add migration
2019-10-26 22:58:37 +03:00
f5f9197fce
Add migration
2019-10-26 22:57:43 +03:00
2e608f7cbf
Add migration
2019-10-26 22:56:48 +03:00
2810729218
Add migration
2019-10-26 22:55:29 +03:00
cf72b7649e
Add migration
2019-10-26 22:54:37 +03:00
a4cf664385
Add migration
2019-10-26 22:53:41 +03:00
776c31267f
Add migration
2019-10-26 22:52:49 +03:00
c0b0fb19c8
Add migration
2019-10-26 22:50:52 +03:00
5fece5f8bc
Put correct migration
2019-10-26 22:49:37 +03:00
d58cca5f0a
Add migration
2019-10-26 22:46:09 +03:00
cf0fa124a2
Add migration
2019-10-26 22:45:24 +03:00
13cc52dc60
Add migration
2019-10-26 22:44:42 +03:00
55203c198b
Add migration
2019-10-26 22:43:32 +03:00
b85bee32da
Add migration
2019-10-26 22:42:24 +03:00
b33aacc4fb
Add migration
2019-10-26 22:40:51 +03:00
382e83fab5
Add migration
2019-10-26 22:39:24 +03:00
0223dc4e02
Add migration
2019-10-26 22:38:07 +03:00
d12555a69e
Add migration
2019-10-26 22:37:30 +03:00
7ac42fefe3
Add migration
2019-10-26 22:36:43 +03:00
c1ff8472fd
Add migration
2019-10-26 22:33:18 +03:00
5cb03fe801
Add migration
2019-10-26 22:32:31 +03:00
cd0218c205
Add migration
2019-10-26 22:31:25 +03:00
6e7fd364a4
Add migration
2019-10-26 22:28:18 +03:00
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
b777083f3f
Add `also_known_as` field to Pleroma.User
2019-10-25 19:14:18 +07:00
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
99cf1ef9be
Merge branch 'develop' into issue/1276
2019-10-24 09:23:59 +03:00
d3fb9e02cc
add tests
2019-10-23 22:48:04 +03:00
aa64b3108b
fix migrate
2019-10-23 22:02:59 +03:00
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
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
2019-10-23 17:15:48 +03:00
d4270397dc
Marker: added unread_count field
2019-10-22 14:51:46 +03:00
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
2019-10-21 11:58:22 +03:00
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
f726d953d5
Fix typos
2019-10-21 14:56:39 +07:00
e37d4b2ddf
Revert "Skip deactivated users in followers import"
...
This reverts commit 8ad015ef64
2019-10-21 14:52:52 +07:00
75da202ab7
[ #1304 ] Typo fix.
2019-10-21 10:20:28 +03:00
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
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
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
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
34754938ba
add missing migration to drop websub table
2019-10-20 10:39:03 +00:00
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
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
8ad015ef64
Skip deactivated users in followers import
2019-10-14 14:16:57 +07:00
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
2c7ff32e5b
Add `thread_visibility` to migrations
2019-10-10 21:11:34 +07:00
761ad0b48e
Split CreateFollowingRelationships to multiple migrations
2019-10-08 20:27:42 +07:00
6291eaa590
Update CreateFollowingRelationships
2019-10-08 20:19:38 +07:00
32808208be
Enable `mix format` for migrations
2019-10-08 15:16:39 +03:00
12ebeef130
Add CreateFollowingRelationships migration
2019-10-08 18:05:23 +07:00
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
125f96e706
Fix the use of queries with a schema in a migration
2019-10-06 17:23:43 +03:00
fefbd31c6e
Move local keys out of `user.info`
2019-10-06 16:56:36 +03:00
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-05 20:12:00 +03:00
1fba66178d
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
2019-09-30 00:26:49 +03:00
81b4243173
Remove subscription_notifications table if it existed
...
Followup to !1741
2019-09-29 23:52:40 +03:00
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
2019-09-17 13:04:43 +03:00
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
2019-09-16 07:39:58 +00:00
ac4a748fad
Disallow NULLs in deliveries
2019-09-13 19:28:35 +03:00
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-24 09:29:54 +03:00
05e7d0a438
Add an index on object likes
...
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
2019-08-23 03:17:20 +03:00
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
Mark Felder