aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-27 17:17:07 +0200
committerlookshe <github@lookshe.org>2016-03-27 17:17:07 +0200
commitfd6f0a842b61b0f4d1b90f798ebc96eb7da022f0 (patch)
tree6b8f9fac3a53c6d74c6c8cb6c0f6a002187b2dbe
parent9773b16a98c946e42d39afccc6255e1f1f611aed (diff)
adjusted changelog and corrected wrong version in build.gradle due to merge
Diffstat (limited to '')
-rw-r--r--Conversations-Plus-ChangeLog.md10
-rw-r--r--build.gradle4
2 files changed, 11 insertions, 3 deletions
diff --git a/Conversations-Plus-ChangeLog.md b/Conversations-Plus-ChangeLog.md
index ca031f15..3e356265 100644
--- a/Conversations-Plus-ChangeLog.md
+++ b/Conversations-Plus-ChangeLog.md
@@ -1,5 +1,13 @@
###Conversations+ ChangeLog
+####Version 0.0.7
+* Fixes FS#139: Do not merge messages at all
+* Fixes FS#51: Change toggle in Account Management back to standard
+* Fixes FS#167: Resized images are larger than original images
+* Fixes FS#135: disable notification for received/downloaded images when link is received through mam or carbons
+* Fixes FS#156: load of mam messages result in unread messages
+* Fixes FS#166: Images cannot be opened since storing in private image folder
+
####Version 0.0.6
* Implements FS#111: Compress resized picture with PNG format
* Fixes FS#107: Account can be edited while online
@@ -30,4 +38,4 @@
* Fixes FS#66: Add option to popup menu to open message details
* Fixes FS#65: Message Details
* Fixes FS#56: Create new logo
-* Fixes FS#54: Add new options to message menu \ No newline at end of file
+* Fixes FS#54: Add new options to message menu
diff --git a/build.gradle b/build.gradle
index 7e0a5795..21c4752e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,8 +64,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 133
- versionName "1.11.1"
+ versionCode 8
+ versionName "0.0.7"
archivesBaseName += "-$versionName"
}