| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix code style in keychain/service/ | uberspot | 2014-03-13 | 11 | -87/+129 |
| | | |||||
| * | Optimize imports in all files, remove useless whitespace in some and fix ↵ | uberspot | 2014-03-13 | 11 | -128/+80 |
| | | | | | indentation | ||||
| * | 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 |
| | | | |||||
| * | | Forgot faq file | Dominik Schürmann | 2014-03-13 | 1 | -0/+12 |
| | | | |||||
| * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-13 | 1 | -23/+29 |
| |\ \ | |||||
| | * \ | Merge pull request #408 from gogowitczak/master | Dominik Schürmann | 2014-03-13 | 1 | -23/+29 |
| | |\ \ | | | | | | | | | Specifying connection port in KeyServer | ||||
| | | * | | Added possibility to specify port for KeyServer. | gogowitczak | 2014-03-13 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Added possibility to specify port for KeyServer. | gogowitczak | 2014-03-13 | 1 | -24/+30 |
| | | |/ | |||||
| * | / | Add FAQ tab to help | Dominik Schürmann | 2014-03-13 | 2 | -8/+12 |
| |/ / | |||||
| * | | Readd create key menu items | Dominik Schürmann | 2014-03-13 | 3 | -16/+61 |
| | | | |||||
| * | | XML cleanup and bigger filename EditText | Dominik Schürmann | 2014-03-13 | 3 | -161/+173 |
| | | | |||||
| * | | Cleanup and simplification | Dominik Schürmann | 2014-03-13 | 2 | -61/+24 |
| | | | |||||
| * | | drop unified uri in favor of generic /key_rings | Vincent Breitmoser | 2014-03-13 | 2 | -15/+10 |
| | | | | | | | | | | | | | | | this works well in the uri schema, and we get notifications back with no effort. ....also remove a line I committed accidentally oO | ||||
| * | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-03-13 | 14 | -44/+128 |
| |\| | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | ||||
| | * | Export cancellable - minor changes | grait | 2014-03-13 | 3 | -6/+10 |
| | | | |||||
| | * | Export is cancellable now | grait | 2014-03-13 | 3 | -16/+52 |
| | | | |||||
| | * | Merge pull request #396 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-12 | 9 | -17/+13 |
| | |\ | | | | | | | Lint error fix after testing | ||||
| | | * | Removing tab | Bhargav Golla | 2014-03-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Removing unused string | Bhargav Golla | 2014-03-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/master' into Lint-error-fix | Bhargav Golla | 2014-03-10 | 49 | -481/+1293 |
| | | |\ | |||||
| | | * | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 10 | -19/+14 |
| | | | | | |||||
| | * | | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526 | uberspot | 2014-03-12 | 2 | -12/+60 |
| | | | | | |||||
| * | | | | 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 | ||||
| * | | | | remove special treatment for unified list query | Vincent Breitmoser | 2014-03-13 | 1 | -39/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | note: the unified query /will/ need special treatment once certs are joined in, so I am leaving this as an artifact commit for later reference or point to revert to. | ||||
| * | | | | keychainprovider cleanup, kindasorta | Vincent Breitmoser | 2014-03-13 | 2 | -56/+47 |
| | | | | | | | | | | | | | | | | | | | | | 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 | 27 | -876/+600 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -2/+30 |
| | | | | | |||||
| | * | | | 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 | 19 | -1433/+6 |
| | | | | | |||||
| | * | | | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 5 | -2/+71 |
| | | | | | |||||
| | * | | | move some placeholders into resources | Vincent Breitmoser | 2014-03-08 | 4 | -5/+6 |
| | | | | | |||||
| | * | | | Normalize public key uri in KeyListFragment | Vincent Breitmoser | 2014-03-08 | 3 | -6/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -246/+450 |
| | | | | | |||||
| | * | | | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 8 | -5/+776 |
| | | | | | |||||
| * | | | | Merge pull request #395 from uberspot/master | Dominik Schürmann | 2014-03-12 | 38 | -281/+244 |
| |\ \ \ \ | | | | | | | | | | | Remove duplicate code from ActionBarHelper. Add export in multiselect. | ||||
| | * | | | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 4 | -6/+55 |
| | | | | | | |||||
| | * | | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵ | uberspot | 2014-03-11 | 15 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -12/+31 |
| | | | | | | |||||
| | * | | | | Make export work with rowIds instead of MasterKeyIds | uberspot | 2014-03-11 | 6 | -53/+92 |
| | | | | | | |||||
| | * | | | | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵ | uberspot | 2014-03-11 | 9 | -187/+42 |
| | | |_|/ | |/| | | | | | | | | | | via the method calls | ||||
| * | | | | Merge pull request #397 from tharinduwijewardane/master | Dominik Schürmann | 2014-03-12 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted ) | ||||
| | * | | | | Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed | Tharindu Wijewardane | 2014-03-11 | 1 | -0/+1 |
| | |/ / / | |||||
| * / / / | Fix error in importing/updating keys from keyserver by removing extra 0x | Miroojin Bakshi | 2014-03-12 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | more tight layout | Dominik Schürmann | 2014-03-11 | 1 | -12/+10 |
| | | | | |||||
| * | | | cleanup | Dominik Schürmann | 2014-03-11 | 2 | -43/+37 |
| | | | | |||||
| * | | | Merge pull request #394 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-11 | 1 | -1/+4 |
| |\ \ \ | | | | | | | | | linear layout edited to display test horizontally #391 | ||||
| | * | | | linear layout edited to display test horizontally | Sreeram Boyapati | 2014-03-11 | 1 | -1/+4 |
| | | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |