| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Properly hide fab in ViewKeyActivity, fixes #1580 | Dominik Schürmann | 2015-11-02 | 1 | -5/+28 |
| | | |||||
| * | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 1 | -4/+2 |
| | | |||||
| * | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 |
| | | |||||
| * | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 1 | -1/+1 |
| |\ | |||||
| | * | Improve NFC exception handling, fixes RuntimeExceptions | Dominik Schürmann | 2015-09-30 | 1 | -1/+1 |
| | | | |||||
| * | | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 1 | -7/+8 |
| |/ | |||||
| * | linked: fix "navigate up" in LinkedIdWizard (imperfect) | Vincent Breitmoser | 2015-09-06 | 1 | -1/+2 |
| | | |||||
| * | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 1 | -6/+15 |
| | | |||||
| * | Show linked identity menu item and linked identities only when feature is ↵ | Dominik Schürmann | 2015-08-29 | 1 | -1/+2 |
| | | | | | enabled | ||||
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -5/+30 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -40/+46 |
| | | | |||||
| | * | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -37/+12 |
| | | | |||||
| | * | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 1 | -3/+3 |
| | | | |||||
| | * | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 1 | -41/+139 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| | * \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -4/+4 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 1 | -194/+71 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 1 | -3/+10 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| | * | | | | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 1 | -13/+15 |
| | | | | | | | |||||
| | * | | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -9/+16 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 1 | -44/+80 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * | | | | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 1 | -163/+162 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -33/+28 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| | * | | | | | | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 1 | -0/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Make keybase an experimental feature | Dominik Schürmann | 2015-08-28 | 1 | -0/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | introduce text protection and fix color change after confirm | Dominik Schürmann | 2015-08-28 | 1 | -1/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-08-28 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-08-27 | 1 | -2/+10 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | use nicer filenames during export | Vincent Breitmoser | 2015-08-27 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Collapsing Toolbar | Dominik Schürmann | 2015-08-28 | 1 | -35/+32 |
| | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Experimental word comparison | Dominik Schürmann | 2015-08-27 | 1 | -2/+10 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Fix key view toolbar and status colour | Thialfihar | 2015-07-21 | 1 | -4/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The status bar wrongly used the same colour as the toolbar, making it indistinguishable from it. This calculates the status bar colour based on the toolbar colour. | ||||
| * | | | | | | | | Fix drawer background color for ViewKeyActivity | Thialfihar | 2015-07-21 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Give key flag colors their own color names | Thialfihar | 2015-07-21 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray". | ||||
| * | | | | | | | | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | use only one DeleteDialogActivity | Adithya Abraham Philip | 2015-07-13 | 1 | -18/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 1 | -23/+27 |
| | | | | | | | | | |||||
| * | | | | | | | | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | change wording of export dialog, remove "export secret" checkbox | Vincent Breitmoser | 2015-07-08 | 1 | -21/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Do not ask for passphrase on delete | Dominik Schürmann | 2015-07-08 | 1 | -9/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Rudimentary backup feature | Dominik Schürmann | 2015-07-08 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | try cache in certify operation (fixes #1242) | Vincent Breitmoser | 2015-07-07 | 1 | -61/+45 |
| | | | | | | | | | |||||
| * | | | | | | | | fix passphrase->deletion ui flow for secret keys, and disregard cache | Vincent Breitmoser | 2015-07-07 | 1 | -38/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | fix handling of progress dialog creation in CryptoOperationFragment (fixes ↵ | Vincent Breitmoser | 2015-07-07 | 1 | -33/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #1407) | ||||
| * | | | | | | | | don't cache exporthelper, keep type for KeyItem in KeySpinner | Vincent Breitmoser | 2015-07-06 | 1 | -9/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Cleanup tor code | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 1 | -8/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | added proxy to all import operations using KeychainService | Adithya Abraham Philip | 2015-07-03 | 1 | -5/+1 |
| | | | | | | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |