Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adjust import order | Thialfihar | 2014-04-02 | 1 | -1/+0 |
| | |||||
* | Simplify can encrypt check | Dominik Schürmann | 2014-03-26 | 1 | -19/+24 |
| | |||||
* | Merge pull request #471 from sreeram-boyapati/encryption | Dominik Schürmann | 2014-03-26 | 1 | -1/+11 |
|\ | | | | | Added can_encrypt check | ||||
| * | Added can_encrypt check | Sreeram Boyapati | 2014-03-23 | 1 | -1/+11 |
| | | |||||
* | | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 1 | -1/+1 |
| | | |||||
* | | put colorize method into key helper | Dominik Schürmann | 2014-03-20 | 1 | -1/+1 |
|/ | |||||
* | revert ca_necrypt patch | Dominik Schürmann | 2014-03-18 | 1 | -4/+0 |
| | |||||
* | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 1 | -5/+6 |
|\ | | | | | Show revocation status in ViewKeyKeysAdapter #375 | ||||
| * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 1 | -5/+6 |
| | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | ||||
* | | Merge pull request #437 from sreeram-boyapati/encrypt | Dominik Schürmann | 2014-03-18 | 1 | -1/+4 |
|\ \ | | | | | | | Can_Encrypt Check added to hide Button | ||||
| * | | Code Style fix | Sreeram Boyapati | 2014-03-18 | 1 | -2/+2 |
| | | | |||||
| * | | Can_Encrypt Check added to hide Button | Sreeram Boyapati | 2014-03-18 | 1 | -1/+4 |
| |/ | |||||
* | | certify: viewkeyuseridsadapter cosmetics and checkbox capability | Vincent Breitmoser | 2014-03-15 | 1 | -6/+7 |
| | | |||||
* | | certify: add certify action button to viewkeymainfragment | Vincent Breitmoser | 2014-03-15 | 1 | -0/+21 |
| | | |||||
* | | move fingerprint coloring into helper | Vincent Breitmoser | 2014-03-15 | 1 | -61/+1 |
|/ | |||||
* | More code style fixes for /ui | uberspot | 2014-03-13 | 1 | -13/+24 |
| | |||||
* | First code style changes in ui | uberspot | 2014-03-13 | 1 | -10/+5 |
| | |||||
* | Merge pull request #407 from uberspot/master | Dominik Schürmann | 2014-03-13 | 1 | -15/+31 |
|\ | | | | | Add apg's change to colorizing, no more background changes needed | ||||
| * | add apg's change to colorizing, no more background changes needed | uberspot | 2014-03-13 | 1 | -15/+31 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 1 | -12/+38 |
|\| | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | ||||
| * | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526 | uberspot | 2014-03-12 | 1 | -12/+38 |
| | | |||||
* | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 1 | -0/+29 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 1 | -0/+30 |
| | | |||||
* | | minor clean up in colorize method | uberspot | 2014-03-11 | 1 | -2/+3 |
| | | |||||
* | | remove unneeded replace for newline on fingerprint | Dominik Schürmann | 2014-03-09 | 1 | -2/+1 |
| | | |||||
* | | Colorize fingerprint | uberspot | 2014-03-09 | 1 | -3/+25 |
| | | |||||
* | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 1 | -1/+1 |
|/ | |||||
* | rework key view into fragments to later add certifications | Dominik Schürmann | 2014-02-09 | 1 | -0/+313 |