aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-19log captureAlexander Strizhakov
2020-11-19test fixesAlexander Strizhakov
2020-11-19changelog entries for fixesAlexander Strizhakov
2020-11-19fix for mastodon forwarded reportsAlexander Strizhakov
2020-11-19formattingAlexander Strizhakov
2020-11-19fix for forwarded reportsAlexander Strizhakov
2020-11-18Merge branch 'revert-da4660d2' into 'develop'feld
2020-11-18Update AdminFE build to pleroma/admin-fe@c18f167a124c31ab2e1dfbf432ac482b17c0...Mark Felder
2020-11-18Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"feld
2020-11-18Merge branch 'develop' into 'hide-muted-reactions'minibikini
2020-11-18Fixed emoji reactions not being filtered from blocked and muted accountsMark Felder
2020-11-18Merge branch 'fix/mix-task-user-delete_activities' into 'develop'feld
2020-11-18Merge branch 'fix/webpush-and-emojireact' into 'develop'lain
2020-11-18Apply 1 suggestion(s) to 1 file(s)lain
2020-11-18Merge branch 'frontend-admin-api' into 'develop'lain
2020-11-18Changelog: Move api info to api heading.lain
2020-11-18fix testsMaksim Pechnikov
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-17Merge branch 'update/admin-fe-20201117' into 'develop'feld
2020-11-17Update AdminFE build to pleroma/admin-fe@5b38aea2790686647a39f505864331bb9838...Mark Felder
2020-11-17Add test for POST when push is disabledMark Felder
2020-11-17Revert adding extra alert types hereMark Felder
2020-11-17Fix incorrect test descriptionMark Felder
2020-11-17CredoMark Felder
2020-11-17Test that we ignore invalid subscription alert types separately.Mark Felder
2020-11-17Ensure all supported push notification subscription alert types are testedMark Felder
2020-11-17Synchronize reaction notification text with PleromaFE's styleMark Felder
2020-11-17Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push...Mark Felder
2020-11-17Update OpenAPI spec/schema and test to verify support for pleroma:emoji_react...Mark Felder
2020-11-17SpellingMark Felder
2020-11-17Document the API extensions for push subscriptionsMark Felder
2020-11-17Allow subscribing for pleroma:emoji_reaction push notificationsMark Felder
2020-11-17Add capability for emoji reaction push notificationsMark Felder
2020-11-17Docs: Add info about frontend install error responselain
2020-11-17FrontendController: Return error on installation error.lain
2020-11-17Document fixing the pleroma.user delete_activities mix taskMark Felder
2020-11-17Need to start web_resp cache or mix task failsMark Felder
2020-11-17Merge branch 'remove/fedsockets' into 'develop'feld
2020-11-17Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'rinpatch
2020-11-17Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn
2020-11-17Merge remote-tracking branch 'origin/develop' into hide-muted-reactionsEgor Kislitsyn
2020-11-17Merge branch 'develop' into hide-muted-reactionsEgor Kislitsyn
2020-11-17Remove FedSocketsrinpatch
2020-11-17Merge branch 'chores/note-handling-move' into 'develop'lain
2020-11-17Merge branch 'feature/local-only-scope' into 'develop'lain
2020-11-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/loc...lain