summaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
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
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'kaniini
Add NOT NULL constraints for config table See merge request pleroma/pleroma!1892
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'kaniini
Add NOT NULL constraints for bookmarks table See merge request pleroma/pleroma!1891
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'kaniini
Add NOT NULL constraints for apps table See merge request pleroma/pleroma!1890
2019-10-27Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' ↵kaniini
into 'develop' Add NOT NULL constraints for activity_expirations table See merge request pleroma/pleroma!1889
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-23[#1304] Fixed null::jsonb handling in User.Info migration.Ivan Tashkinov
2019-10-21[#1304] Merged `develop`, handled User.Info.invisible.Ivan Tashkinov
2019-10-21Merge branch 'develop' into feature/masto_api_markersMaksim Pechnikov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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-21Merge branch 'feature/activitypub-semantics' into 'develop'kaniini
activitypub semantics See merge request pleroma/pleroma!1798
2019-10-21[#1304] Typo fix.Ivan Tashkinov
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
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-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-20add missing migration to drop websub tableAriadne Conill
2019-10-19rework to use properties instead of compound typing, per SocialCGAriadne Conill
2019-10-18Fix a migration wiping user info of users that don't have any mutesrinpatch
And introduce safe_jsonb_set
2019-10-17add Markers /api/v1/markersMaksim Pechnikov
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-08Enable `mix format` for migrationsrinpatch
2019-10-07Bump pleroma-fe bundle to ↵rinpatch
https://git.pleroma.social/pleroma/pleroma-fe/commit/122323f35c32a4f12a345a8b3f163e9318f5dea3
2019-10-07clean up bundled litepub schema (closes #1303)Ariadne Conill
2019-10-06Fix muted notification migration only working with a schemarinpatch
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-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-01Update AdminFE bundleMark Felder
2019-09-30update admin feAriadne Conill
2019-09-30Merge branch 'features/apc2s-media-upload' into 'develop'kaniini
AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706
2019-09-30Merge branch 'develop' into cleanup/drop-subscription-table-if-existsrinpatch
2019-09-29Remove subscription_notifications table if it existedrinpatch
Followup to !1741
2019-09-29Revert subscription refactoring.rinpatch
As discussed in pleroma-meta#2 This reverts commit eb9aa7aa1095de150d036839c78c402019efb4b1, reversing changes made to c4fbb56984d8f86df948cfd9b0f7c081d688c365.
2019-09-26Merge developRoman Chvanikov
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-08 08:02:45 +0000