Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -265/+0 |
| | |||||
* | Fix nfc, make edit activity like a modal dialog, move all menu actions into ↵ | Dominik Schürmann | 2014-04-05 | 1 | -2/+1 |
| | | | | view activity | ||||
* | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity | Vincent Breitmoser | 2014-04-04 | 1 | -1/+2 |
| | |||||
* | Fix layouts | Dominik Schürmann | 2014-04-01 | 1 | -11/+9 |
| | |||||
* | Move fingerprint up below the algorithm in key view | Thialfihar | 2014-03-20 | 1 | -15/+15 |
| | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification. | ||||
* | certify: add certify action button to viewkeymainfragment | Vincent Breitmoser | 2014-03-15 | 1 | -0/+11 |
| | |||||
* | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 1 | -1/+31 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml | ||||
| * | ditch old key list activities | Vincent Breitmoser | 2014-03-08 | 1 | -1/+1 |
| | | |||||
| * | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 1 | -1/+31 |
| | | |||||
* | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 1 | -1/+1 |
|/ | |||||
* | fix margins | Dominik Schürmann | 2014-02-17 | 1 | -2/+2 |
| | |||||
* | prevent key view from scrolling, move encrypt button down again | Dominik Schürmann | 2014-02-17 | 1 | -17/+21 |
| | |||||
* | rework key view into fragments to later add certifications | Dominik Schürmann | 2014-02-09 | 1 | -0/+222 |