| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | minor fixes to ViewKeyActivity | Vincent Breitmoser | 2016-01-05 | 1 | -3/+3 |
| | | |||||
| * | Improve linked identity handling | Dominik Schürmann | 2015-12-31 | 1 | -50/+79 |
| | | |||||
| * | Edit identities design | Dominik Schürmann | 2015-12-31 | 1 | -0/+12 |
| | | |||||
| * | Add activity to edit user ids only | Dominik Schürmann | 2015-12-30 | 1 | -7/+20 |
| | | |||||
| * | Add edit action to user id card, left align card actions per material design ↵ | Dominik Schürmann | 2015-12-29 | 1 | -1/+10 |
| | | | | | guidelines | ||||
| * | Make ContactHelper less static | Dominik Schürmann | 2015-12-21 | 1 | -5/+5 |
| | | |||||
| * | Show notification when READ_CONTACTS permission is denied in sync service, ↵ | Dominik Schürmann | 2015-11-23 | 1 | -9/+22 |
| | | | | | hide linked contact card if permission is denied | ||||
| * | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 1 | -19/+39 |
| | | |||||
| * | Show linked identity menu item and linked identities only when feature is ↵ | Dominik Schürmann | 2015-08-29 | 1 | -4/+7 |
| | | | | | enabled | ||||
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -5/+100 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 1 | -0/+2 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | | show linked ids card only if unfiltered ids are available | Vincent Breitmoser | 2015-04-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 1 | -61/+175 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03-15 | 1 | -12/+31 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| | * | | | | show certificates for secret keys differently | Vincent Breitmoser | 2015-03-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | hack loadSystemContact back in | Vincent Breitmoser | 2015-03-10 | 1 | -5/+5 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -1/+67 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
| | * | | | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 1 | -1/+6 |
| | | | | | | | |||||
| | * | | | | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 1 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | fix transition animation | Vincent Breitmoser | 2015-03-09 | 1 | -7/+24 |
| | | | | | | | |||||
| | * | | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 1 | -58/+38 |
| | | | | | | | |||||
| | * | | | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 1 | -1/+10 |
| | | | | | | | |||||
| | * | | | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 1 | -3/+4 |
| | | | | | | | |||||
| | * | | | | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 1 | -4/+32 |
| | | | | | | | |||||
| | * | | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -7/+29 |
| | | | | | | | |||||
| | * | | | | | remove unused bits from projection | Vincent Breitmoser | 2015-03-02 | 1 | -15/+1 |
| | | | | | | | |||||
| * | | | | | | fix nullpointer in ViewKeyFragment | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 1 | -0/+2 |
| | |_|_|/ |/| | | | |||||
| * | | | | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 1 | -9/+23 |
| | | | | | |||||
| * | | | | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 1 | -20/+70 |
| | |_|/ |/| | | |||||
| * | | | -fixed out of bounds crash when retrieving the main profile name with secret ↵ | Daniel Ramos | 2015-03-15 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid | ||||
| * | | | added some documentation | Adithya Abraham Philip | 2015-03-13 | 1 | -4/+5 |
| | | | | |||||
| * | | | added own profile support in linekd system contact | Adithya Abraham Philip | 2015-03-13 | 1 | -7/+25 |
| | | | | |||||
| * | | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 1 | -11/+12 |
| | |/ |/| | |||||
| * | | cleaned up code, added comments | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+15 |
| | | | | | | | | | optimised imports | ||||
| * | | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+52 |
| | | | |||||
| * | | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+18 |
| | | | |||||
| * | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 1 | -2/+2 |
| |/ | | | | instead of EXPIRY where possible | ||||
| * | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 1 | -3/+1 |
| | | |||||
| * | some cleanup in ViewKey* | Vincent Breitmoser | 2015-03-02 | 1 | -15/+4 |
| | | |||||
| * | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 1 | -6/+1 |
| | | |||||
| * | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -23/+85 |
| | | | | | keys | ||||
| * | CardView and more header design | Dominik Schürmann | 2015-02-25 | 1 | -2/+3 |
| | | |||||
| * | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 1 | -451/+5 |
| | | |||||
| * | Remove tabs in view key | Dominik Schürmann | 2015-02-24 | 1 | -0/+615 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |