aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
* | | | work on second step of identity creationVincent Breitmoser2015-03-138-227/+186
* | | | 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-139-92/+106
* | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-1318-105/+38
* | | | change finish button label to "link identity"Vincent Breitmoser2015-03-134-3/+4
* | | | fix linked wizard buttonsVincent Breitmoser2015-03-126-27/+48
* | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-123-222/+78
* | | | 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-129-109/+215
* | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-102-48/+77
* | | | hack loadSystemContact back inVincent Breitmoser2015-03-102-5/+13
* | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-1047-77/+748
|\| | |
| * | | RippleDominik Schürmann2015-03-1024-44/+40
| * | | 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-1040-151/+532
| | * | | 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-1015-7/+521
| |/ / /
* | | | add expand item to linked id listVincent Breitmoser2015-03-105-5/+79
* | | | filter out unknown linked idsVincent Breitmoser2015-03-103-22/+116
* | | | minor additions to CertListWidgetVincent Breitmoser2015-03-102-9/+18
* | | | cleaner handling of verification stateVincent Breitmoser2015-03-102-47/+66
* | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-10107-907/+1294
|\| | |
| * | | Show passphrase checkbox in create keyDominik Schürmann2015-03-093-0/+27
| * | | Make create key wizard step-by-stepDominik Schürmann2015-03-0940-151/+532
| |/ /
| * | Some fixes for delete after encryptionDominik Schürmann2015-03-093-41/+46
| * | Fix ascii armor in encrypt activityDominik Schürmann2015-03-091-3/+2
| * | Fix compression check in activitiesDominik Schürmann2015-03-093-4/+3
| |/
| * API: If signature key is known return pi to show keyDominik Schürmann2015-03-091-73/+72
| * Fix colors for remote activityDominik Schürmann2015-03-093-14/+7
| * Cleanup new widgetsDominik Schürmann2015-03-093-38/+41
| * Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-096-56/+55
| |\
| | * Implemented NameEditTextchipset952015-03-096-98/+12
| | * Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106chipset952015-03-093-101/+85
| * | Redesign of encrypt activites finishedDominik Schürmann2015-03-0916-172/+140
| * | Improve iconsDominik Schürmann2015-03-0916-7/+7
| * | Fix padding in create keyDominik Schürmann2015-03-091-0/+2
| * | Removed unused PasswordEditTextDominik Schürmann2015-03-091-101/+0
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-0911-109/+242
| |\|
| | * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-096-90/+140
| | |\