Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add change password menu item to view key | Dominik Schürmann | 2015-12-31 | 1 | -0/+5 |
| | |||||
* | Improve linked identity handling | Dominik Schürmann | 2015-12-31 | 1 | -5/+0 |
| | |||||
* | Add activity to edit user ids only | Dominik Schürmann | 2015-12-30 | 1 | -21/+14 |
| | |||||
* | inline subkey editing (wip commit) | Vincent Breitmoser | 2015-12-27 | 1 | -1/+1 |
| | |||||
* | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 1 | -1/+1 |
| | |||||
* | Confirm design | Dominik Schürmann | 2015-09-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -1/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 1 | -0/+5 |
| | | | |||||
* | | | Experimental word comparison | Dominik Schürmann | 2015-08-27 | 1 | -0/+6 |
| |/ |/| | |||||
* | | change icon name in layout files | jiangkai | 2015-03-03 | 1 | -1/+1 |
|/ | |||||
* | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 1 | -0/+6 |
| | |||||
* | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -0/+7 |
| | | | | keys | ||||
* | Fix QR Code, design experiments for key view | Dominik Schürmann | 2015-02-24 | 1 | -1/+6 |
| | |||||
* | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 1 | -1/+0 |
| | |||||
* | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 1 | -17/+0 |
| | |||||
* | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 1 | -0/+6 |
| | |||||
* | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -49/+2 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+81 |