Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | -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 | ||||
* | 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 |
| | | |||||
* | | 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 | 2 | -9/+119 |
|/ | |||||
* | 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 | 6 | -48/+51 |
| |\| | |||||
| * | | 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 | 2 | -6/+7 |
| | | | |||||
* | | | Merge pull request #1137 from manojkhannakm/development | Dominik Schürmann | 2015-03-12 | 23 | -100/+162 |
|\ \ \ | | | | | | | | | Updated fix for Issue #1116 | ||||
| * | | | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 23 | -100/+162 |
| | | | | |||||
* | | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keys | Dominik Schürmann | 2015-03-12 | 3 | -14/+53 |
|\ \ \ \ | | | | | | | | | | | Sync only confirmed keys and change | ||||
| * | | | | added contact sync at end of CertifyOperation | Adithya Abraham Philip | 2015-03-11 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 2 | -14/+49 |
| |/ / / | |||||
* / / / | change user_id primary key in database, use keyring rather than unified ↵ | Vincent Breitmoser | 2015-03-11 | 3 | -14/+26 |
|/ / / | | | | | | | | | | query in consolidate | ||||
* | | | make constant for certify hash algo | Dominik Schürmann | 2015-03-11 | 2 | -11/+6 |
| | | | |||||
* | | | Version 3.2beta2 | Dominik Schürmann | 2015-03-10 | 2 | -3/+4 |
| | | | |||||
* | | | Pull from transifex | Dominik Schürmann | 2015-03-10 | 71 | -1105/+1328 |
| | | | |||||
* | | | Disable maybe methods in ImportKeysListEntry for now | Dominik Schürmann | 2015-03-10 | 1 | -2/+3 |
| | | | |||||
* | | | Fix expiry, revoked checks in OpenPgpSignatureResultBuilder | Dominik Schürmann | 2015-03-10 | 1 | -2/+2 |
| | | | |||||
* | | | Changelog 3.2beta1 | Dominik Schürmann | 2015-03-10 | 1 | -0/+14 |
| | | | |||||
* | | | Remove unused NFC Beam html | Dominik Schürmann | 2015-03-10 | 24 | -268/+0 |
| | | | |||||
* | | | API 7 | Dominik Schürmann | 2015-03-10 | 12 | -280/+633 |
| | | | |||||
* | | | Ripple | Dominik Schürmann | 2015-03-10 | 24 | -44/+40 |
| | | | |||||
* | | | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 3 | -8/+123 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -0/+27 |
| | | | | |||||
| * | | | changed default drawable for linked system contact | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 40 | -151/+532 |
| | | | | |||||
| * | | | cleaned up code, added comments | Adithya Abraham Philip | 2015-03-10 | 2 | -9/+16 |
| | | | | | | | | | | | | | | | | optimised imports | ||||
| * | | | added contact linking | Adithya Abraham Philip | 2015-03-10 | 4 | -12/+102 |
| | | | | |||||
| * | | | added card | Adithya Abraham Philip | 2015-03-10 | 3 | -5/+52 |
| | |/ | |/| | |||||
* | | | Merge pull request #1121 from adithyaphilip/rawcontact-deletion | Dominik Schürmann | 2015-03-10 | 1 | -3/+47 |
|\ \ \ | | | | | | | | | Fixed contact deletion Issue #1120 | ||||
| * | | | added CALLER_IS_SYNCADAPTER parameter to delete queries | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+47 |
| | | | | |||||
* | | | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 15 | -7/+521 |
|/ / / | |||||
* | | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 3 | -0/+27 |
| | | | |||||
* | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 40 | -151/+532 |
|/ / | |||||
* | | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 3 | -41/+46 |
| | | |||||
* | | 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 |
|/ | |||||
* | API: If signature key is known return pi to show key | Dominik Schürmann | 2015-03-09 | 1 | -73/+72 |
| | |||||
* | Fix colors for remote activity | Dominik Schürmann | 2015-03-09 | 3 | -14/+7 |
| | |||||
* | 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 | 6 | -56/+55 |
|\ | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 |