| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -4/+14 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md | ||||
| | * | don't show key spinner for a single entry | Vincent Breitmoser | 2015-04-24 | 1 | -0/+7 |
| | | | |||||
| | * | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 1 | -0/+6 |
| | | | |||||
| * | | actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366) | Vincent Breitmoser | 2015-07-06 | 1 | -2/+6 |
| | | | |||||
| * | | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 1 | -25/+11 |
| | | | |||||
| * | | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-27 | 1 | -1/+1 |
| |/ | |||||
| * | Fixes for selection of certify key | Dominik Schürmann | 2015-03-15 | 1 | -8/+17 |
| | | |||||
| * | Merge pull request #1142 from tdjogi010/development | Dominik Schürmann | 2015-03-15 | 1 | -4/+10 |
| |\ | | | | | Preselected Suitable Key | ||||
| | * | Preselected Suitable Key | tdjogi010@gmail.com | 2015-03-13 | 1 | -4/+10 |
| | | | |||||
| * | | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 1 | -1/+3 |
| |/ | | | | duplicate | ||||
| * | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 1 | -3/+4 |
| | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | ||||
| * | pre-select certification key if only one is available | Vincent Breitmoser | 2015-02-26 | 1 | -4/+5 |
| | | |||||
| * | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 1 | -3/+4 |
| | | |||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -1/+0 |
| | | |||||
| * | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 |
| | | | | | Closes #981 | ||||
| * | Silently fail on import on key import with ArrayIndexOutOfBoundsException | Dominik Schürmann | 2014-10-16 | 1 | -3/+3 |
| | | |||||
| * | More consisitency | Dominik Schürmann | 2014-10-15 | 1 | -3/+3 |
| | | |||||
| * | preselect certify key | Dominik Schürmann | 2014-10-05 | 1 | -1/+4 |
| | | |||||
| * | Import code, fix collision of key spinner with other loaders | Dominik Schürmann | 2014-10-04 | 1 | -6/+9 |
| | | |||||
| * | Use key icons in spinners | Dominik Schürmann | 2014-09-17 | 1 | -4/+31 |
| | | |||||
| * | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 1 | -1/+2 |
| | | | | | Fixes #849 | ||||
| * | if there is only one private key, use it fo certification by default | Vincent Breitmoser | 2014-08-31 | 1 | -1/+12 |
| | | |||||
| * | Add license headers | Dominik Schürmann | 2014-08-19 | 1 | -0/+17 |
| | | |||||
| * | Do not allow self certifying | mar-v-in | 2014-08-14 | 1 | -2/+14 |
| | | |||||
| * | Add and use CertifyKeySpinner | mar-v-in | 2014-08-14 | 1 | -0/+48 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java