aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | Merge pull request #1144 from adithyaphilip/main-profile-keysDominik Schürmann2015-03-143-27/+248
|\ \ | |/ |/|
| * 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-103-3/+17
* | | 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
* | | Update openpgp libDominik Schürmann2015-03-101-0/+0
* | | Update api libDominik Schürmann2015-03-101-0/+0
* | | API 7Dominik Schürmann2015-03-1012-280/+633
* | | RippleDominik Schürmann2015-03-1024-44/+40
* | | Merge branch 'adithyaphilip-contact-card' into developmentDominik Schürmann2015-03-103-8/+123
|\ \ \
| * | | Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-103-8/+123
|/| | |
| * | | Show passphrase checkbox in create keyDominik Schürmann2015-03-103-0/+27
| * | | changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| * | | Make create key wizard step-by-stepDominik Schürmann2015-03-1041-151/+535
| * | | cleaned up code, added commentsAdithya Abraham Philip2015-03-102-9/+16
| * | | added contact linkingAdithya Abraham Philip2015-03-104-12/+102
| * | | added cardAdithya Abraham Philip2015-03-103-5/+52
| | |/ | |/|
* | | Merge pull request #1121 from adithyaphilip/rawcontact-deletionDominik Schürmann2015-03-101-3/+47
|\ \ \
| * | | added CALLER_IS_SYNCADAPTER parameter to delete queriesAdithya Abraham Philip2015-03-101-3/+47
* | | | Add additional email addresses in create keyDominik Schürmann2015-03-1016-7/+522
|/ / /
* | | Show passphrase checkbox in create keyDominik Schürmann2015-03-093-0/+27
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 09:54:36 +0000