aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2019-10-23fix migrateMaksim Pechnikov
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-22Marker: added unread_count fieldMaksim Pechnikov
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-21Fix typosEgor Kislitsyn
2019-10-21Merge branch 'feature/activitypub-semantics' into 'develop'kaniini
activitypub semantics See merge request pleroma/pleroma!1798
2019-10-21Revert "Skip deactivated users in followers import"Egor Kislitsyn
This reverts commit 8ad015ef64e0d2a4cd9f2979ff08d28be3a635e5.
2019-10-21[#1304] Typo fix.Ivan Tashkinov
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
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-14Skip deactivated users in followers importEgor Kislitsyn
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-10Add `thread_visibility` to migrationsEgor Kislitsyn
2019-10-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-08Split CreateFollowingRelationships to multiple migrationsEgor Kislitsyn
2019-10-08Update CreateFollowingRelationshipsEgor Kislitsyn
2019-10-08Enable `mix format` for migrationsrinpatch
2019-10-08Add CreateFollowingRelationships migrationEgor Kislitsyn
2019-10-07Bump pleroma-fe bundle to ↵rinpatch
https://git.pleroma.social/pleroma/pleroma-fe/commit/122323f35c32a4f12a345a8b3f163e9318f5dea3
2019-10-07Merge branch 'develop' into 'reactions'lain
# Conflicts: # priv/static/schemas/litepub-0.1.jsonld
2019-10-07clean up bundled litepub schema (closes #1303)Ariadne Conill
2019-10-07Merge remote-tracking branch 'origin/develop' into reactionslain
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-06Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-02Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-01Update AdminFE bundleMark Felder
2019-09-30update admin feAriadne Conill
2019-09-30Litepub Context: Add EmojiReaction.lain
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
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-24litepub-0.1.jsonld: Add uploadMediaHaelwenn (lanodan) Monnier
2019-09-23Update AdminFE bundleHaelwenn (lanodan) Monnier
2019-09-17Update oban to 0.8.1rinpatch
This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 15:31:49 +0000