aboutsummaryrefslogtreecommitdiffstats
path: root/extern
Commit message (Collapse)AuthorAgeFilesLines
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵Dominik Schürmann2014-09-241-0/+0
| | | | need to separate
* update keybase libDominik Schürmann2014-09-211-0/+0
|
* Update libsDominik Schürmann2014-09-152-0/+0
|
* merge: add support for s2k dummy generationVincent Breitmoser2014-09-111-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 nowDominik Schürmann2014-09-091-0/+0
|
* Unify package nameDominik Schürmann2014-09-081-0/+0
|
* Update nfc libDominik Schürmann2014-09-081-0/+0
|
* Update libsDominik Schürmann2014-09-082-0/+0
|
* Yubikey: use PINDominik Schürmann2014-09-081-0/+0
|
* Prepare Yubikey decryptionDominik Schürmann2014-09-081-0/+0
|
* Fix for user ids in APIDominik Schürmann2014-09-071-0/+0
|
* Update API libDominik Schürmann2014-09-071-0/+0
|
* Update and fix Intent APIDominik Schürmann2014-09-071-0/+0
|
* Update Intent APIDominik Schürmann2014-09-071-0/+0
|
* Update safeslinger libDominik Schürmann2014-09-041-0/+0
|
* Add safeslinger to buildDominik Schürmann2014-09-041-0/+0
|
* Add safeslinger submoduleDominik Schürmann2014-09-041-0/+0
|
* Prepare API for OpenPgpSignatureResult extensionsDominik Schürmann2014-08-311-0/+0
|
* Update TokenAutoCompleteDominik Schürmann2014-08-291-0/+0
|
* Update nfc libDominik Schürmann2014-08-281-0/+0
|
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-283-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-masterVincent Breitmoser2014-08-231-0/+0
| |
| * Fixing build with Spongy Castle 1.51Dominik Schürmann2014-08-211-0/+0
| |
| * Update spongy castle, not building...Dominik Schürmann2014-08-211-0/+0
| |
| * Update keybase libDominik Schürmann2014-08-201-0/+0
| |
| * Fix sticky list headers lib, fix travisDominik Schürmann2014-08-141-0/+0
| |
| * Update sticky list headersDominik Schürmann2014-08-141-0/+0
| |
* | Support for multiple hash algosDominik Schürmann2014-08-141-0/+0
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-142-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 defaultDominik Schürmann2014-08-141-0/+0
| |
| * update api libDominik Schürmann2014-08-121-0/+0
| |
| * Fix API version support, update api libDominik Schürmann2014-08-121-0/+0
| |
| * Implement EXTRA_ORIGINAL_FILENAME for APIDominik Schürmann2014-08-111-0/+0
| |
| * Update api libDominik Schürmann2014-08-111-0/+0
| |
| * update api libDominik Schürmann2014-08-111-0/+0
| |
| * Update api libDominik Schürmann2014-08-111-0/+0
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-065-0/+0
|\| | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
| * Lint fixesDominik Schürmann2014-08-041-0/+0
| |
| * TokenAutoComplete: Do not abort build if lint finds errorsDominik Schürmann2014-08-041-0/+0
| |
| * Merge branch 'master' into improve-file-moremar-v-in2014-07-314-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * \ Merge branch 'master' into improve-file-moremar-v-in2014-07-061-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * | | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+0
| | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
* | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
| * | | Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-291-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| | * \ \ Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-262-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| | * | | | get rid of AppMsg libraryVincent Breitmoser2014-07-071-0/+0
| | | |_|/ | | |/| |
| * | | | Update gradle plugin to 0.12.2Dominik Schürmann2014-07-272-0/+0
| | | | |
| * | | | Update spongycastleDominik Schürmann2014-07-271-0/+0
| | | | |
| * | | | Work on first time wizard designDominik Schürmann2014-07-271-0/+0
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-261-0/+0
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 08:47:03 +0000