aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Expand)Author
2020-05-08PleromaFE bundle dropping requirement for embedded account relationships in s...Ivan Tashkinov
2020-05-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-08Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.Plero...Maksim
2020-05-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-06Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-05User, Webfinger: Remove OStatus vestigeslain
2020-05-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-04Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-02Deactivate local users on deletion instead of deleting the recordrinpatch
2020-05-02pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3rinpatch
2020-05-02PleromaFE bundle supporting follow request notifications.Ivan Tashkinov
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 unsupp...Ivan Tashkinov
2020-05-01Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
2020-05-01Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-01Deactivate local users on deletion instead of deleting the recordrinpatch
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 remake-remo...lain
2020-04-18Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'Haelwenn
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, electr...Haelwenn (lanodan) Monnier
2020-04-17pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4Mark Felder
2020-04-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-04-17Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'rinpatch
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
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 remake-remo...lain
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
2020-04-14Revert "Merge branch 'marker-update-fix' into 'develop'"lain
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 output-of-relation...Ivan Tashkinov
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
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 remake-remo...lain
2020-04-02Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotf...Ivan Tashkinov
2020-04-02Chats: Basic implementation.lain
2020-04-02Merge branch 'develop' into issue/1276Maksim Pechnikov