sadposter [Mon, 4 Nov 2019 18:20:19 +0000 (18:20 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Mon, 4 Nov 2019 16:28:55 +0000 (16:28 +0000)]
Merge branch 'failing-search-fixes' into 'develop'
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
lain [Mon, 4 Nov 2019 15:59:36 +0000 (15:59 +0000)]
Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'
Add `pleroma.direct_conversation_id` to the `conversation` event payload
See merge request pleroma/pleroma!1925
lain [Mon, 4 Nov 2019 15:57:41 +0000 (16:57 +0100)]
User Search: Remove superfluous setweight and random test.
The test tested for a behavior that isn't actually enforced anymore.
eugenijm [Thu, 31 Oct 2019 00:44:27 +0000 (03:44 +0300)]
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
lain [Mon, 4 Nov 2019 15:19:29 +0000 (15:19 +0000)]
Merge branch 'transmogrifier-test-errors' into 'develop'
capture test log where errors are expected
See merge request pleroma/pleroma!1915
lain [Mon, 4 Nov 2019 15:18:32 +0000 (15:18 +0000)]
Merge branch 'missing-tesla-mocks' into 'develop'
add missing tesla mocks
See merge request pleroma/pleroma!1879
Steven Fuchs [Mon, 4 Nov 2019 15:18:32 +0000 (15:18 +0000)]
add missing tesla mocks
kaniini [Mon, 4 Nov 2019 14:52:56 +0000 (14:52 +0000)]
Merge branch 'chore/update-fast-sanitize' into 'develop'
mix: update fast_sanitize dependency to
1af67547
Closes #1372
See merge request pleroma/pleroma!1934
Ariadne Conill [Mon, 4 Nov 2019 14:38:14 +0000 (08:38 -0600)]
mix: update fast_sanitize dependency to
1af67547
kaniini [Mon, 4 Nov 2019 14:24:21 +0000 (14:24 +0000)]
Merge branch 'faster-user-deactivation' into 'develop'
User: Don't pull remote users follower count immediately after deactivating.
Closes #1369
See merge request pleroma/pleroma!1933
lain [Mon, 4 Nov 2019 14:11:44 +0000 (14:11 +0000)]
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity
See merge request pleroma/pleroma!1849
lain [Mon, 4 Nov 2019 13:36:54 +0000 (14:36 +0100)]
User: Don't pull remote users follower count immediately after deactivating.
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
kaniini [Sun, 3 Nov 2019 22:00:50 +0000 (22:00 +0000)]
Merge branch 'chore/update-fast-sanitize' into 'develop'
update fast sanitize dependency
See merge request pleroma/pleroma!1932
Ariadne Conill [Sun, 3 Nov 2019 21:41:30 +0000 (15:41 -0600)]
update fast sanitize dependency
rinpatch [Sun, 3 Nov 2019 17:09:57 +0000 (17:09 +0000)]
Merge branch 'bugfix/streamer-follows' into 'develop'
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
kaniini [Sun, 3 Nov 2019 16:19:27 +0000 (16:19 +0000)]
Merge branch 'feature/omit-relay-user' into 'develop'
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
kaniini [Sun, 3 Nov 2019 16:18:19 +0000 (16:18 +0000)]
Merge branch 'feature/fast_sanitize' into 'develop'
Switching to FastSanitize
See merge request pleroma/pleroma!1916
Ariadne Conill [Sun, 3 Nov 2019 15:05:12 +0000 (09:05 -0600)]
streamer: use direct object for filter checks when there is no valid child object in an activity
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
Haelwenn [Sat, 2 Nov 2019 15:07:47 +0000 (15:07 +0000)]
Merge branch 'fix/migration-schema' into 'develop'
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
rinpatch [Fri, 1 Nov 2019 17:58:24 +0000 (20:58 +0300)]
Bump fast_sanitize version
kaniini [Fri, 1 Nov 2019 17:56:20 +0000 (17:56 +0000)]
Merge branch 'fix/moderation-log-crash' into 'develop'
Fix moderation log crash
Closes #1345
See merge request pleroma/pleroma!1929
Maxim Filippov [Fri, 1 Nov 2019 16:13:29 +0000 (19:13 +0300)]
Fix moderation log crash
Maxim Filippov [Fri, 1 Nov 2019 12:14:43 +0000 (15:14 +0300)]
Undo dialyzer fix
kaniini [Fri, 1 Nov 2019 12:06:44 +0000 (12:06 +0000)]
Merge branch 'fix-recipients-from-activity' into 'develop'
Fix duplicate recipients from activity
See merge request pleroma/pleroma!1921
lain [Thu, 31 Oct 2019 13:34:57 +0000 (13:34 +0000)]
Merge branch 'refactor/db-add-defaults' into 'develop'
Set defaults to fields with NULL values
Closes #1358
See merge request pleroma/pleroma!1914
Maxim Filippov [Thu, 31 Oct 2019 12:34:49 +0000 (15:34 +0300)]
Fix count
Maxim Filippov [Wed, 30 Oct 2019 23:26:02 +0000 (02:26 +0300)]
AdminAPI: Omit relay user from users list
Maxim Filippov [Wed, 30 Oct 2019 23:25:15 +0000 (02:25 +0300)]
Fix "the call ... will never return" warning
Mark Felder [Wed, 30 Oct 2019 22:57:08 +0000 (17:57 -0500)]
Bump fast_sanitize dependency so this builds on more than just Linux
Mark Felder [Wed, 30 Oct 2019 22:51:15 +0000 (17:51 -0500)]
Merge branch 'develop' into feature/fast_sanitize
Roman Chvanikov [Wed, 30 Oct 2019 15:34:14 +0000 (18:34 +0300)]
Remove following column from the migrations
kPherox [Wed, 30 Oct 2019 11:14:07 +0000 (20:14 +0900)]
Update test for get_recipients_from_activity
rinpatch [Wed, 30 Oct 2019 10:59:25 +0000 (10:59 +0000)]
Merge branch 'fix/blocked-follows' into 'develop'
Add a migration to fix blocked follows
Closes #1359
See merge request pleroma/pleroma!1922
rinpatch [Wed, 30 Oct 2019 09:59:14 +0000 (12:59 +0300)]
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.
sadposter [Wed, 30 Oct 2019 09:26:23 +0000 (09:26 +0000)]
tos
Egor Kislitsyn [Wed, 30 Oct 2019 08:52:37 +0000 (15:52 +0700)]
Add a migration to fix blocked follows
kPherox [Wed, 30 Oct 2019 06:40:25 +0000 (15:40 +0900)]
Fix duplicate recipients
rinpatch [Wed, 30 Oct 2019 06:20:13 +0000 (09:20 +0300)]
Rip out the rest of htmlsanitizeex
rinpatch [Tue, 29 Oct 2019 17:58:54 +0000 (20:58 +0300)]
Remove commented-out code
rinpatch [Tue, 29 Oct 2019 17:49:32 +0000 (20:49 +0300)]
Fix XSS emoji test
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 14:00:03 +0000 (17:00 +0300)]
Bump fast_sanitize dependency
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.
sadposter [Tue, 29 Oct 2019 13:12:38 +0000 (13:12 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter [Tue, 29 Oct 2019 11:01:50 +0000 (11:01 +0000)]
fe
sadposter [Tue, 29 Oct 2019 10:47:37 +0000 (10:47 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
kPherox [Tue, 29 Oct 2019 10:16:34 +0000 (19:16 +0900)]
Migrate missing follow requests
rinpatch [Tue, 29 Oct 2019 10:05:20 +0000 (13:05 +0300)]
Bump fast_sanitize version
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
rinpatch [Mon, 28 Oct 2019 22:21:00 +0000 (01:21 +0300)]
Add fast_sanitize to dependencies
rinpatch [Mon, 28 Oct 2019 22:18:08 +0000 (01:18 +0300)]
Switch from HtmlSanitizeEx to FastSanitize
rinpatch [Mon, 28 Oct 2019 22:16:57 +0000 (01:16 +0300)]
Ensure myhtmlex is started before swarm
Otherwise swarm is going to attempt resizing the cluster and timeout
rinpatch [Mon, 28 Oct 2019 22:16:22 +0000 (01:16 +0300)]
Blacklist myhtmlex nodes from swarm
rinpatch [Mon, 28 Oct 2019 22:15:28 +0000 (01:15 +0300)]
Use the default scrubber before mediaproxy transformation
stwf [Mon, 28 Oct 2019 16:51:58 +0000 (12:51 -0400)]
capture where errors are expected
Roman Chvanikov [Mon, 28 Oct 2019 16:17:50 +0000 (19:17 +0300)]
Move setDefaultsToTables to past to run before notNull migrations
Roman Chvanikov [Mon, 28 Oct 2019 16:16:19 +0000 (19:16 +0300)]
Complete defaults
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
Roman Chvanikov [Sun, 27 Oct 2019 16:29:35 +0000 (19:29 +0300)]
Add migration
Maxim Filippov [Sun, 27 Oct 2019 13:33:58 +0000 (16:33 +0300)]
Fix report parsing
Maxim Filippov [Sun, 27 Oct 2019 13:17:37 +0000 (16:17 +0300)]
Make sure incoming flags are updated with status data
Maxim Filippov [Sun, 27 Oct 2019 13:11:25 +0000 (16:11 +0300)]
Merge branch 'develop' into feature/store-statuses-data-inside-flag
Maxim Filippov [Sun, 27 Oct 2019 13:05:32 +0000 (16:05 +0300)]
Strip status data from Flag (when federating or closing/resolving report)
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
projects / akkoma / log