Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #437 from sreeram-boyapati/encrypt | Dominik Schürmann | 2014-03-18 | 1 | -1/+4 |
|\ | | | | | Can_Encrypt Check added to hide Button | ||||
| * | Code Style fix | Sreeram Boyapati | 2014-03-18 | 1 | -2/+2 |
| | | |||||
| * | Can_Encrypt Check added to hide Button | Sreeram Boyapati | 2014-03-18 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #435 from sreeram-boyapati/change_passphrase | Dominik Schürmann | 2014-03-18 | 1 | -3/+5 |
|\ \ | | | | | | | Button Text changes to Change Passphrase if Passphrase is set | ||||
| * | | 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 #431 from honnel/ui-modification | Dominik Schürmann | 2014-03-18 | 3 | -4/+5 |
|\ \ | | | | | | | Ui modification | ||||
| * | | #429 4) | Daniel Hammann | 2014-03-17 | 3 | -4/+5 |
| | | | | | | | | | | | | | | | In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver' or just only 'server' | ||||
| * | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain | Daniel Hammann | 2014-03-14 | 142 | -3065/+2807 |
| |\| | |||||
| * | | Squashed commit of the following: | Daniel Hammann | 2014-03-12 | 1 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | commit 1df4d4a9e047f70f284183185d81070e49097ad3 Author: Daniel Hammann <github@honnel.de> Date: Wed Mar 12 21:33:13 2014 +0100 Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up). | ||||
* | | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 14 | -216/+688 |
|\ \ \ | | | | | | | | | Revamp certify dialogue | ||||
| * | | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 4 | -7/+73 |
| | | | | |||||
| * | | | 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 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 |
| |/ / | |||||
* | | | Merge pull request #421 from uberspot/master | Dominik Schürmann | 2014-03-18 | 30 | -778/+991 |
|\ \ \ | |/ / |/| | | Fix export for new unified key list #409 and lock drawer in tablets #255 | ||||
| * | | 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 |
|/ / | |||||
* | | 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 |