Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 12 | -95/+147 |
| | |||||
* | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 14 | -239/+474 |
| | |||||
* | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 16 | -230/+872 |
| | |||||
* | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 |
| | |||||
* | contacts work on all supported api levels | Adithya Abraham Philip | 2015-03-17 | 1 | -16/+13 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-17 | 1 | -6/+2 |
|\ | | | | | | | development | ||||
| * | removed unnecessary @TargetApi annotation | Adithya Abraham Philip | 2015-03-17 | 1 | -6/+2 |
| | | |||||
* | | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 5 | -13/+19 |
|/ | |||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 9 | -31/+117 |
| | |||||
* | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 4 | -6/+27 |
| | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 25 | -148/+139 |
| | |||||
* | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 |
| | |||||
* | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 1 | -2/+15 |
| | |||||
* | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 3 | -2/+7 |
| | |||||
* | fix expiry of master keys | Vincent Breitmoser | 2015-03-15 | 1 | -15/+16 |
| | | | | fixes #1141 | ||||
* | Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist | Dominik Schürmann | 2015-03-15 | 1 | -1/+7 |
| | |||||
* | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 5 | -18/+69 |
| | |||||
* | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 |
| | |||||
* | Fixes for selection of certify key | Dominik Schürmann | 2015-03-15 | 2 | -10/+21 |
| | |||||
* | Merge pull request #1142 from tdjogi010/development | Dominik Schürmann | 2015-03-15 | 1 | -4/+10 |
|\ | | | | | Preselected Suitable Key | ||||
| * | Preselected Suitable Key | tdjogi010@gmail.com | 2015-03-13 | 1 | -4/+10 |
| | | |||||
* | | Merge pull request #1148 from manojkhannakm/development | Dominik Schürmann | 2015-03-15 | 2 | -5/+5 |
|\ \ | | | | | | | Fixed a ClassCastException | ||||
| * | | Fixed a ClassCastException | Manoj Khanna | 2015-03-15 | 2 | -5/+5 |
| | | | |||||
* | | | Merge pull request #1147 from Hiperzone/development | Dominik Schürmann | 2015-03-15 | 2 | -11/+15 |
|\ \ \ | | | | | | | | | -fixed out of bounds crash when retrieving the main profile name with se... | ||||
| * | | | -fixed out of bounds crash when retrieving the main profile name with secret ↵ | Daniel Ramos | 2015-03-15 | 2 | -11/+15 |
| |/ / | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid | ||||
* | | | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 3 | -14/+37 |
| | | | | | | | | | | | | duplicate | ||||
* | | | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 3 | -2/+14 |
| | | | |||||
* | | | Add missing license headers | Dominik Schürmann | 2015-03-15 | 6 | -0/+102 |
| | | | |||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-14 | 1 | -1/+2 |
|\| | | | | | | | | | | | development | ||||
| * | | Merge pull request #1143 from manojkhannakm/development | Dominik Schürmann | 2015-03-14 | 1 | -1/+2 |
| |\ \ | | | | | | | | | Fix for Issue #1115 | ||||
| | * | | Fix for Issue #1115 | Manoj Khanna | 2015-03-13 | 1 | -1/+2 |
| | | | | |||||
* | | | | disable debug sync | Dominik Schürmann | 2015-03-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use names also for main contact | Dominik Schürmann | 2015-03-14 | 2 | -4/+4 |
| | | | | |||||
* | | | | Show key name instead of key id in contacts, cleanup | Dominik Schürmann | 2015-03-14 | 1 | -20/+7 |
|/ / / | |||||
* | | | added some documentation | Adithya Abraham Philip | 2015-03-13 | 2 | -27/+87 |
| | | | |||||
* | | | added own profile support in linekd system contact | Adithya Abraham Philip | 2015-03-13 | 2 | -10/+61 |
| | | | |||||
* | | | links own keys to me profile in contacts | Adithya Abraham Philip | 2015-03-13 | 1 | -9/+118 |
|/ / | |||||
* | | Clarify logs in DeleteFileDialog | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | | |||||
* | | Use notify instead of Toast for NFC check | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1133 from Rrego6/development | Dominik Schürmann | 2015-03-12 | 1 | -0/+6 |
|\ \ | | | | | | | Check if NFC is available on device | ||||
| * | | Check if NFC is available on device | Raoul | 2015-03-10 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #1117 from danielnelz/development | Dominik Schürmann | 2015-03-12 | 18 | -73/+108 |
|\ \ \ | | | | | | | | | #1042: Replaced ints with enums | ||||
| * | | | Fixed possible ArrayIndexOutOfBoundsException. | danielnelz | 2015-03-11 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 4 | -29/+32 |
| |\| | | |||||
| * | | | Added braces to if else. | danielnelz | 2015-03-09 | 2 | -4/+6 |
| | | | | |||||
| * | | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 18 | -73/+106 |
| | | | | | | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | | | | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #1137 from manojkhannakm/development | Dominik Schürmann | 2015-03-12 | 3 | -46/+104 |
|\ \ \ \ | | | | | | | | | | | Updated fix for Issue #1116 | ||||
| * | | | | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 3 | -46/+104 |
| | | | | | |||||
* | | | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keys | Dominik Schürmann | 2015-03-12 | 3 | -14/+53 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Sync only confirmed keys and change |