aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-083-11/+11
* | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0832-540/+1154
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | add support for certification of user attributesVincent Breitmoser2015-03-084-17/+97
| | |_|/ | |/| |
| * | | Merge pull request #1108 from tdjogi010/developmentVincent2015-03-061-38/+74
| |\ \ \ | | |_|/ | |/| |
| | * | Asks Passphrase for key delete/export in ViewKeyActivity.tdjogi010@gmail.com2015-03-061-38/+74
| * | | Added GPLv3 Licensechipset952015-03-062-0/+34
| * | | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-065-84/+182
| | |/ | |/|
| * | Format code of merged password strength widgetDominik Schürmann2015-03-052-40/+49
| * | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into pa...Dominik Schürmann2015-03-054-0/+496
| |\ \
| | * | Integrates passphrase strength indicator to create key wizard.Lukas Zorich2015-03-031-0/+6
| | * | Add license to password strength view classesLukas Zorich2015-03-033-0/+68
| | * | Implemented Matt Allen password strength indicatorLukas Zorich2015-03-032-0/+420
| | |/
| * | Use ArrayList instead of LinkedListDominik Schürmann2015-03-055-11/+13
| * | Cleanup of PgpConstantsDominik Schürmann2015-03-051-24/+22