| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Button Text changes to Change Passphrase if Passphrase is set | Sreeram Boyapati | 2014-03-18 | 1 | -3/+5 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #424 from gogowitczak/mro-branch | Dominik Schürmann | 2014-03-18 | 1 | -15/+27 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Machine readable output for Keyserver query | |||||
| | * | | | | | Fixed coding style. | gogowitczak | 2014-03-18 | 1 | -26/+23 | |
| | | | | | | | ||||||
| | * | | | | | Keyserver query now uses machine readable output for search and get. Added ↵ | gogowitczak | 2014-03-15 | 1 | -15/+30 | |
| | |/ / / / | | | | | | | | | | | | | | | | separate function for converting algorithm integer ID to String. | |||||
| * | | | | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 4 | -79/+220 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Revamp certify dialogue | |||||
| | * | | | | | certify: sign individual UIDs | Vincent Breitmoser | 2014-03-15 | 1 | -6/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | direct signing of pubkeys is out for now. not sure how this should be handled, but it's trivial to re-add so leaving this up for discussion for now. | |||||
| | * | | | | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 1 | -1/+96 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled. | |||||
| | * | | | | | certify: viewkeyuseridsadapter cosmetics and checkbox capability | Vincent Breitmoser | 2014-03-15 | 2 | -12/+82 | |
| | | | | | | | ||||||
| | * | | | | | certify: selectsecretkeyfragment cosmetics | Vincent Breitmoser | 2014-03-15 | 1 | -3/+10 | |
| | | | | | | | ||||||
| | * | | | | | 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 | 2 | -61/+2 | |
| | |/ / / / | ||||||
| * | | | | | make loading of drawer items a bit more dynamic | uberspot | 2014-03-17 | 2 | -19/+14 | |
| | | | | | | ||||||
| * | | | | | Lock drawer as open in tablets | uberspot | 2014-03-16 | 2 | -25/+64 | |
| | | | | | | ||||||
| * | | | | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 4 | -11/+25 | |
| |/ / / / | ||||||
| * | | | | Fix two bugs in ImportKeys screen (issue #416) | uberspot | 2014-03-14 | 2 | -0/+2 | |
| | | | | | ||||||
| * | | | | Make email address less restrictive and add icon to show when it's correct | uberspot | 2014-03-14 | 2 | -11/+28 | |
| | | | | | ||||||
| * | | | | final ui code style changes | uberspot | 2014-03-13 | 7 | -23/+23 | |
| | | | | | ||||||
| * | | | | more code style changes in /ui and /util | uberspot | 2014-03-13 | 13 | -99/+121 | |
| | | | | | ||||||
| * | | | | more UI code style fixes | uberspot | 2014-03-13 | 9 | -70/+77 | |
| | | | | | ||||||
| * | | | | More code style fixes for /ui | uberspot | 2014-03-13 | 16 | -53/+91 | |
| | | | | | ||||||
| * | | | | First code style changes in ui | uberspot | 2014-03-13 | 56 | -634/+486 | |
| | | | | | ||||||
| * | | | | 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 | |
| | | | | | | ||||||
| * | | | | | Add FAQ tab to help | Dominik Schürmann | 2014-03-13 | 1 | -8/+11 | |
| | | | | | | ||||||
| * | | | | | Readd create key menu items | Dominik Schürmann | 2014-03-13 | 1 | -12/+38 | |
| | | | | | | ||||||
| * | | | | | Cleanup and simplification | Dominik Schürmann | 2014-03-13 | 1 | -60/+23 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 2 | -12/+40 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | |||||
| | * | | | | Merge pull request #396 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-12 | 1 | -0/+2 | |
| | |\ \ \ \ | | | | | | | | | | | | | Lint error fix after testing | |||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into Lint-error-fix | Bhargav Golla | 2014-03-10 | 12 | -162/+236 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 2 | -1/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526 | uberspot | 2014-03-12 | 1 | -12/+38 | |
| | | | | | | | | ||||||
| * | | | | | | | merge fixes as per comments in merge | Vincent Breitmoser | 2014-03-13 | 1 | -30/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753 | |||||
| * | | | | | | | keychainprovider cleanup, kindasorta | Vincent Breitmoser | 2014-03-13 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed code redundancy, and the query is in the switch thing now, I didn't put everything into its own separate sources (yet?). | |||||
| * | | | | | | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 10 | -729/+375 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 contact count to My Keys header | Vincent Breitmoser | 2014-03-08 | 1 | -1/+10 | |
| | | | | | | | | ||||||
| | * | | | | | | better handling of multi select in ListKeysFragment | Vincent Breitmoser | 2014-03-08 | 1 | -17/+22 | |
| | | | | | | | | ||||||
| | * | | | | | | ditch old key list activities | Vincent Breitmoser | 2014-03-08 | 7 | -1110/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 2 | -1/+30 | |
| | | | | | | | | ||||||
| | * | | | | | | move some placeholders into resources | Vincent Breitmoser | 2014-03-08 | 2 | -3/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Normalize public key uri in KeyListFragment | Vincent Breitmoser | 2014-03-08 | 2 | -6/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find the explicit row id of the public key id given in the uri in KeyListFragment and work with that. This way, passing in uris by master key id, mail address, or any other criteria, works. Might be a good idea to add an actual check if the row id is non-zero here, but not sure how to do a "bad intent" thing | |||||
| | * | | | | | | Make EditKeyActivity's uri handling (more) sane | Vincent Breitmoser | 2014-03-08 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This activity didn't actually use the uri for anything, but just chopped off the last path segment and interpreted it as row id. What the hell. | |||||
| | * | | | | | | working unified list (no actions yet) | Vincent Breitmoser | 2014-03-08 | 4 | -244/+273 | |
| | | | | | | | | ||||||
| | * | | | | | | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 3 | -0/+641 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #395 from uberspot/master | Dominik Schürmann | 2014-03-12 | 15 | -35/+57 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove duplicate code from ActionBarHelper. Add export in multiselect. | |||||
| | * | | | | | | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 1 | -5/+12 | |
| | | | | | | | | | ||||||
| | * | | | | | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵ | uberspot | 2014-03-11 | 6 | -8/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imports and throw exceptions | |||||
| | * | | | | | | | minor clean up in colorize method | uberspot | 2014-03-11 | 1 | -2/+3 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Add export... button and functionality in multi-select | uberspot | 2014-03-11 | 6 | -11/+21 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Make export work with rowIds instead of MasterKeyIds | uberspot | 2014-03-11 | 2 | -2/+4 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵ | uberspot | 2014-03-11 | 3 | -9/+9 | |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | via the method calls | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |