aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/raw/help_changelog.html
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-15 20:02:57 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-15 20:02:57 +0100
commit4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch)
tree63a051fb595d168f8ddbfd76a51bb2319889d40b /OpenKeychain/src/main/res/raw/help_changelog.html
parentba7d8a58673d55660bc7faf68970229f17458514 (diff)
parentdb39b779c984a758e13adc16837893509f3b364f (diff)
downloadopen-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz
open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2
open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip
Merge branch 'development' into linked-identities
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw/help_changelog.html')
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.html15
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index 2cc93bc38..dcc626feb 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
@@ -6,6 +6,21 @@ And don't add newlines before or after p tags because of transifex -->
</head>
<body>
+<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>
+<li>Redesigned key screen</li>
+<li>Simplify crypto preferences, better selection of secure ciphers</li>
+<li>API: Detached signatures, free selection of signing key,...</li>
+<li>Fix: Some valid keys were shown revoked or expired</li>
+<li>Don't accept signatures by expired or revoked subkeys</li>
+<li>Keybase.io support in advanced view</li>
+</ul>
+
<h2>3.1.2</h2>
<ul>
<li>Fix key export to files (now for real)</li>