aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-12ActivityPub: Fix non-federating blocks.lain
2020-05-11Merge branch 'fix/issue-1676' into 'develop'rinpatch
2020-05-11Merge branch 'migration-fix-markers' into 'develop'rinpatch
2020-05-11Merge branch 'chore/gettext-update' into 'develop'rinpatch
2020-05-12Gettext: remove english messages and update the pot filerinpatch
2020-05-11Migration: Fix typolain
2020-05-11Migration: Enum.chunk is deprecated.lain
2020-05-11Markers migration: Fix migration for very large list of markerslain
2020-05-11Merge branch 'fix/streamer-timeout' into 'develop'rinpatch
2020-05-11Fix streamer timeout (closes #1753).href
2020-05-11Merge branch '1439-favorite-deletion' into 'develop'lain
2020-05-11SideEffects test: Add test for favorite deletion.lain
2020-05-11Merge branch '1204-object-pruning-deletion' into 'develop'rinpatch
2020-05-11Deletion: Handle the case of pruned objects.lain
2020-05-11Merge branch 'descriptions-fix' into 'develop'lain
2020-05-11copy/paste fix for descriptionsAlexander Strizhakov
2020-05-10Merge branch 'shortening-modules-name' into 'develop'lain
2020-05-09Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'rinpatch
2020-05-09insert skeletons migration: fix for non-local localsrinpatch
2020-05-09Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'rinpatch
2020-05-09Merge branch 'fix/eldap-otp' into 'develop'rinpatch
2020-05-09include eldap in OTP releasesrinpatch
2020-05-09Merge branch 'fix/healthcheck-total-alloc' into 'develop'lain
2020-05-08healthcheck: report real amount of memory allocated by beamrinpatch
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-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