aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30Merge branch 'fix/blocked-follows' into 'develop'rinpatch
Add a migration to fix blocked follows Closes #1359 See merge request pleroma/pleroma!1922
2019-10-30Fix bookmark migration using a query with a schemarinpatch
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-30Add a migration to fix blocked followsEgor Kislitsyn
2019-10-30Fix duplicate recipientskPherox
2019-10-30Rip out the rest of htmlsanitizeexrinpatch
2019-10-29Remove commented-out coderinpatch
2019-10-29Fix XSS emoji testrinpatch
2019-10-29Merge branch 'fix/migrations-same-module-name' into 'develop'rinpatch
Fix two migrations sharing the same module name See merge request pleroma/pleroma!1919
2019-10-29Bump fast_sanitize dependencyrinpatch
2019-10-29Fix two migrations sharing the same module namerinpatch
This makes ecto execute only the latter one.
2019-10-29Merge branch 'fix-follow-requests' into 'develop'rinpatch
FIx follow requests Closes #1357 See merge request pleroma/pleroma!1918
2019-10-29Migrate missing follow requestskPherox
2019-10-29Bump fast_sanitize versionrinpatch
2019-10-29Add test follow activity for locked accountkPherox
2019-10-29Add pending to handle incoming for Follow activitykPherox
2019-10-29Add fast_sanitize to dependenciesrinpatch
2019-10-29Switch from HtmlSanitizeEx to FastSanitizerinpatch
2019-10-29Ensure myhtmlex is started before swarmrinpatch
Otherwise swarm is going to attempt resizing the cluster and timeout
2019-10-29Blacklist myhtmlex nodes from swarmrinpatch
2019-10-29Use the default scrubber before mediaproxy transformationrinpatch
2019-10-28capture where errors are expectedstwf
2019-10-28Move setDefaultsToTables to past to run before notNull migrationsRoman Chvanikov
2019-10-28Complete defaultsRoman Chvanikov
2019-10-28Merge branch 'fix/migration' into 'develop'lain
Fix `SetNotNullForUsers` migration See merge request pleroma/pleroma!1913
2019-10-28Fix `SetNotNullForUsers` migrationEgor Kislitsyn
2019-10-28Merge branch 'refactor/following-relationships' into 'develop'lain
Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814
2019-10-27Add migrationRoman Chvanikov
2019-10-27Fix report parsingMaxim Filippov
2019-10-27Make sure incoming flags are updated with status dataMaxim Filippov
2019-10-27Merge branch 'develop' into feature/store-statuses-data-inside-flagMaxim Filippov
2019-10-27Strip status data from Flag (when federating or closing/resolving report)Maxim Filippov
2019-10-27Merge branch 'improve-user-info-migration' into 'develop'kaniini
User info migration improvements See merge request pleroma/pleroma!1887
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'kaniini
Add NOT NULL constraints for users table See merge request pleroma/pleroma!1910
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into ↵kaniini
'develop' Add NOT NULL constraints for user_invite_tokens table See merge request pleroma/pleroma!1909
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'kaniini
Add NOT NULL constraints for thread_mutes table See merge request pleroma/pleroma!1908
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' ↵kaniini
into 'develop' Add NOT NULL constraints for scheduled_activities table See merge request pleroma/pleroma!1907
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'kaniini
Add NOT NULL constraints for registrations table See merge request pleroma/pleroma!1906
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into ↵kaniini
'develop' Add NOT NULL constraints for push_subscriptions table See merge request pleroma/pleroma!1905
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' ↵kaniini
into 'develop' Add NOT NULL constraints for password_reset_tokens table See merge request pleroma/pleroma!1904
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'kaniini
Add NOT NULL constraints for objects table See merge request pleroma/pleroma!1903
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