aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2020-05-08Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-06Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-05User, Webfinger: Remove OStatus vestigeslain
Mainly the `magic_key` field
2020-05-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-04Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-02Deactivate local users on deletion instead of deleting the recordrinpatch
Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687
2020-05-02pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3rinpatch
2020-05-02PleromaFE bundle supporting follow request notifications.Ivan Tashkinov
https://git.pleroma.social/pleroma/pleroma-fe/-/commit/5f90b6a384583a00769eeca3a6c6e2deec8bdd24
2020-05-02static-fe.css: Restore and move to /priv/static/static-feHaelwenn (lanodan) Monnier
2020-05-01Update AdminFE build in preparation for the 2.0.3 releaseMark Felder
2020-05-01Updated PleromaFE bundle to prevent notifications loading issue due to ↵Ivan Tashkinov
unsupported parameter (`with_move`).
2020-05-01Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-05-01Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-01Deactivate local users on deletion instead of deleting the recordrinpatch
Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687
2020-04-29Update AdminFE build in preparation for the 2.0.3 releaseMark Felder
2020-04-22Litepub: Add ChatMessage.lain
2020-04-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-18Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'Haelwenn
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403
2020-04-17Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exsHaelwenn
2020-04-17migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, ↵Haelwenn (lanodan) Monnier
electric bongaloo
2020-04-17pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4Mark Felder
2020-04-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-17Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'rinpatch
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398
2020-04-17migrations/20200406100225_users_add_emoji: Fix tag to Emoji filteringHaelwenn (lanodan) Monnier
2020-04-17Merge branch 'feature/1584-client-captcha-options' into 'develop'Haelwenn
Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252
2020-04-16Merge branch 'develop' into features/remove-user-source_datarinpatch
2020-04-15added an endpoint for getting unread notification countMaksim Pechnikov
2020-04-15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
This reverts merge request !1877
2020-04-14Revert "Merge branch 'marker-update-fix' into 'develop'"lain
This reverts merge request !2380
2020-04-14Marker update migration: Don't try to update virtual field.lain
2020-04-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-04-10fix Oban migrationMaksim Pechnikov
2020-04-10User: remove source_dataHaelwenn (lanodan) Monnier
2020-04-10profile emojis in User.emoji instead of source_dataHaelwenn (lanodan) Monnier
2020-04-10User: Move inbox & shared_inbox to own fieldsHaelwenn (lanodan) Monnier
2020-04-10User: Move public_key from source_data to own fieldHaelwenn (lanodan) Monnier
2020-04-08pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360frinpatch
2020-04-08Update AdminFE build in preparation for Pleroma 2.0.2Mark Felder
2020-04-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-02Merge remote-tracking branch ↵Ivan Tashkinov
'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02Chats: Basic implementation.lain
2020-04-02Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-02update Oban packageMaksim Pechnikov
2020-04-01Merge branch 'update/adminfe-20200331' into 'develop'feld
Update AdminFE build in preparation for Pleroma 2.0.2 See merge request pleroma/pleroma!2343
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:11:49 +0000