aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-12-27 22:19:13 +0100
committerChristian Schneppe <christian@pix-art.de>2018-12-27 22:19:13 +0100
commit71350931e4289ad5ab84715dfffe7fba7573616b (patch)
treef41622478987028fdee47a52348f0b783b64cd57
parent04c3a1f08bedc201e90f6a9fc21367cc1de1a9f5 (diff)
version 2.1.5 + CHANGELOG
-rw-r--r--CHANGELOG.md4
-rw-r--r--build.gradle4
-rw-r--r--src/main/res/values/defaults.xml3
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16cfdc30b..1bf71abf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
* let the user forbid android from taking screenshots
* make PEP avatars public to play nice with Prosody 0.11
* fixed re-sending failed files in group chats
+* OMEMO stability improvements
+* context menu wen long pressing avatar in 1:1 chat
+* synchronize group chat join/leaves across multiple clients
+* fixed sending PGP encrypted messages from quick reply
* bug fixes
#### Version 2.1.4
diff --git a/build.gradle b/build.gradle
index a6c2e8d78..2afc4a57f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,8 +99,8 @@ android {
minSdkVersion 16
targetSdkVersion 28
- versionCode 249
- versionName "2.1.5 beta (2018-12-04)"
+ versionCode 250
+ versionName "2.1.5"
archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger"
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index b516e5c43..a9edc5a92 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -21,7 +21,8 @@
along with this program. If not, see https://www.gnu.org/licenses
\n\nDownload the full original source code at https://github.com/siacs/Conversations (Copyright © 2014-2018 Daniel Gultsch)
\n\nDownload the modified source code at https://github.com/kriztan/Pix-Art-Messenger
- \n\n\n\Pix-Art Messenger recommends blabber.im as provider. More information can be found at https://blabber.im
+ \n\nPix-Art Messenger recommends blabber.im as provider. More information can be found at https://blabber.im
+ \n\nYou can support me by making a donation in form of a gift in sense of § 516 ff BGB i.e. a gratuitous donation.
</string>
<string name="pref_about_libraries" translatable="false"><b>Libraries</b>
\n\nhttps://www.bouncycastle.org\n(The MIT License (MIT))