| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix fingerprint length check in QR Code import | Dominik Schürmann | 2015-05-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Use Mode.ALPHANUMERIC for QR codes to save space | Dominik Schürmann | 2015-05-19 | 4 | -9/+24 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Improve strings | Dominik Schürmann | 2015-05-19 | 4 | -39/+37 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 3 | -14/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1281 | |||||
| * | | | | | | | | | | | | | | | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-17 | 4 | -9/+15 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | open ViewKeyActivity by subkey in NfcBaseActivity | Vincent Breitmoser | 2015-05-17 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | simplify MainActivity and fix backstack issues | Vincent Breitmoser | 2015-05-17 | 1 | -60/+33 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | re-parcel log in LogDisplayFragment | Vincent Breitmoser | 2015-05-17 | 1 | -6/+20 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | fingerprints are 20 bytes, not 40. duh. | Vincent Breitmoser | 2015-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | load yubikey fragment after mMasterKeyId is available | Vincent Breitmoser | 2015-05-17 | 1 | -17/+33 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 8 | -11/+108 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | pass masterKeyId to yubikey fragment | Vincent Breitmoser | 2015-05-16 | 2 | -6/+9 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | allow state loss when yubikey fragment is loaded | Vincent Breitmoser | 2015-05-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 2 | -41/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| * | | | | | | | | | | | | | | | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -28/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| * | | | | | | | | | | | | | | | zxing lib is now on jcenter, see ↵ | Dominik Schürmann | 2015-05-15 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/journeyapps/zxing-android-embedded/issues/39 | |||||
| * | | | | | | | | | | | | | | | Merge pull request #1278 from josecastillo/nfckeytocard | Vincent | 2015-05-15 | 29 | -80/+734 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Support for moving RSA keys to Yubikey or NFC smart card | |||||
| | * | | | | | | | | | | | | | | Removing unused SubkeyChange constructor. | Joey Castillo | 2015-05-13 | 2 | -36/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Adding unit tests for PgpKeyOperation keytocard functionality. | Joey Castillo | 2015-05-13 | 1 | -1/+64 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 3 | -0/+40 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 5 | -36/+39 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵ | Joey Castillo | 2015-05-13 | 4 | -32/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keytocard; operation unsets it and fills in dummyDivert to finish it. | |||||
| | * | | | | | | | | | | | | | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 13 | -290/+239 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 4 | -50/+69 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 27 | -34/+631 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | 3.2.1 | Dominik Schürmann | 2015-05-10 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fixing rotate crashes in create key | Dominik Schürmann | 2015-05-10 | 2 | -9/+5 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix crash with v3 key fingerprints | Dominik Schürmann | 2015-05-10 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Cleanup | Dominik Schürmann | 2015-05-10 | 1 | -21/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Reformat manifest | Dominik Schürmann | 2015-05-10 | 1 | -23/+23 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add dontnote to proguard | Dominik Schürmann | 2015-05-10 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Workaround for Samsung Android 4.2 bug | Dominik Schürmann | 2015-05-10 | 2 | -0/+33 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use snackbar lib from maven repo | Dominik Schürmann | 2015-05-10 | 4 | -5/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fixes and clarifications to app signature (or better certificate) pinning | Dominik Schürmann | 2015-05-10 | 4 | -38/+50 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add self-encrypt for old API | Dominik Schürmann | 2015-05-10 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1270 from adithyaphilip/linked-contact-crash | Dominik Schürmann | 2015-05-09 | 3 | -1/+52 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed sync on key import, crash for 'me' linked contact | |||||
| | * | | | | | | | | | | | | | | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 3 | -1/+52 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Update contrib section in README | Dominik Schürmann | 2015-05-08 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Version 3.2 | Dominik Schürmann | 2015-05-06 | 24 | -25/+25 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add screenshots | Dominik Schürmann | 2015-05-06 | 8 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Pull from transifex | Dominik Schürmann | 2015-05-06 | 10 | -141/+163 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Update function graphic | Dominik Schürmann | 2015-05-06 | 2 | -584/+92 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-06 | 2 | -6/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | | | | | | | | | | | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 2 | -6/+18 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Update openpgp-api lib | Dominik Schürmann | 2015-05-06 | 1 | -0/+0 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 2 | -62/+80 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Rename for consistency | Dominik Schürmann | 2015-05-06 | 2 | -5/+4 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 2 | -11/+10 | |
| | | | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |