aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md10
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java2
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39e44fbe..84eb5ee0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
###Changelog
+####Version 0.10
+* Support for Message Archive Management
+* Dynamically load message history
+* Ability to block contacts
+* New UI to verify fingerprints
+* Ability to change password on server
+* removed stream compression
+* quiet hours
+* fixed connection issues on ipv6 servers
+
####Version 0.9.3
* bug fixes
diff --git a/build.gradle b/build.gradle
index e7cb1097..29cb3840 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 19
- versionCode 40
- versionName "0.9.3"
+ versionCode 41
+ versionName "0.10"
}
compileOptions {
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index b200b2a1..870ee757 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -23,7 +23,7 @@ public abstract class AbstractGenerator {
"http://jabber.org/protocol/disco#info",
"urn:xmpp:avatar:metadata+notify",
"urn:xmpp:ping"};
- public final String IDENTITY_NAME = "Conversations 0.9.3";
+ public final String IDENTITY_NAME = "Conversations 0.10";
public final String IDENTITY_TYPE = "phone";
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);