aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Update openpgp libDominik Schürmann2015-03-101-0/+0
* | | Update api libDominik Schürmann2015-03-101-0/+0
* | | API 7Dominik Schürmann2015-03-1012-280/+633
* | | RippleDominik Schürmann2015-03-1024-44/+40
* | | Merge branch 'adithyaphilip-contact-card' into developmentDominik Schürmann2015-03-103-8/+123
|\ \ \
| * | | 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-1041-151/+535
| * | | 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-1016-7/+522
|/ / /
* | | 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
|\
| * 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 dev...Dominik Schürmann2015-03-0912-117/+294
|\|
| * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-096-90/+140
| |\
| | * 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
| * | unit test certification of user attributesVincent Breitmoser2015-03-081-8/+52
| * | add support for certification of user attributesVincent Breitmoser2015-03-085-19/+102
| |/
* | 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
|\|
| * 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
* | | 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-068-101/+249
|\| |
| * | Merge pull request #1107 from chipset95/issue-1106Dominik Schürmann2015-03-068-101/+249
| |\ \
| | * | Added GPLv3 Licensechipset952015-03-062-0/+34
| | * | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-068-101/+215
| |/ /