summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-09-17Merge branch 'release/2.1.2' into 'stable'v2.1.2rinpatch
2020-09-17pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7drinpatch
2020-09-17CHANGELOG.md: Add 2.1.2 entryrinpatch
2020-09-17mix.exs: bump version to 2.1.2rinpatch
2020-09-17Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'rinpatch
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
2020-09-17Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn
2020-09-17Merge branch 'reply-visibility-user-guard' into 'develop'lain
2020-09-17Merge branch 'bugfix/mrf-ingestion' into 'develop'rinpatch
2020-09-17Merge branch 'hotfix/rich-media-compile-error' into 'develop'rinpatch
2020-09-17Merge branch 'feat/rich-media-head' into 'develop'rinpatch
2020-09-08Merge branch 'release/2.1.1' into 'stable'v2.1.1rinpatch
2020-09-08Merge branch 'bugfix/mock' into 'develop'Haelwenn
2020-09-08pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679rinpatch
2020-09-08Merge branch 'temp-hackney-fix' into 'develop'rinpatch
2020-09-08Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch
2020-09-08CHANGELOG.md: Add 2.1.1 entryrinpatch
2020-09-08mix.exs: bump version to 2.1.1rinpatch
2020-09-08Disable favicon scraping in testsrinpatch
2020-09-08Merge branch 'fix/admin-controller-atom-leak' into 'develop'rinpatch
2020-09-08Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
2020-09-08Merge branch 'develop' into 'develop'lain
2020-09-08Merge branch 'chore/fast_html-bump' into 'develop'rinpatch
2020-09-08Merge branch 'bugfix/favicon-too-long' into 'develop'rinpatch
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-08Merge branch 'chore/fast-sanitize-bump' into 'develop'rinpatch
2020-09-08Merge branch 'http-fixes' into 'develop'rinpatch
2020-09-08Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
2020-09-08Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch
2020-09-08Merge branch 'fix/2087-metadata' into 'develop'rinpatch
2020-09-08Merge branch 'secfix/search-crash' into 'develop'rinpatch
2020-09-08Merge branch 'fix-searching-following' into 'develop'rinpatch
2020-09-08Merge branch 'fix/apc2s-limits' into 'develop'rinpatch
2020-08-28Merge branch 'release/2.1.0' into 'stable'v2.1.0lain
2020-08-28Mix: Update versionlain
2020-08-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-27Merge branch '2078-list-fixes' into 'develop'Haelwenn
2020-08-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-27Merge branch '2081-deleted-user-chats' into 'develop'lain
2020-08-27ChatController: Don't die if the recipient is gone.lain
2020-08-27Merge branch 'update/admin-fe-20200826' into 'develop'rinpatch
2020-08-26Update AdminFE build in preparation for 2.1.0 releaseMark Felder
2020-08-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-26Merge branch 'fix/fast_html-build-errors' into 'develop'rinpatch
2020-08-26Changelog: Add info about list fixes.lain
2020-08-26TimelineController: Keys are atoms now.lain
2020-08-26fix fast_html build errors with gcc 10 by bumping fast_sanitizerinpatch
2020-08-26Merge branch '2079-welcome-message-docs' into 'develop'rinpatch
2020-08-26Cheatsheet: Remove misleading examplelain
2020-08-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-19 13:56:05 +0000