aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-103-8/+123
|\ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * 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
| | | | | | | | optimised imports
| * 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
|\ \ | | | | | | Fixed contact deletion Issue #1120
| * | 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
|/ /
* | 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
|\ | | | | 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-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 ↵Dominik Schürmann2015-03-0911-109/+242
|\| | | | | | | 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
| | |
| * | 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 ↵Dominik Schürmann2015-03-061-38/+74
|\| | | | | | | development
| * 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
| | |
* | | 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
| * | Added GPLv3 Licensechipset952015-03-062-0/+34
| | |
| * | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-068-101/+215
| | |
* | | Tryout design for encrypt, decryptDominik Schürmann2015-03-0628-7/+76
| | |
* | | Fix elevationDominik Schürmann2015-03-067-106/+78
|/ /
* | Format code of merged password strength widgetDominik Schürmann2015-03-052-40/+49
| |
* | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵Dominik Schürmann2015-03-056-8/+536
|\ \ | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
| * | Integrates passphrase strength indicator to create key wizard.Lukas Zorich2015-03-032-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | This commit patches issue #1050. The padding set in the passphrase edit text is set programmatically because there is a bug in appcompat-v7 where padding via xml doesn't work: http://code.google.com/p/android/issues/detail?id=77982
| * | Add license to password strength view classesLukas Zorich2015-03-034-1/+80
| | |
| * | Implemented Matt Allen password strength indicatorLukas Zorich2015-03-033-0/+434
| | | | | | | | | | | | | | | | | | | | | I used most of Matt Allen password strength indicator code available here https://github.com/matt-allen/android-password-strength-indicator, but modified it a little bit in order to customize the view's colors through the xml.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 02:03:09 +0000