aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-04Add report notesMaxim Filippov
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
Removed users.info field See merge request pleroma/pleroma!2006
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28Migrations: Set users.following_count to NOT NULLlain
Also set following_count for local users to the correct value and for remote users to 0.
2019-11-23Removed users.info and remaining usages.Ivan Tashkinov
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs
2019-11-21Merge branch 'issue/1348' into 'develop'lain
[#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937
2019-11-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced ↵Ivan Tashkinov
EctoEnum.
2019-11-15Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
2019-11-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
Emoji Reactions See merge request pleroma/pleroma!1662
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-11-09Visually separate header.Phil Hagelberg
2019-11-09Move static-fe CSS to a separate file.Phil Hagelberg
2019-11-09Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642rinpatch
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-04excluded invisible actors from gets /api/v1/accounts/:idMaksim Pechnikov
2019-11-02Merge branch 'fix/migration-schema' into 'develop'Haelwenn
Fix bookmark migration using a query with a schema See merge request pleroma/pleroma!1923
2019-10-31Merge branch 'refactor/db-add-defaults' into 'develop'lain
Set defaults to fields with NULL values Closes #1358 See merge request pleroma/pleroma!1914
2019-10-30Remove following column from the migrationsRoman Chvanikov
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-29Fix two migrations sharing the same module namerinpatch
This makes ecto execute only the latter one.
2019-10-29Migrate missing follow requestskPherox
2019-10-28Move setDefaultsToTables to past to run before notNull migrationsRoman Chvanikov
2019-10-28Complete defaultsRoman Chvanikov
2019-10-28Merge branch 'develop' into feature/move-activityEgor Kislitsyn
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-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