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 |
| | |||||
* | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 3 | -14/+28 |
| | | | | Fixes #1281 | ||||
* | 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-17 | 2 | -6/+9 |
| | |||||
* | allow state loss when yubikey fragment is loaded | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 |
| | |||||
* | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-17 | 2 | -41/+53 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-17 | 1 | -28/+12 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | 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 |
| | |||||
* | Move error overlay into generalized DecryptFragment, better error handling ↵ | Dominik Schürmann | 2015-05-06 | 5 | -117/+181 |
| | | | | in DecryptTextActivity | ||||
* | Remove reference to deleted API Demo | Dominik Schürmann | 2015-05-06 | 1 | -6/+0 |
| | |||||
* | Switch to new library repos | Dominik Schürmann | 2015-05-06 | 11 | -11/+12 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-05 | 3 | -9/+54 |
|\ | | | | | | | development | ||||
| * | Merge pull request #1235 from wfaulk/replacement_extra | Dominik Schürmann | 2015-05-04 | 3 | -9/+54 |
| |\ | | | | | | | Fix Bluetooth share without breaking others | ||||
| | * | revert unneeded changes for short key ID | William Faulk | 2015-05-04 | 1 | -27/+3 |
| | | | |||||
| | * | revert unneeded changes for old temp Bluetooth share file | William Faulk | 2015-05-04 | 1 | -13/+0 |
| | | | |||||
| | * | use single file extension | William Faulk | 2015-05-04 | 1 | -1/+1 |
| | | | |||||
| | * | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 2 | -32/+18 |
| | | | |||||
| | * | Use FILE_EXTENSION constants | William Faulk | 2015-05-04 | 1 | -1/+1 |
| | | | |||||
| | * | Use primary user ID for filename instead of short key ID | William Faulk | 2015-05-04 | 1 | -2/+5 |
| | | | |||||
| | * | Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater | William Faulk | 2015-05-04 | 1 | -42/+44 |
| | | | |||||
| | * | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 4 | -9/+100 |
| |/ |