added changelog for 1.0

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

build.gradle

@@ -46,8 +46,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 41
-		versionName "0.10"
+		versionCode 42
+		versionName "1.0-beta"
 	}
 
 	compileOptions {

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);