Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 3 | -70/+117 | |
| | | ||||||
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 11 | -19/+88 | |
| | | ||||||
* | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -16/+85 | |
| | | ||||||
* | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 2 | -17/+100 | |
| | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | |||||
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 1 | -5/+15 | |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -5/+15 | |
| | | ||||||
* | | 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 | 29 | -164/+152 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 6 | -4/+21 | |
| | | | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | |||||
| * | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 23 | -160/+131 | |
| | | ||||||
* | | 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 | |
|/ | ||||||
* | Disable hidden recipients for now | Dominik Schürmann | 2015-03-16 | 2 | -10/+10 | |
| | ||||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 3 | -2/+16 | |
| | ||||||
* | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 3 | -5/+17 | |
| | ||||||
* | Clarify certification help screen | Dominik Schürmann | 2015-03-16 | 1 | -2/+2 | |
| | ||||||
* | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 1 | -0/+22 | |
| | ||||||
* | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 1 | -1/+1 | |
| | ||||||
* | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 1 | -2/+2 | |
| | | | | duplicate | |||||
* | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+4 | |
| | ||||||
* | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 20 | -54/+58 | |
| | ||||||
* | Version 3.2beta2 | Dominik Schürmann | 2015-03-10 | 1 | -1/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2015-03-10 | 71 | -1105/+1328 | |
| | ||||||
* | Changelog 3.2beta1 | Dominik Schürmann | 2015-03-10 | 1 | -0/+14 | |
| | ||||||
* | Remove unused NFC Beam html | Dominik Schürmann | 2015-03-10 | 24 | -268/+0 | |
| | ||||||
* | API 7 | Dominik Schürmann | 2015-03-10 | 3 | -76/+72 | |
| | ||||||
* | Ripple | Dominik Schürmann | 2015-03-10 | 23 | -41/+39 | |
| | ||||||
* | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 2 | -5/+53 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+8 | |
| | | ||||||
| * | changed default drawable for linked system contact | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+3 | |
| | | ||||||
| * | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 34 | -115/+219 | |
| | | ||||||
| * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 2 | -3/+22 | |
| | | ||||||
| * | added card | Adithya Abraham Philip | 2015-03-10 | 2 | -5/+34 | |
| | | ||||||
* | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 10 | -1/+88 | |
| | | ||||||
* | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 2 | -0/+8 | |
| | | ||||||
* | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 34 | -115/+219 | |
|/ | ||||||
* | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 2 | -19/+19 | |
| | ||||||
* | Fix colors for remote activity | Dominik Schürmann | 2015-03-09 | 2 | -13/+6 | |
| | ||||||
* | Merge pull request #1112 from chipset95/issue-1106-imp | Dominik Schürmann | 2015-03-09 | 2 | -2/+2 | |
|\ | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | |||||
| * | Implemented NameEditText | chipset95 | 2015-03-09 | 2 | -2/+2 | |
| | | ||||||
* | | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 9 | -115/+17 | |
| | | ||||||
* | | Improve icons | Dominik Schürmann | 2015-03-09 | 16 | -7/+7 | |
| | | ||||||
* | | Fix padding in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-09 | 3 | -28/+14 | |
|\| | | | | | | | development | |||||
| * | Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator | Dominik Schürmann | 2015-03-09 | 2 | -26/+9 | |
| |\ | | | | | | | Passphrase strength indicator | |||||
| | * | minor xml code style correction | Adithya Abraham Philip | 2015-03-08 | 1 | -8/+8 | |
| | | | ||||||
| | * | cleaned up code | Adithya Abraham Philip | 2015-03-06 | 1 | -0/+1 | |
| | | | ||||||
| | * | changed default colors for PasswordStrengthView | Adithya Abraham Philip | 2015-03-06 | 1 | -5/+1 | |
| | | | ||||||
| | * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 1 | -1/+1 | |
| | | |