aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* CertifyKeyActivity sets error if no key is selecteduberspot2014-03-181-2/+2
|
* revert ca_necrypt patchDominik Schürmann2014-03-181-4/+0
|
* fix emails not showing up in import keyserver searchuberspot2014-03-181-2/+1
|
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-182-6/+18
|\ | | | | Show revocation status in ViewKeyKeysAdapter #375
| * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-182-6/+18
| | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
* | Merge pull request #437 from sreeram-boyapati/encryptDominik Schürmann2014-03-181-1/+4
|\ \ | | | | | | Can_Encrypt Check added to hide Button
| * | Code Style fixSreeram Boyapati2014-03-181-2/+2
| | |
| * | Can_Encrypt Check added to hide ButtonSreeram Boyapati2014-03-181-1/+4
| |/
* | Merge pull request #435 from sreeram-boyapati/change_passphraseDominik Schürmann2014-03-181-3/+5
|\ \ | | | | | | Button Text changes to Change Passphrase if Passphrase is set
| * | Button Text changes to Change Passphrase if Passphrase is setSreeram Boyapati2014-03-181-3/+5
| |/
* | add mr option in keyserver class before query (code simplification)Dominik Schürmann2014-03-181-3/+3
| |
* | Merge pull request #424 from gogowitczak/mro-branchDominik Schürmann2014-03-183-59/+117
|\ \ | | | | | | Machine readable output for Keyserver query
| * | Fixed coding style.gogowitczak2014-03-182-146/+153
| | |
| * | removed TODO commentgogowitczak2014-03-151-7/+0
| | |
| * | Keyserver query now uses machine readable output for search and get. Added ↵gogowitczak2014-03-153-92/+150
| |/ | | | | | | separate function for converting algorithm integer ID to String.
* | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-189-208/+542
|\ \ | | | | | | Revamp certify dialogue
| * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-173-7/+72
| | |
| * | certify: sign individual UIDsVincent Breitmoser2014-03-153-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 readabilityVincent Breitmoser2014-03-151-112/+128
| | | | | | | | | | | | note this commit introduces NO semantical changes whatsoever!
| * | certify: revamp certifykeyactivityVincent Breitmoser2014-03-152-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 Breitmoser2014-03-151-0/+36
| | |
| * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-152-12/+82
| | |
| * | certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-151-3/+10
| | |
| * | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+21
| | |
| * | move fingerprint coloring into helperVincent Breitmoser2014-03-153-61/+64
| |/
* | make loading of drawer items a bit more dynamicuberspot2014-03-173-19/+28
| |
* | Lock drawer as open in tabletsuberspot2014-03-163-26/+64
| |
* | Fix export for new unified key list #409uberspot2014-03-158-79/+111
|/
* Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
|
* Make email address less restrictive and add icon to show when it's correctuberspot2014-03-142-11/+28
|
* final code style changesuberspot2014-03-1312-106/+132
|
* fix code style in /pgpuberspot2014-03-1311-491/+436
|
* final ui code style changesuberspot2014-03-1312-53/+54
|
* more code style changes in /ui and /utiluberspot2014-03-1324-323/+345
|
* more UI code style fixesuberspot2014-03-139-70/+77
|
* More code style fixes for /uiuberspot2014-03-1316-53/+91
|
* First code style changes in uiuberspot2014-03-1356-634/+486
|
* Fix code style in /helperuberspot2014-03-135-71/+64
|
* Fix code style in keychain/service/uberspot2014-03-1311-87/+129
|
* Optimize imports in all files, remove useless whitespace in some and fix ↵uberspot2014-03-1311-128/+80
| | | | indentation
* Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
|\ | | | | Add apg's change to colorizing, no more background changes needed
| * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
|\ \
| * \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| |\ \ | | | | | | | | Specifying connection port in KeyServer
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | | |
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | |/
* | / Add FAQ tab to helpDominik Schürmann2014-03-131-8/+11
|/ /
* | Readd create key menu itemsDominik Schürmann2014-03-131-12/+38
| |
* | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
| |
* | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-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