aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-107-13/+548
|\
| * RippleDominik Schürmann2015-03-101-3/+1
| * Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-101-3/+70
| |\
| | * Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+19
| | * Make create key wizard step-by-stepDominik Schürmann2015-03-105-35/+312
| | * cleaned up code, added commentsAdithya Abraham Philip2015-03-102-9/+16
| | * added contact linkingAdithya Abraham Philip2015-03-102-9/+80
| | * added cardAdithya Abraham Philip2015-03-101-0/+18
| * | 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-105-6/+433
| |/ /
* | | add expand item to linked id listVincent Breitmoser2015-03-102-4/+43
* | | 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-101-46/+64
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1024-432/+786
|\| |
| * | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+19
| * | Make create key wizard step-by-stepDominik Schürmann2015-03-095-35/+312
| |/
| * Some fixes for delete after encryptionDominik Schürmann2015-03-091-22/+27
| * 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-091-1/+1
| * Cleanup new widgetsDominik Schürmann2015-03-093-38/+41
| * Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-094-54/+53
| |\
| | * Implemented NameEditTextchipset952015-03-094-96/+10
| | * Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106chipset952015-03-093-101/+85
| * | Redesign of encrypt activites finishedDominik Schürmann2015-03-097-57/+123
| * | 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-098-81/+228
| |\|
| | * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-094-64/+131
| | |\
| | | * minor code style correctionAdithya Abraham Philip2015-03-073-2/+10
| | | * removed created by commentAdithya Abraham Philip2015-03-061-3/+0
| | | * cleaned up codeAdithya Abraham Philip2015-03-062-52/+37
| | | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-061-3/+5
| | | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-062-5/+5
| | | * added PassphraseEditTextAdithya Abraham Philip2015-03-062-14/+89
| * | | Remove dublicate email checkDominik Schürmann2015-03-061-3/+1
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-061-38/+74
| |\ \ \ | | | |/ | | |/|
| * | | Improve way of getting possible names by filtering out emailsDominik Schürmann2015-03-061-1/+25
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-065-84/+216
| |\ \ \
| * | | | Fix elevationDominik Schürmann2015-03-061-2/+2
* | | | | concurrency and continuity fixes for verification backstack handlingVincent Breitmoser2015-03-101-14/+26
* | | | | support backstack for verificationVincent Breitmoser2015-03-091-12/+26
* | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-093-69/+192
* | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-092-7/+15
* | | | | fix transition animationVincent Breitmoser2015-03-093-9/+41
* | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-098-110/+267
* | | | | successfully certify linked idsVincent Breitmoser2015-03-084-21/+80
* | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-084-7/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 06:15:31 +0000