diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/raw | |
parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/raw')
-rw-r--r-- | OpenKeychain/src/main/res/raw/help_about.html | 29 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/raw/help_changelog.html | 164 |
2 files changed, 104 insertions, 89 deletions
diff --git a/OpenKeychain/src/main/res/raw/help_about.html b/OpenKeychain/src/main/res/raw/help_about.html index a9178d515..580ac5865 100644 --- a/OpenKeychain/src/main/res/raw/help_about.html +++ b/OpenKeychain/src/main/res/raw/help_about.html @@ -9,40 +9,41 @@ And don't add newlines before or after p tags because of transifex --> <p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p> <p>License: GPLv3+</p> -<h2>Developers OpenKeychain</h2> +<h2>Developers</h2> <ul> -<li>Dominik Schürmann (Lead developer)</li> -<li>Ash Hughes (crypto patches)</li> +<li>Dominik Schürmann (Maintainer)</li> +<li>Art O Cathain</li> +<li>Ash Hughes</li> <li>Brian C. Barnes</li> -<li>Bahtiar 'kalkin' Gadimov (UI)</li> +<li>Bahtiar 'kalkin' Gadimov</li> +<li>Daniel Albert <li>Daniel Hammann</li> <li>Daniel Haß</li> <li>Greg Witczak</li> +<li>'mar-v-in'</li> +<li>Markus Doits</li> <li>Miroojin Bakshi</li> <li>Nikhil Peter Raj</li> <li>Paul Sarbinowski</li> +<li>'Senecaso'</li> <li>Sreeram Boyapati</li> -<li>Vincent Breitmoser</li> +<li>Thialfihar (APG 1.x)</li> <li>Tim Bray</li> -</ul> - -<h2>Developers APG 1.x</h2> -<ul> -<li>Thialfihar (Lead developer)</li> -<li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Markus Doits</li> +<li>Vincent Breitmoser</li> </ul> <h2>Libraries</h2> <ul> <li><a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> <li><a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> +<li><a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li> +<li><a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li> +<li><a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li> +<li><a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li> <li><a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> -<li><a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li> <li><a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> <li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> <li><a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> -<li><a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> </ul> </body> </html> diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html index 779aa696f..b2c798615 100644 --- a/OpenKeychain/src/main/res/raw/help_changelog.html +++ b/OpenKeychain/src/main/res/raw/help_changelog.html @@ -5,6 +5,20 @@ And don't add newlines before or after p tags because of transifex --> <head> </head> <body> +<h2>2.8</h2> +<ul> +<li>So many bugs have been fixed in this release that we focus on the main new features</li> +<li>Key edit: awesome new design, key revocation</li> +<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li> +<li>New first time screen</li> +<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li> +<li>File encryption: awesome new design, support for encrypting multiple files</li> +<li>New icons to show status of key (by Brennan Novak)</li> +<li>Important bug fix: Importing of large key collections from a file is now possible</li> +<li>Notification showing cached passphrases</li> +</ul> +<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p> + <h2>2.7</h2> <ul> <li>Purple! (Dominik, Vincent)</li> @@ -16,23 +30,23 @@ And don't add newlines before or after p tags because of transifex --> <h2>2.6.1</h2> <ul> -<li>some fixes for regression bugs</li> +<li>Some fixes for regression bugs</li> </ul> <h2>2.6</h2> <ul> -<li>key certifications (thanks to Vincent Breitmoser)</li> -<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li> -<li>new design for signature verification</li> -<li>custom key length (thanks to Greg Witczak)</li> -<li>fix share-functionality from other apps</li> +<li>Key certifications (thanks to Vincent Breitmoser)</li> +<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li> +<li>New design for signature verification</li> +<li>Custom key length (thanks to Greg Witczak)</li> +<li>Fix share-functionality from other apps</li> </ul> <h2>2.5</h2> <ul> -<li>fix decryption of symmetric pgp messages/files</li> -<li>refactored edit key screen (thanks to Ash Hughes)</li> -<li>new modern design for encrypt/decrypt screens</li> +<li>Fix decryption of symmetric pgp messages/files</li> +<li>Refactored edit key screen (thanks to Ash Hughes)</li> +<li>New modern design for encrypt/decrypt screens</li> <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li> </ul> @@ -41,48 +55,48 @@ And don't add newlines before or after p tags because of transifex --> Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> <ul> -<li>new unified key list</li> -<li>colorized key fingerprint</li> -<li>support for keyserver ports</li> -<li>deactivate possibility to generate weak keys</li> -<li>much more internal work on the API</li> -<li>certify user ids</li> -<li>keyserver query based on machine-readable output</li> -<li>lock navigation drawer on tablets</li> -<li>suggestions for emails on creation of keys</li> -<li>search in public key lists</li> -<li>and much more improvements and fixes…</li> +<li>New unified key list</li> +<li>Colorized key fingerprint</li> +<li>Support for keyserver ports</li> +<li>Deactivate possibility to generate weak keys</li> +<li>Much more internal work on the API</li> +<li>Certify user ids</li> +<li>Keyserver query based on machine-readable output</li> +<li>Lock navigation drawer on tablets</li> +<li>Suggestions for emails on creation of keys</li> +<li>Search in public key lists</li> +<li>And much more improvements and fixes…</li> </ul> <h2>2.3.1</h2> <ul> -<li>hotfix for crash when upgrading from old versions</li> +<li>Hotfix for crash when upgrading from old versions</li> </ul> <h2>2.3</h2> <ul> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> -<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> -<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> -<li>querying keyservers directly from the import screen</li> -<li>fix layout and dialog style on Android 2.2-3.0</li> -<li>fix crash on keys with empty user ids</li> -<li>fix crash and empty lists when coming back from signing screen</li> +<li>Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>Fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>More internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>Querying keyservers directly from the import screen</li> +<li>Fix layout and dialog style on Android 2.2-3.0</li> +<li>Fix crash on keys with empty user ids</li> +<li>Fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>fix upload of key from signing screen</li> +<li>Fix upload of key from signing screen</li> </ul> <h2>2.2</h2> <ul> -<li>new design with navigation drawer</li> -<li>new public key list design</li> -<li>new public key view</li> -<li>bug fixes for importing of keys</li> -<li>key cross-certification (thanks to Ash Hughes)</li> -<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li> -<li>first version with new languages (thanks to the contributors on Transifex)</li> -<li>sharing of keys via QR Codes fixed and improved</li> -<li>package signature verification for API</li> +<li>New design with navigation drawer</li> +<li>New public key list design</li> +<li>New public key view</li> +<li>Bug fixes for importing of keys</li> +<li>Key cross-certification (thanks to Ash Hughes)</li> +<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li> +<li>First version with new languages (thanks to the contributors on Transifex)</li> +<li>Sharing of keys via QR Codes fixed and improved</li> +<li>Package signature verification for API</li> </ul> <h2>2.1.1</h2> @@ -92,73 +106,73 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa <h2>2.1</h2> <ul> -<li>lots of bug fixes</li> -<li>new API for developers</li> +<li>Lots of bug fixes</li> +<li>New API for developers</li> <li>PRNG bug fix by Google</li> </ul> <h2>2.0</h2> <ul> -<li>complete redesign</li> -<li>share public keys via qr codes, nfc beam</li> -<li>sign keys</li> -<li>upload keys to server</li> -<li>fixes import issues</li> -<li>new AIDL API</li> +<li>Complete redesign</li> +<li>Share public keys via qr codes, nfc beam</li> +<li>Sign keys</li> +<li>Upload keys to server</li> +<li>Fixes import issues</li> +<li>New AIDL API</li> </ul> <h2>1.0.8</h2> <ul> -<li>basic keyserver support</li> -<li>app2sd</li> -<li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> -<li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> -<li>bugfixes</li> -<li>optimizations</li> +<li>Basic keyserver support</li> +<li>App2sd</li> +<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li> +<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> +<li>Bugfixes</li> +<li>Optimizations</li> </ul> <h2>1.0.7</h2> <ul> -<li>fixed problem with signature verification of texts with trailing newline</li> -<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li> +<li>Fixed problem with signature verification of texts with trailing newline</li> +<li>More options for pass phrase cache time to live (20, 40, 60 mins)</li> </ul> <h2>1.0.6</h2> <ul> -<li>account adding crash on Froyo fixed</li> -<li>secure file deletion</li> -<li>option to delete key file after import</li> -<li>stream encryption/decryption (gallery, etc.)</li> -<li>new options (language, force v3 signatures)</li> -<li>interface changes</li> -<li>bugfixes</li> +<li>Account adding crash on Froyo fixed</li> +<li>Secure file deletion</li> +<li>Option to delete key file after import</li> +<li>Stream encryption/decryption (gallery, etc.)</li> +<li>New options (language, force v3 signatures)</li> +<li>Interface changes</li> +<li>Bugfixes</li> </ul> <h2>1.0.5</h2> <ul> <li>German and Italian translation</li> -<li>much smaller package, due to reduced BC sources</li> -<li>new preferences GUI</li> -<li>layout adjustment for localization</li> -<li>signature bugfix</li> +<li>Much smaller package, due to reduced BC sources</li> +<li>New preferences GUI</li> +<li>Layout adjustment for localization</li> +<li>Signature bugfix</li> </ul> <h2>1.0.4</h2> <ul> -<li>fixed another crash caused by some SDK bug with query builder</li> +<li>Fixed another crash caused by some SDK bug with query builder</li> </ul> <h2>1.0.3</h2> <ul> -<li>fixed crashes during encryption/signing and possibly key export</li> +<li>Fixed crashes during encryption/signing and possibly key export</li> </ul> <h2>1.0.2</h2> <ul> -<li>filterable key lists</li> -<li>smarter pre-selection of encryption keys</li> -<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> -<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li> +<li>Filterable key lists</li> +<li>Smarter pre-selection of encryption keys</li> +<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> +<li>Fixes and additional features (key preselection) for K-9 Mail, new beta build available</li> </ul> <h2>1.0.1</h2> @@ -169,11 +183,11 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa <h2>1.0.0</h2> <ul> <li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li> -<li>support of more file managers (including ASTRO)</li> +<li>Support of more file managers (including ASTRO)</li> <li>Slovenian translation</li> -<li>new database, much faster, less memory usage</li> -<li>defined Intents and content provider for other apps</li> -<li>bugfixes</li> +<li>New database, much faster, less memory usage</li> +<li>Defined Intents and content provider for other apps</li> +<li>Bugfixes</li> </ul> </body> </html>
\ No newline at end of file |