aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
AgeCommit message (Collapse)Author
2020-02-10Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-08Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation
2020-02-08[#1505] Added tests, changelog entry, tweaked config settings related to ↵Ivan Tashkinov
replies output on outgoing federation.
2020-02-08Merge branch 'fix/upload-limit-otp' into 'develop'lain
Actually fix upload limit on OTP releases Closes #1109 See merge request pleroma/pleroma!2185
2020-02-07Actually fix upload limit on OTP releasesrinpatch
Closes #1109
2020-02-07Merge branch 'cancel-follow-request' into 'develop'Haelwenn
Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175
2020-02-07EmojiReactions: Add docs and ChangelogLain Soykaf
2020-02-06Merge branch 'mastoapi-non-html-strings' into 'develop'feld
mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167
2020-02-06Update CHANGELOGEgor Kislitsyn
2020-02-05Apply suggestion to CHANGELOG.mdAlexander Strizhakov
2020-02-05removing migrate_from_db endpoint from admin apiAlexander Strizhakov
2020-02-02mastodon API: do not sanitize html in non-html fieldsrinpatch
2020-01-31Make attachments cleanup optionalRoman Chvanikov
2020-01-30Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'rinpatch
Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064
2020-01-30Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhostrinpatch
2020-01-30Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'lain
Re-enable rate limiter and enable remote ip See merge request pleroma/pleroma!2164
2020-01-30Merge branch 'emoji-reactions-reacted' into 'develop'rinpatch
Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160
2020-01-30config.exs: Re-enable rate limiter and enable remote iprinpatch
2020-01-29Update confusing changelog message for attachments cleanupRoman Chvanikov
2020-01-29Emoji Reactions: Document changeslain
2020-01-28Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-28Merge branch 'features/task-test-email' into 'develop'lain
Create pleroma.email mix task Closes #1061 See merge request pleroma/pleroma!2118
2020-01-28Create pleroma.email mix taskHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-27Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-24Document dynamic_configuration breaking changeMark Felder
2020-01-24Emoji reactions: Update docs and changeloglain
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23truncate config table on migrate to db taskAlexander Strizhakov
2020-01-23Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-22Update changeloglain
2020-01-22Update CHANGELOGEgor Kislitsyn
2020-01-22Emoji reactions: Document changeslain
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
emoji-reaction-extensions
2020-01-20Update changeloglain
2020-01-20StatusView: Add `emoji_reactions`lain
2020-01-20Check for unapplied migrations on startuprinpatch
Closes #1328
2020-01-15Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks
2020-01-15Merge branch 'develop' into 'feature/tag_feed'lain
# Conflicts: # CHANGELOG.md
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-14Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-12Delete attachments when status is deletedRoman Chvanikov
2020-01-12Merge branch 'updated-at-on-conversation-read' into 'develop'feld
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.