aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | -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-153-14/+37
| * | | 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-131-9/+118
| |/ /
| * | 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-094-29/+32
| | |\| |
| | * | | 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-121-3/+3
| * | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-123-46/+104
| |\ \ \ \
| | * | | | Updated fix for Issue #1116Manoj Khanna2015-03-113-46/+104
| * | | | | 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
| * | | 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
| * | | API 7Dominik Schürmann2015-03-108-204/+555
* | | | show certificates for secret keys differentlyVincent Breitmoser2015-03-144-28/+46
* | | | work on second step of identity creationVincent Breitmoser2015-03-133-23/+25
* | | | don't filter tweet intentVincent Breitmoser2015-03-131-31/+6
* | | | improve error handling in LinkedIdViewFragment, disable unknown identity type...Vincent Breitmoser2015-03-132-8/+27
* | | | verification takes a second at leastVincent Breitmoser2015-03-131-1/+11
* | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-7/+4
* | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-1317-103/+38
* | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-121-1/+1
* | | | regenerate twitter tokenVincent Breitmoser2015-03-121-4/+16
* | | | small fix for CreateFinalFragmentVincent Breitmoser2015-03-122-5/+2
* | | | twitter Step3 -> Step2Vincent Breitmoser2015-03-122-12/+5
* | | | ditch custom text step for twitterVincent Breitmoser2015-03-123-174/+18
* | | | finish implementing twitter resourceVincent Breitmoser2015-03-128-108/+214
* | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-27/+50
* | | | hack loadSystemContact back inVincent Breitmoser2015-03-102-5/+13
* | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-107-13/+548
|\| | |
| * | | RippleDominik Schürmann2015-03-101-3/+1