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 | |
| |/ / / / | ||||||
* | | | | | add mr option in keyserver class before query (code simplification) | Dominik Schürmann | 2014-03-18 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #424 from gogowitczak/mro-branch | Dominik Schürmann | 2014-03-18 | 3 | -59/+117 | |
|\ \ \ \ \ | | | | | | | | | | | | | Machine readable output for Keyserver query | |||||
| * | | | | | Fixed coding style. | gogowitczak | 2014-03-18 | 2 | -146/+153 | |
| | | | | | | ||||||
| * | | | | | removed TODO comment | gogowitczak | 2014-03-15 | 1 | -7/+0 | |
| | | | | | | ||||||
| * | | | | | Keyserver query now uses machine readable output for search and get. Added ↵ | gogowitczak | 2014-03-15 | 3 | -92/+150 | |
| |/ / / / | | | | | | | | | | | | | | | | separate function for converting algorithm integer ID to String. | |||||
* | | | | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 9 | -208/+542 | |
|\ \ \ \ \ | | | | | | | | | | | | | Revamp certify dialogue | |||||
| * | | | | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 3 | -7/+72 | |
| | | | | | | ||||||
| * | | | | | 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 | 2 | -1/+98 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | 3 | -61/+64 | |
| |/ / / / | ||||||
* | | | | | 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 | 3 | -26/+64 | |
| | | | | | ||||||
* | | | | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 8 | -79/+111 | |
|/ / / / | ||||||
* | | | | 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 | |
| | | | | ||||||
* | | | | 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 | |
| | | | | | ||||||
* | | | | | 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 | 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 | 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 | 7 | -28/+118 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | Lint error fix after testing | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into Lint-error-fix | Bhargav Golla | 2014-03-10 | 16 | -203/+344 | |
| | |\ \ \ \ | ||||||
| | * | | | | | 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 | 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. |