aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-08Merge branch 'chore/changelog-sync' into 'develop'rinpatch
2020-05-08CHANGELOG.md: Add entries from 2.0.3rinpatch
2020-05-08Merge branch 'chore/description-grammar' into 'develop'feld
2020-05-08Minor grammar nitMark Felder
2020-05-08Merge branch 'fix/adminfe-icons' into 'develop'feld
2020-05-08Restore deleted icons. No idea how this happened.Mark Felder
2020-05-08Merge remote-tracking branch 'remotes/origin/develop' into restricted-relatio...Ivan Tashkinov
2020-05-08PleromaFE bundle dropping requirement for embedded account relationships in s...Ivan Tashkinov
2020-05-08Merge branch 'bugfix/fix-like-notifications' into 'develop'rinpatch
2020-05-08Merge branch 'feature/emojireactvalidator' into 'develop'lain
2020-05-08Transmogrifier tests: Remove more double tests.lain
2020-05-08Transmogrifier tests: Remove double tests.lain
2020-05-08fixed 'source' object in verify_credentialsMaksim Pechnikov
2020-05-08Builder: Extract common features of likes and reactions.lain
2020-05-08Merge branch 'issue/1276-2' into 'develop'lain
2020-05-08revert mix.lockMaksim Pechnikov
2020-05-08Merge branch 'fix/privacy-notification' into 'develop'lain
2020-05-08Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-07Merge branch 'feature/restrict-c2s' into 'develop'Haelwenn
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emo...lain
2020-05-07Merge branch 'feature/undo-validator-reduced' into 'develop'rinpatch
2020-05-07Test Direct, Public, and Favorite notifications with privacy optionMark Felder
2020-05-07Merge branch 'openapi/search' into 'develop'lain
2020-05-07Merge branch 'fix/streamer-wrong-arg-order' into 'develop'rinpatch
2020-05-07Streamer: Fix wrong argument order when rendering activities to authenticated...rinpatch
2020-05-07Credo fixeslain
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emo...lain
2020-05-07Merge fixes.lain
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/und...lain
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/und...lain
2020-05-07Merge branch 'fix/downgraded-deps' into 'develop'rinpatch
2020-05-07Restore mix.lock after 2FA mergerinpatch
2020-05-07Apply suggestion to lib/pleroma/notification.exlain
2020-05-07Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.exlain
2020-05-07Notifications: Simplify recipient calculation for some Activities.lain
2020-05-07Add OpenAPI spec for SearchControllerEgor Kislitsyn
2020-05-07Add schema for TagEgor Kislitsyn
2020-05-07Merge branch 'openapi/polls' into 'develop'lain
2020-05-07Merge branch 'streamer-worker-registry' into 'develop'lain
2020-05-07Streamer reworkhref
2020-05-07Merge branch 'issue/209' into 'develop'lain
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.Plero...Maksim
2020-05-06Hide the sender when privacy option is enabledMark Felder
2020-05-06Privacy option affects all push notifications, not just Direct MessagesMark Felder
2020-05-06Merge branch 'fix/syslog-compile' into 'develop'lain
2020-05-06fix for syslog compile with updated rebar3Alexander Strizhakov
2020-05-06Merge branch 'docs/chat-in-cheatsheet' into 'develop'feld
2020-05-06Merge branch 'feature/delete-validator' into 'develop'rinpatch
2020-05-06Add :chat to cheatsheetMark Felder
2020-05-06Merge branch 'fix/apache-cert-chain' into 'develop'feld