| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -1/+2 | |
| | | | ||||||
| * | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -6/+8 | |
| | | | ||||||
| * | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -1/+3 | |
| | | | ||||||
| * | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 | |
| | | | ||||||
| * | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 1 | -0/+2 | |
| | | | ||||||
| * | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 | |
| | | | ||||||
| * | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -2/+4 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -3/+5 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | |||||
| | * | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 1 | -3/+5 | |
| | | | ||||||
| * | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -1/+2 | |
| | | | ||||||
| * | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 1 | -1/+1 | |
| |/ | ||||||
| * | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 1 | -0/+1 | |
| | | ||||||
| * | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 1 | -1/+2 | |
| | | ||||||
| * | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+4 | |
| | | ||||||
| * | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 1 | -3/+4 | |
| | | ||||||
| * | Pull from transifex | Dominik Schürmann | 2015-03-10 | 1 | -1/+1 | |
| | | ||||||
| * | API 7 | Dominik Schürmann | 2015-03-10 | 1 | -1/+2 | |
| | | ||||||
| * | Ripple | Dominik Schürmann | 2015-03-10 | 1 | -4/+0 | |
| | | ||||||
| * | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 1 | -0/+3 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | 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/+1 | |
| | | | ||||||
| | * | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 1 | -2/+4 | |
| | | | ||||||
| | * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+2 | |
| | | | ||||||
| | * | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+1 | |
| | | | ||||||
| * | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 1 | -1/+4 | |
| | | | ||||||
| * | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+1 | |
| | | | ||||||
| * | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 1 | -2/+4 | |
| |/ | ||||||
| * | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -2/+2 | |
| | | ||||||
| * | Improve icons | Dominik Schürmann | 2015-03-09 | 1 | -7/+7 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-09 | 1 | -2/+5 | |
| |\ | | | | | | | development | |||||
| | * | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -2/+5 | |
| | | | ||||||
| * | | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 1 | -2/+4 | |
| |/ | ||||||
| * | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 1 | -0/+14 | |
| |\ | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java | |||||
| | * | Implemented Matt Allen password strength indicator | Lukas Zorich | 2015-03-03 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | 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. | |||||
| * | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 | |
| | | | ||||||
| * | | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -0/+1 | |
| | | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists | |||||
| * | | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | Rewording secret_key_deletion_confirmation | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 1 | -0/+11 | |
| |\ \ | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-03-02 | 2 | -2/+3 | |
| | |\| | | | | | | | | | | into development | |||||
| | * | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 | |
| | | | | ||||||
| | * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 1 | -15/+16 | |
| | |\ \ | | | | | | | | | | | | | into development | |||||
| | * \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 1 | -0/+58 | |
| | |\ \ \ | | | | | | | | | | | | | | | | into development | |||||
| | * \ \ \ | merged dialog | Adithya Abraham Philip | 2015-02-26 | 9 | -139/+67 | |
| | |\ \ \ \ | ||||||
| | * | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+4 | |
| | | | | | | | ||||||
| * | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 1 | -16/+15 | |
| | | | | | | | ||||||
| * | | | | | | More simplification of delete strings | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Simplify certify strings | Dominik Schürmann | 2015-03-04 | 1 | -11/+2 | |
| | | | | | | | ||||||
| * | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 1 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Fix toolbar margins on Android lower 5 | Dominik Schürmann | 2015-03-03 | 1 | -0/+1 | |
| | |_|_|_|/ |/| | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |