Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added some documentation | Adithya Abraham Philip | 2015-03-13 | 1 | -4/+5 |
| | |||||
* | added own profile support in linekd system contact | Adithya Abraham Philip | 2015-03-13 | 1 | -7/+25 |
| | |||||
* | Clarify logs in DeleteFileDialog | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | |||||
* | Use notify instead of Toast for NFC check | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1133 from Rrego6/development | Dominik Schürmann | 2015-03-12 | 1 | -0/+6 |
|\ | | | | | Check if NFC is available on device | ||||
| * | Check if NFC is available on device | Raoul | 2015-03-10 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #1117 from danielnelz/development | Dominik Schürmann | 2015-03-12 | 15 | -24/+27 |
|\ \ | | | | | | | #1042: Replaced ints with enums | ||||
| * | | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 4 | -29/+32 |
| |\| | |||||
| * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 15 | -24/+27 |
| | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | | | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #1137 from manojkhannakm/development | Dominik Schürmann | 2015-03-12 | 3 | -46/+104 |
|\ \ \ | | | | | | | | | Updated fix for Issue #1116 | ||||
| * | | | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 3 | -46/+104 |
| | | | | |||||
* | | | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 1 | -11/+12 |
|/ / / | |||||
* | | | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 1 | -3/+70 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 key | Dominik Schürmann | 2015-03-10 | 1 | -0/+19 |
| | | | | |||||
| * | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 5 | -35/+312 |
| | | | | |||||
| * | | | cleaned up code, added comments | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+15 |
| | | | | | | | | | | | | | | | | optimised imports | ||||
| * | | | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+52 |
| | | | | |||||
| * | | | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+18 |
| | |/ | |/| | |||||
* | | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 5 | -6/+433 |
| | | | |||||
* | | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+19 |
| | | | |||||
* | | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 5 | -35/+312 |
|/ / | |||||
* | | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -22/+27 |
| | | |||||
* | | Fix ascii armor in encrypt activity | Dominik Schürmann | 2015-03-09 | 1 | -3/+2 |
| | | |||||
* | | Fix compression check in activities | Dominik Schürmann | 2015-03-09 | 3 | -4/+3 |
|/ | |||||
* | Cleanup new widgets | Dominik Schürmann | 2015-03-09 | 3 | -38/+41 |
| | |||||
* | Merge pull request #1112 from chipset95/issue-1106-imp | Dominik Schürmann | 2015-03-09 | 4 | -54/+53 |
|\ | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | ||||
| * | Implemented NameEditText | chipset95 | 2015-03-09 | 4 | -96/+10 |
| | | |||||
| * | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | chipset95 | 2015-03-09 | 3 | -101/+85 |
| | | |||||
* | | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 7 | -57/+123 |
| | | |||||
* | | Removed unused PasswordEditText | Dominik Schürmann | 2015-03-09 | 1 | -101/+0 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-09 | 4 | -64/+131 |
|\| | | | | | | | development | ||||
| * | minor code style correction | Adithya Abraham Philip | 2015-03-07 | 3 | -2/+10 |
| | | |||||
| * | removed created by comment | Adithya Abraham Philip | 2015-03-06 | 1 | -3/+0 |
| | | |||||
| * | cleaned up code | Adithya Abraham Philip | 2015-03-06 | 2 | -52/+37 |
| | | |||||
| * | changed default colors for PasswordStrengthView | Adithya Abraham Philip | 2015-03-06 | 1 | -3/+5 |
| | | |||||
| * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 2 | -5/+5 |
| | | |||||
| * | added PassphraseEditText | Adithya Abraham Philip | 2015-03-06 | 2 | -14/+89 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 1 | -38/+74 |
|\| | | | | | | | development | ||||
| * | Merge pull request #1108 from tdjogi010/development | Vincent | 2015-03-06 | 1 | -38/+74 |
| |\ | | | | | | | Asks Passphrase for key delete/export in ViewKeyActivity. | ||||
| | * | Asks Passphrase for key delete/export in ViewKeyActivity. | tdjogi010@gmail.com | 2015-03-06 | 1 | -38/+74 |
| | | | |||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 5 | -84/+216 |
|\| | | | | | | | | | | | development | ||||
| * | | Added GPLv3 License | chipset95 | 2015-03-06 | 2 | -0/+34 |
| | | | |||||
| * | | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 5 | -84/+182 |
| | | | |||||
* | | | Fix elevation | Dominik Schürmann | 2015-03-06 | 1 | -2/+2 |
|/ / | |||||
* | | Format code of merged password strength widget | Dominik Schürmann | 2015-03-05 | 2 | -40/+49 |
| | | |||||
* | | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 3 | -0/+494 |
|\ \ | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java | ||||
| * | | Integrates passphrase strength indicator to create key wizard. | Lukas Zorich | 2015-03-03 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 classes | Lukas Zorich | 2015-03-03 | 3 | -0/+68 |
| | | | |||||
| * | | Implemented Matt Allen password strength indicator | Lukas Zorich | 2015-03-03 | 2 | -0/+420 |
| |/ | | | | | | | | | | | | | 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. |