Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 17 | -65/+81 | |
| | | ||||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 5 | -89/+37 | |
| | | ||||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 5 | -43/+54 | |
| | | ||||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 3 | -62/+117 | |
| | | ||||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 4 | -24/+519 | |
| | | ||||||
* | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 1 | -1/+3 | |
|/ | ||||||
* | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 4 | -13/+15 | |
| | ||||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 3 | -8/+36 | |
| | ||||||
* | 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 | 20 | -88/+84 | |
| | ||||||
* | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 | |
| | ||||||
* | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 2 | -2/+2 | |
| | ||||||
* | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 3 | -18/+65 | |
| | ||||||
* | 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 #1147 from Hiperzone/development | Dominik Schürmann | 2015-03-15 | 1 | -1/+3 | |
|\ \ | | | | | | | -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 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+4 | |
|/ / | ||||||
* | | added some documentation | Adithya Abraham Philip | 2015-03-13 | 1 | -4/+5 | |
| | | ||||||
* | | added own profile support in linekd system contact | Adithya Abraham Philip | 2015-03-13 | 1 | -7/+25 | |
| | | ||||||
* | | 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 | 15 | -24/+27 | |
|\ \ \ | | | | | | | | | #1042: Replaced ints with enums | |||||
| * | | | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 4 | -29/+32 | |
| |\| | | ||||||
| * | | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 15 | -24/+27 | |
| | | | | | | | | | | | | | | | | | | | | 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 | |
| | |_|/ | |/| | | ||||||
* / | | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 1 | -11/+12 | |
|/ / / | ||||||
* | | | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 1 | -3/+70 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+19 | |
| | | | | ||||||
| * | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 5 | -35/+312 | |
| | | | | ||||||
| * | | | cleaned up code, added comments | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+15 | |
| | | | | | | | | | | | | | | | | optimised imports | |||||
| * | | | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+52 | |
| | | | | ||||||
| * | | | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+18 | |
| | |/ | |/| | ||||||
* | | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 5 | -6/+433 | |
| | | | ||||||
* | | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+19 | |
| | | | ||||||
* | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 5 | -35/+312 | |
|/ / | ||||||
* | | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -22/+27 | |
| | | ||||||
* | | Fix ascii armor in encrypt activity | Dominik Schürmann | 2015-03-09 | 1 | -3/+2 | |
| | | ||||||
* | | Fix compression check in activities | Dominik Schürmann | 2015-03-09 | 3 | -4/+3 | |
|/ | ||||||
* | Cleanup new widgets | Dominik Schürmann | 2015-03-09 | 3 | -38/+41 | |
| | ||||||
* | Merge pull request #1112 from chipset95/issue-1106-imp | Dominik Schürmann | 2015-03-09 | 4 | -54/+53 | |
|\ | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | |||||
| * | Implemented NameEditText | chipset95 | 2015-03-09 | 4 | -96/+10 | |
| | | ||||||
| * | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | chipset95 | 2015-03-09 | 3 | -101/+85 | |
| | |