aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-10 16:30:00 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-10 16:30:00 +0100
commit4ed1bf0ca455cb365b544c31f772d585a52dc3ed (patch)
tree0238e51fa197c2161c6d264ba36f1c1acf59f778
parent58d066a54e5ed1d4f7f28f22f49826fe5b69e172 (diff)
downloadopen-keychain-4ed1bf0ca455cb365b544c31f772d585a52dc3ed.tar.gz
open-keychain-4ed1bf0ca455cb365b544c31f772d585a52dc3ed.tar.bz2
open-keychain-4ed1bf0ca455cb365b544c31f772d585a52dc3ed.zip
Version 3.2beta2
-rw-r--r--CHANGELOG13
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml4
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.html3
3 files changed, 17 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4e53864e5..da359c6c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,16 @@
+## 3.2beta2
+ * Material design
+ * Integration of QR Scanner (New permissions required)
+ * Improved key creation wizard
+ * Fix missing contacts after sync
+ * Requires Android 4
+ * Redesigned key screen
+ * Simplify crypto preferences, better selection of secure ciphers
+ * API: Detached signatures, free selection of signing key,...
+ * Fix: Some valid keys were shown revoked or expired
+ * Don't accept signatures by expired or revoked subkeys
+ * Keybase.io support in advanced view
+
## 3.1.2
* Fix key export to files (now for real)
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index bbdbdf259..5d3a106de 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain"
android:installLocation="auto"
- android:versionCode="31201"
- android:versionName="3.2beta1">
+ android:versionCode="31202"
+ android:versionName="3.2beta2">
<!--
General remarks
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index 9435441b0..dcc626feb 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
@@ -6,9 +6,10 @@ And don't add newlines before or after p tags because of transifex -->
</head>
<body>
-<h2>3.2beta1</h2>
+<h2>3.2beta2</h2>
<ul>
<li>Material design</li>
+<li>Integration of QR Scanner (New permissions required)</li>
<li>Improved key creation wizard</li>
<li>Fix missing contacts after sync</li>
<li>Requires Android 4</li>