aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
* Clarify MIME usageDominik Schürmann2015-03-152-2/+2
* Remove display of key id in other listsDominik Schürmann2015-03-153-18/+65
* Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
* Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
* Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
|\
| * Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
* | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-151-1/+3
|\ \
| * | -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-151-1/+3
* | | Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-153-14/+37
* | | Query for duplicate user idsDominik Schürmann2015-03-151-1/+4
|/ /
* | added some documentationAdithya Abraham Philip2015-03-131-4/+5
* | added own profile support in linekd system contactAdithya Abraham Philip2015-03-131-7/+25
* | Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
* | Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
* | Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
|\ \
| * | Check if NFC is available on deviceRaoul2015-03-101-0/+6
* | | Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-1215-24/+27
|\ \ \
| * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-094-29/+32
| |\| |
| * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0915-24/+27
* | | | Improve file deletion stringsDominik Schürmann2015-03-121-3/+3
* | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-123-46/+104
|\ \ \ \
| * | | | Updated fix for Issue #1116Manoj Khanna2015-03-113-46/+104
| | |_|/ | |/| |
* / | | corrected linked system contact display nameAdithya Abraham Philip2015-03-111-11/+12
|/ / /
* | | 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-101-9/+15
| * | | added contact linkingAdithya Abraham Philip2015-03-101-9/+52
| * | | added cardAdithya Abraham Philip2015-03-101-0/+18
| | |/ | |/|
* | | Add additional email addresses in create keyDominik Schürmann2015-03-105-6/+433
* | | 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
|/
* 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-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
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-061-38/+74
|\|