aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-10179-908/+1492
|\
| * Show passphrase checkbox in create keyDominik Schürmann2015-03-093-0/+27
| |
| * Make create key wizard step-by-stepDominik Schürmann2015-03-0941-151/+535
| |
| * 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
| |\ | | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
| | * 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-0917-172/+141
| | |
| * | Improve iconsDominik Schürmann2015-03-0919-33/+33
| | |
| * | 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 ↵Dominik Schürmann2015-03-0912-117/+294
| |\| | | | | | | | | | development
| | * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-096-90/+140
| | |\ | | | | | | | | Passphrase strength indicator
| | | * minor xml code style correctionAdithya Abraham Philip2015-03-081-8/+8
| | | |
| | | * 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-063-52/+38
| | | |
| | | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-062-8/+6
| | | |
| | | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-063-6/+6
| | | |
| | | * added PassphraseEditTextAdithya Abraham Philip2015-03-063-31/+92
| | | |
| * | | Remove dublicate email checkDominik Schürmann2015-03-061-3/+1
| | | |
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-061-38/+74
| |\ \ \ | | | |/ | | |/| | | | | development
| * | | 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 ↵Dominik Schürmann2015-03-068-101/+249
| |\ \ \ | | | | | | | | | | | | | | | development
| * | | | Tryout design for encrypt, decryptDominik Schürmann2015-03-0699-8/+270
| | | | |
| * | | | Fix elevationDominik Schürmann2015-03-067-106/+78
| | | | |
* | | | | 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-096-80/+295
| | | | |
* | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-093-59/+15
| | | | |
* | | | | fix transition animationVincent Breitmoser2015-03-093-9/+41
| | | | |
* | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-099-110/+275
| | | | |
* | | | | successfully certify linked idsVincent Breitmoser2015-03-085-21/+81
| | | | |
* | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-084-7/+5
| | | | |
* | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-086-18/+59
| | | | |
* | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0854-623/+1317
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | unit test certification of user attributesVincent Breitmoser2015-03-081-8/+52
| | | | |
| * | | | add support for certification of user attributesVincent Breitmoser2015-03-085-19/+102
| | |_|/ | |/| |
| * | | Merge pull request #1108 from tdjogi010/developmentVincent2015-03-061-38/+74
| |\ \ \ | | |_|/ | |/| | Asks Passphrase for key delete/export in ViewKeyActivity.
| | * | Asks Passphrase for key delete/export in ViewKeyActivity.tdjogi010@gmail.com2015-03-061-38/+74
| | | |
| * | | Merge pull request #1107 from chipset95/issue-1106Dominik Schürmann2015-03-068-101/+249
| |\ \ \ | | |_|/ | |/| | EmailEditText, PasswordEditText issue #1106
| | * | Added GPLv3 Licensechipset952015-03-062-0/+34
| | | |
| | * | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-068-101/+215
| |/ /
| * | Format code of merged password strength widgetDominik Schürmann2015-03-052-40/+49
| | |
| * | Merge branch 'passphrase-strength-indicator' into developmentDominik Schürmann2015-03-056-8/+536
| |\ \