aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* split up wait/action yubikey fragmentsVincent Breitmoser2015-03-2111-19/+88
|
* work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-16/+85
|
* first steps toward yubikey activityVincent Breitmoser2015-03-212-17/+100
| | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-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 ImportKeysActivityManoj Khanna2015-03-201-5/+15
| |
* | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| |
* | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+4
| |
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2029-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 ViewKent2015-03-206-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 wizardDominik Schürmann2015-03-1923-160/+131
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
| |
* | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
|/
* Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
|
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-2/+16
|
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-163-5/+17
|
* Clarify certification help screenDominik Schürmann2015-03-161-2/+2
|
* Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-0/+22
|
* Remove display of key id in other listsDominik Schürmann2015-03-151-1/+1
|
* Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-151-2/+2
| | | | duplicate
* Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
|
* Updated fix for Issue #1116Manoj Khanna2015-03-1120-54/+58
|
* Version 3.2beta2Dominik Schürmann2015-03-101-1/+2
|
* Pull from transifexDominik Schürmann2015-03-1071-1105/+1328
|
* Changelog 3.2beta1Dominik Schürmann2015-03-101-0/+14
|
* Remove unused NFC Beam htmlDominik Schürmann2015-03-1024-268/+0
|
* API 7Dominik Schürmann2015-03-103-76/+72
|
* RippleDominik Schürmann2015-03-1023-41/+39
|
* Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-102-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 keyDominik Schürmann2015-03-102-0/+8
| |
| * changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| |
| * Make create key wizard step-by-stepDominik Schürmann2015-03-1034-115/+219
| |
| * added contact linkingAdithya Abraham Philip2015-03-102-3/+22
| |
| * added cardAdithya Abraham Philip2015-03-102-5/+34
| |
* | Add additional email addresses in create keyDominik Schürmann2015-03-1010-1/+88
| |
* | Show passphrase checkbox in create keyDominik Schürmann2015-03-092-0/+8
| |
* | Make create key wizard step-by-stepDominik Schürmann2015-03-0934-115/+219
|/
* Some fixes for delete after encryptionDominik Schürmann2015-03-092-19/+19
|
* Fix colors for remote activityDominik Schürmann2015-03-092-13/+6
|
* Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-092-2/+2
|\ | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
| * Implemented NameEditTextchipset952015-03-092-2/+2
| |
* | Redesign of encrypt activites finishedDominik Schürmann2015-03-099-115/+17
| |
* | Improve iconsDominik Schürmann2015-03-0916-7/+7
| |
* | Fix padding in create keyDominik Schürmann2015-03-091-0/+2
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-093-28/+14
|\| | | | | | | development
| * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-092-26/+9
| |\ | | | | | | Passphrase strength indicator
| | * minor xml code style correctionAdithya Abraham Philip2015-03-081-8/+8
| | |
| | * cleaned up codeAdithya Abraham Philip2015-03-061-0/+1
| | |
| | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-061-5/+1
| | |
| | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-061-1/+1
| | |
| | * added PassphraseEditTextAdithya Abraham Philip2015-03-061-17/+3
| | |