Merge branch 'trz/rebase' into trz/rename

1 files changed, 120 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fbbaf83..f18dab94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,125 @@
 ###Changelog
 
+####Version 1.10.1
+* made message correction opt-in
+* various bug fixes
+
+####Version 1.10.0
+* Support for XEP-0357: Push Notifications
+* Support for XEP-0308: Last Message Correction
+* introduced build flavors to make dependence on play-services optional
+
+####Version 1.9.4
+* prevent cleared Conversations from reloading history with MAM
+* various MAM fixes
+
+####Version 1.9.3
+* expert setting that enables host and port configuration
+* expert setting opt-out of bookmark autojoin handling
+* offer to rejoin a conference after server sent unavailable
+* internal rewrites
+
+####Version 1.9.2
+* prevent startup crash on Sailfish OS
+* minor bug fixes
+
+####Version 1.9.1
+* minor bug fixes incl. a workaround for nimbuzz.com
+
+####Version 1.9.0
+* Per conference notification settings
+* Let user decide whether to compress pictures
+* Support for XEP-0368
+* Ask user to exclude Conversations from battery optimizations
+
+####Version 1.8.4
+* prompt to trust own OMEMO devices
+* fixed rotation issues in avatar publication
+* invite non-contact JIDs to conferences
+
+####Version 1.8.3
+* brought text selection back
+
+####Version 1.8.2
+* fixed stuck at 'connecting...' bug
+* make message box behave correctly with multiple links
+
+####Version 1.8.1
+* enabled direct share on Android 6.0
+* ask for permissions on Android 6.0
+* notify on MAM catchup messages
+* bug fixes
+
+####Version 1.8.0
+* TOR/ORBOT support in advanced settings
+* show vcard avatars of participants in a conference
+
+####Version 1.7.3
+* fixed PGP encrypted file transfer
+* fixed repeating messages in slack conferences
+
+####Version 1.7.2
+* decode PGP messages in background
+
+
+####Versrion 1.7.1
+* performance improvements when opening a conversation
+
+####Version 1.7.0
+* CAPTCHA support
+* SASL EXTERNAL (client certifiates)
+* fetching MUC history via MAM
+* redownload deleted files from HTTP hosts
+* Expert setting to automatically set presence
+* bug fixes
+
+####Version 1.6.11
+* tab completion for MUC nicks
+* history export
+* bug fixes
+
+####Version 1.6.10
+* fixed facebook login
+* fixed bug with ejabberd mam
+* use official HTTP File Upload namespace
+
+####Version 1.6.9
+* basic keyboard support
+
+####Version 1.6.8
+* reworked 'enter is send' setting
+* reworked DNS server discovery on lolipop devices
+* various bug fixes
+
+####Version 1.6.7
+* bug fixes
+
+####Version 1.6.6
+* best 1.6 release yet
+
+####Version 1.6.5
+* more OMEMO fixes
+
+####Version 1.6.4
+* setting to enable white chat bubbles
+* limit OMEMO key publish attempts to work around broken PEP
+* various bug fixes
+
+####Version 1.6.3
+* bug fixes
+
+####Version 1.6.2
+* fixed issues with connection time out when server does not support ping
+
+####Version 1.6.1
+* fixed crashes
+
+####Version 1.6.0
+* new multi-end-to-multi-end encryption method
+* redesigned chat bubbles
+* show unexpected encryption changes as red chat bubbles
+* always notify in private/non-anonymous conferences
+
 ####Version 1.5.1
 * fixed rare crashes
 * improved otr support