Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version 3.2.2 | Dominik Schürmann | 2015-05-21 | 1 | -2/+2 |
| | |||||
* | 3.2.1 | Dominik Schürmann | 2015-05-10 | 1 | -2/+2 |
| | |||||
* | Reformat manifest | Dominik Schürmann | 2015-05-10 | 1 | -23/+23 |
| | |||||
* | Version 3.2 | Dominik Schürmann | 2015-05-06 | 1 | -2/+2 |
| | |||||
* | Cleanup manifest | Dominik Schürmann | 2015-05-05 | 1 | -15/+16 |
| | |||||
* | API: Allow selection of decryption keys when decryption fails | Dominik Schürmann | 2015-04-30 | 1 | -0/+5 |
| | |||||
* | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 1 | -0/+17 |
| | |||||
* | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 1 | -0/+4 |
| | |||||
* | remove unused NfcActivity | Vincent Breitmoser | 2015-03-30 | 1 | -6/+0 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -2/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | 3.2beta3 | Dominik Schürmann | 2015-03-23 | 1 | -2/+2 |
| | | |||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -0/+3 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
* | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -7/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 1 | -7/+1 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 1 | -0/+6 |
|/ | |||||
* | Manifest cleanup | Dominik Schürmann | 2015-03-17 | 1 | -9/+12 |
| | |||||
* | Put API activites in normal process to allow hydrate/dehydrate of logs | Dominik Schürmann | 2015-03-15 | 1 | -4/+2 |
| | |||||
* | links own keys to me profile in contacts | Adithya Abraham Philip | 2015-03-13 | 1 | -0/+1 |
| | |||||
* | Version 3.2beta2 | Dominik Schürmann | 2015-03-10 | 1 | -2/+2 |
| | |||||
* | API 7 | Dominik Schürmann | 2015-03-10 | 1 | -0/+6 |
| | |||||
* | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 1 | -1/+1 |
| | |||||
* | Update patternview lib, remove workaround | Dominik Schürmann | 2015-03-03 | 1 | -2/+0 |
| | |||||
* | Fix keyboard overlay bug on top of edittexts | Dominik Schürmann | 2015-02-27 | 1 | -1/+1 |
| | |||||
* | Better qr code resizing | Dominik Schürmann | 2015-02-27 | 1 | -1/+1 |
| | |||||
* | go to directly to certify screen after nfc import | Vincent Breitmoser | 2015-02-27 | 1 | -9/+9 |
| | |||||
* | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 1 | -0/+8 |
| | |||||
* | New advanced key view | Dominik Schürmann | 2015-02-23 | 1 | -2/+2 |
| | |||||
* | Remove old pattern lib, add new pattern lib | Dominik Schürmann | 2015-02-23 | 1 | -6/+2 |
| | |||||
* | Fix back button in encrypt activities | Dominik Schürmann | 2015-02-22 | 1 | -6/+12 |
| | |||||
* | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 1 | -5/+0 |
| | |||||
* | Refactor DecryptActivity into DecryptOverviewFragment for nav drawer | Dominik Schürmann | 2015-01-29 | 1 | -28/+13 |
| | |||||
* | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 1 | -1/+6 |
| | | | | | Conflicts: OpenKeychain/build.gradle | ||||
* | Toolbar for settings | Dominik Schürmann | 2015-01-14 | 1 | -2/+2 |
| | |||||
* | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 1 | -4/+1 |
| | |||||
* | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -0/+2 |
| | |||||
* | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 1 | -0/+6 |
| | |||||
* | Set version to 3.2beta1 | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| | |||||
* | Version 3.1.2 | Dominik Schürmann | 2014-11-02 | 1 | -2/+2 |
| | |||||
* | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 |
| | |||||
* | Revert "Version 3.1.1" | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 |
| | | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167. | ||||
* | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 |
| | |||||
* | Version 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 |
| | |||||
* | 3.1beta1 | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 |
| | |||||
* | Fix decrypt intent api | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 |
| | |||||
* | Hide keyboard in safe slinger activity | Dominik Schürmann | 2014-10-26 | 1 | -0/+1 |
| | |||||
* | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 1 | -0/+5 |
| | |||||
* | Remove old certify activity | Dominik Schürmann | 2014-10-25 | 1 | -9/+0 |
| | |||||
* | Remove tabs from import keys activity | Dominik Schürmann | 2014-10-25 | 1 | -2/+1 |
| |