aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java2
3 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84eb5ee0..24b431d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
###Changelog
+
+####Version 1.0
+* MUC controls (Affiliaton changes)
+* Added download button to notification
+* Improved security
+* bug fixes + code clean up
+
####Version 0.10
* Support for Message Archive Management
* Dynamically load message history
diff --git a/build.gradle b/build.gradle
index 19079c51..b4d0648a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
- versionCode 41
- versionName "0.10"
+ versionCode 42
+ versionName "1.0-beta"
}
compileOptions {
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 870ee757..501cba91 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.10";
+ public final String IDENTITY_NAME = "Conversations 1.0-beta";
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);