aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
* Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-152-2/+37
* Clarify MIME usageDominik Schürmann2015-03-153-2/+7
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-151-15/+16
|\
| * fix expiry of master keysVincent Breitmoser2015-03-151-15/+16
* | Put API activites in normal process to allow hydrate/dehydrate of logsDominik Schürmann2015-03-151-4/+2
|/
* Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
* Remove display of key id in other listsDominik Schürmann2015-03-156-19/+70
* Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
* Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
* Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
|\
| * Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
* | Merge pull request #1148 from manojkhannakm/developmentDominik Schürmann2015-03-152-5/+5
|\ \
| * | Fixed a ClassCastExceptionManoj Khanna2015-03-152-5/+5
* | | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-152-11/+15
|\ \ \
| * | | -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-152-11/+15
| |/ /
* | | Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-154-16/+39
* | | Query for duplicate user idsDominik Schürmann2015-03-153-2/+14
* | | Add missing license headersDominik Schürmann2015-03-156-0/+102
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-141-1/+2
|\| |
| * | Merge pull request #1143 from manojkhannakm/developmentDominik Schürmann2015-03-141-1/+2
| |\ \
| | * | Fix for Issue #1115Manoj Khanna2015-03-131-1/+2
* | | | disable debug syncDominik Schürmann2015-03-141-1/+1
* | | | Use names also for main contactDominik Schürmann2015-03-142-4/+4
* | | | Show key name instead of key id in contacts, cleanupDominik Schürmann2015-03-141-20/+7
|/ / /
* | | added some documentationAdithya Abraham Philip2015-03-132-27/+87
* | | added own profile support in linekd system contactAdithya Abraham Philip2015-03-132-10/+61
* | | links own keys to me profile in contactsAdithya Abraham Philip2015-03-132-9/+119
|/ /
* | Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
* | Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
* | Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
|\ \
| * | Check if NFC is available on deviceRaoul2015-03-101-0/+6
* | | Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-1218-73/+108
|\ \ \
| * | | Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
| * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-096-48/+51
| |\| |
| * | | Added braces to if else.danielnelz2015-03-092-4/+6
| * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0918-73/+106
* | | | Improve file deletion stringsDominik Schürmann2015-03-122-6/+7
* | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-1223-100/+162
|\ \ \ \
| * | | | Updated fix for Issue #1116Manoj Khanna2015-03-1123-100/+162
* | | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keysDominik Schürmann2015-03-123-14/+53
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | added contact sync at end of CertifyOperationAdithya Abraham Philip2015-03-111-0/+4
| * | | | corrected linked system contact display nameAdithya Abraham Philip2015-03-112-14/+49
| |/ / /
* / / / change user_id primary key in database, use keyring rather than unified query...Vincent Breitmoser2015-03-113-14/+26
|/ / /
* | | make constant for certify hash algoDominik Schürmann2015-03-112-11/+6
* | | Version 3.2beta2Dominik Schürmann2015-03-102-3/+4
* | | Pull from transifexDominik Schürmann2015-03-1071-1105/+1328
* | | Disable maybe methods in ImportKeysListEntry for nowDominik Schürmann2015-03-101-2/+3
* | | Fix expiry, revoked checks in OpenPgpSignatureResultBuilderDominik Schürmann2015-03-101-2/+2
* | | Changelog 3.2beta1Dominik Schürmann2015-03-101-0/+14
* | | Remove unused NFC Beam htmlDominik Schürmann2015-03-1024-268/+0