| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #420 from gogowitczak/master | Dominik Schürmann | 2014-03-18 | 1 | -2/+3 | |
| |\ \ | | | | | | | Added FAQ: specifying connection port for Keyserver. | |||||
| | * | | Added FAQ: specifying connection port for Keyserver. | gogowitczak | 2014-03-14 | 1 | -2/+3 | |
| | |/ | ||||||
| * | | make loading of drawer items a bit more dynamic | uberspot | 2014-03-17 | 3 | -19/+28 | |
| | | | ||||||
| * | | Lock drawer as open in tablets | uberspot | 2014-03-16 | 21 | -692/+863 | |
| | | | ||||||
| * | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 9 | -79/+112 | |
| |/ | ||||||
| * | 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 code style changes | uberspot | 2014-03-13 | 12 | -106/+132 | |
| | | ||||||
| * | fix code style in /pgp | uberspot | 2014-03-13 | 11 | -491/+436 | |
| | | ||||||
| * | final ui code style changes | uberspot | 2014-03-13 | 12 | -53/+54 | |
| | | ||||||
| * | more code style changes in /ui and /util | uberspot | 2014-03-13 | 24 | -323/+345 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | Fix colors in item view | Dominik Schürmann | 2014-03-13 | 2 | -2/+2 | |
| | | ||||||
| * | remove unused color | Dominik Schürmann | 2014-03-13 | 1 | -1/+0 | |
| | | ||||||
| * | Improve list item view, borderless button for API < 11 | Dominik Schürmann | 2014-03-13 | 4 | -55/+78 | |
| | | ||||||
| * | First code style changes in ui | uberspot | 2014-03-13 | 56 | -634/+486 | |
| | | ||||||
| * | Fix code style in /helper | uberspot | 2014-03-13 | 5 | -71/+64 | |
| | | ||||||
| * | 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 | |
| | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |