| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | | | | | * | Merge branch 'certify' into certs | Vincent Breitmoser | 2014-03-17 | 2 | -2/+10 | |
| | | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/res/values/strings.xml | |||||
| | * | | | | | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 4 | -7/+73 | |
| | | | | | | | | ||||||
| | | | | | | * | certs: more filters, better initial uid selection, code cosmetics | Vincent Breitmoser | 2014-03-17 | 6 | -55/+87 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add three types of filters for certificate list (ui looks like crap there, need to work on that) - select uncertified uids by default in CertifyKeyActivity - move some code around in KeychainProvider, 's slightly less hacky now | |||||
| | | | | | | * | certs: green dots for verified status \o/ | Vincent Breitmoser | 2014-03-15 | 2 | -3/+21 | |
| | | | | | | | | ||||||
| | | | | | | * | certs: provider cleanup and bugfixing | Vincent Breitmoser | 2014-03-15 | 6 | -83/+74 | |
| | | | | | | | | ||||||
| | | | | | | * | Merge branch 'certify' into certs | Vincent Breitmoser | 2014-03-15 | 12 | -225/+662 | |
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/values/strings.xml | |||||
| | | | | | | | * | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-15 | 3 | -6/+64 | |
| | | |_|_|_|_|/ | |/| | | | | | ||||||
| | * | | | | | | certify: sign individual UIDs | Vincent Breitmoser | 2014-03-15 | 3 | -12/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: add some subscopes in PgpKeyOperation for readability | Vincent Breitmoser | 2014-03-15 | 1 | -112/+128 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note this commit introduces NO semantical changes whatsoever! | |||||
| | * | | | | | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 4 | -1/+186 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha) | Vincent Breitmoser | 2014-03-15 | 1 | -0/+36 | |
| | | | | | | | | ||||||
| | * | | | | | | certify: viewkeyuseridsadapter cosmetics and checkbox capability | Vincent Breitmoser | 2014-03-15 | 3 | -17/+116 | |
| | | | | | | | | ||||||
| | * | | | | | | certify: selectsecretkeyfragment cosmetics | Vincent Breitmoser | 2014-03-15 | 2 | -6/+22 | |
| | | | | | | | | ||||||
| | * | | | | | | certify: add certify action button to viewkeymainfragment | Vincent Breitmoser | 2014-03-15 | 2 | -0/+32 | |
| | | | | | | | | ||||||
| | * | | | | | | move fingerprint coloring into helper | Vincent Breitmoser | 2014-03-15 | 3 | -61/+64 | |
| |/ / / / / / | ||||||
| | | | | | * | Merge branch 'master' into certs | Vincent Breitmoser | 2014-03-15 | 127 | -2422/+2444 | |
| | | | | | |\ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | |||||
| * | | | | | | Merge pull request #417 from uberspot/master | Dominik Schürmann | 2014-03-14 | 4 | -11/+30 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Make email address less restrictive and fix double user ids | |||||
| | * | | | | | | 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 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #415 from uberspot/master | Dominik Schürmann | 2014-03-13 | 12 | -106/+132 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | final code style changes | |||||
| | * | | | | | | final code style changes | uberspot | 2014-03-13 | 12 | -106/+132 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #413 from uberspot/master | Dominik Schürmann | 2014-03-13 | 65 | -984/+997 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | More code style fixes | |||||
| | * | | | | | | 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 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #412 from uberspot/master | Dominik Schürmann | 2014-03-13 | 75 | -922/+761 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Code style changes | |||||
| | * | | | | | | 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 | 12 | -130/+82 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #403 from Valodim/master | Dominik Schürmann | 2014-03-13 | 27 | -875/+549 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | unify public and secret key lists | |||||
| | * | | | | | | 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 | 18 | -51/+151 | |
| | |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml | |||||
| * | | | | | | | Merge pull request #388 from ajit766/exportkeyfix | Dominik Schürmann | 2014-03-13 | 4 | -16/+56 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Export is cancellable now | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |