| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 1 | -0/+0 | |
| |\ | | | | | | | development | |||||
| | * | update spongycastle with more public methods for WrappedUserAttribute | Vincent Breitmoser | 2015-01-13 | 1 | -0/+0 | |
| | | | ||||||
| * | | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 1 | -0/+0 | |
| |/ | ||||||
| * | Update safeslinger lib | Dominik Schürmann | 2015-01-12 | 1 | -0/+0 | |
| | | ||||||
| * | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -0/+0 | |
| | | | | | closes #1012 | |||||
| * | Add android-lockpattern library | Dominik Schürmann | 2014-12-29 | 1 | -0/+0 | |
| | | ||||||
| * | Update plugin to 1.0 | Dominik Schürmann | 2014-12-12 | 2 | -0/+0 | |
| | | ||||||
| * | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 9 | -0/+0 | |
| | | ||||||
| * | Update safeslinger lib | Dominik Schürmann | 2014-10-25 | 1 | -0/+0 | |
| | | ||||||
| * | Update safeslinger lib | Dominik Schürmann | 2014-10-07 | 1 | -0/+0 | |
| | | ||||||
| * | Update safeslinger lib | Dominik Schürmann | 2014-10-03 | 1 | -0/+0 | |
| | | ||||||
| * | Update safeslinger lib | Dominik Schürmann | 2014-09-24 | 1 | -0/+0 | |
| | | ||||||
| * | Removed submodule openpgp-card-nfc-lib | Dominik Schürmann | 2014-09-24 | 1 | -0/+0 | |
| | | ||||||
| * | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵ | Dominik Schürmann | 2014-09-24 | 1 | -0/+0 | |
| | | | | | need to separate | |||||
| * | update keybase lib | Dominik Schürmann | 2014-09-21 | 1 | -0/+0 | |
| | | ||||||
| * | Update libs | Dominik Schürmann | 2014-09-15 | 2 | -0/+0 | |
| | | ||||||
| * | merge: add support for s2k dummy generation | Vincent Breitmoser | 2014-09-11 | 1 | -0/+0 | |
| | | | | | | | if a public key gets merged into a secret one, and there are new subkeys, the merge() routine now adds a newly generated, stripped secret subkey instead. | |||||
| * | Yubikey decryption works now | Dominik Schürmann | 2014-09-09 | 1 | -0/+0 | |
| | | ||||||
| * | Unify package name | Dominik Schürmann | 2014-09-08 | 1 | -0/+0 | |
| | | ||||||
| * | Update nfc lib | Dominik Schürmann | 2014-09-08 | 1 | -0/+0 | |
| | | ||||||
| * | Update libs | Dominik Schürmann | 2014-09-08 | 2 | -0/+0 | |
| | | ||||||
| * | Yubikey: use PIN | Dominik Schürmann | 2014-09-08 | 1 | -0/+0 | |
| | | ||||||
| * | Prepare Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -0/+0 | |
| | | ||||||
| * | Fix for user ids in API | Dominik Schürmann | 2014-09-07 | 1 | -0/+0 | |
| | | ||||||
| * | Update API lib | Dominik Schürmann | 2014-09-07 | 1 | -0/+0 | |
| | | ||||||
| * | Update and fix Intent API | Dominik Schürmann | 2014-09-07 | 1 | -0/+0 | |
| | | ||||||
| * | Update Intent API | Dominik Schürmann | 2014-09-07 | 1 | -0/+0 | |
| | | ||||||
| * | Update safeslinger lib | Dominik Schürmann | 2014-09-04 | 1 | -0/+0 | |
| | | ||||||
| * | Add safeslinger to build | Dominik Schürmann | 2014-09-04 | 1 | -0/+0 | |
| | | ||||||
| * | Add safeslinger submodule | Dominik Schürmann | 2014-09-04 | 1 | -0/+0 | |
| | | ||||||
| * | Prepare API for OpenPgpSignatureResult extensions | Dominik Schürmann | 2014-08-31 | 1 | -0/+0 | |
| | | ||||||
| * | Update TokenAutoComplete | Dominik Schürmann | 2014-08-29 | 1 | -0/+0 | |
| | | ||||||
| * | Update nfc lib | Dominik Schürmann | 2014-08-28 | 1 | -0/+0 | |
| | | ||||||
| * | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 3 | -0/+0 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| | * | update to tidy spongy-master | Vincent Breitmoser | 2014-08-23 | 1 | -0/+0 | |
| | | | ||||||
| | * | Fixing build with Spongy Castle 1.51 | Dominik Schürmann | 2014-08-21 | 1 | -0/+0 | |
| | | | ||||||
| | * | Update spongy castle, not building... | Dominik Schürmann | 2014-08-21 | 1 | -0/+0 | |
| | | | ||||||
| | * | Update keybase lib | Dominik Schürmann | 2014-08-20 | 1 | -0/+0 | |
| | | | ||||||
| | * | Fix sticky list headers lib, fix travis | Dominik Schürmann | 2014-08-14 | 1 | -0/+0 | |
| | | | ||||||
| | * | Update sticky list headers | Dominik Schürmann | 2014-08-14 | 1 | -0/+0 | |
| | | | ||||||
| * | | Support for multiple hash algos | Dominik Schürmann | 2014-08-14 | 1 | -0/+0 | |
| | | | ||||||
| * | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 2 | -0/+0 | |
| |\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | |||||
| | * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -0/+0 | |
| | | | ||||||
| | * | update api lib | Dominik Schürmann | 2014-08-12 | 1 | -0/+0 | |
| | | | ||||||
| | * | Fix API version support, update api lib | Dominik Schürmann | 2014-08-12 | 1 | -0/+0 | |
| | | | ||||||
| | * | Implement EXTRA_ORIGINAL_FILENAME for API | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 | |
| | | | ||||||
| | * | Update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 | |
| | | | ||||||
| | * | update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 | |
| | | | ||||||
| | * | Update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 | |
| | | | ||||||
| * | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 5 | -0/+0 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |