aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #453 from thi/452-unrevoked-keys-displayed-in-redDominik Schürmann2014-03-201-1/+11
|\ | | | | Fix key list views in main key view
| * Fix key list views in main key viewThialfihar2014-03-201-1/+11
|/ | | | | | | Since the views are being reused, a revoked key might set the text color of a view and when the view is being reused for a non-revoked key it is still red. So grab the default text colour and set it explicitly when the key is not revoked.
* Merge pull request #450 from uberspot/masterDominik Schürmann2014-03-195-5/+9
|\ | | | | add apg's fix for Key id display
| * add apg's fix for Key id displayuberspot2014-03-195-5/+9
|/
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-194-17/+32
|\
| * Merge pull request #448 from AlexanderS/lint-fixesDominik Schürmann2014-03-191-1/+1
| |\ | | | | | | use correct LongSparseArray for minimum api level
| | * use correct LongSparseArray for minimum api levelAlexander Sulfrian2014-03-191-1/+1
| | |
| * | Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-193-16/+31
| |\ \ | | |/ | |/| Disabled possibility to generate weak RSA keys (512 and 1024 bit)
| | * Note about blocked possibility to generate weak (<1024) RSA key.gogowitczak2014-03-182-0/+8
| | |
| | * Blocked ok button for generating weak (<1024) RSA key.gogowitczak2014-03-181-16/+23
| | |
* | | Remove oxygen text from iconDominik Schürmann2014-03-199-15/+1
| | |
* | | CleanupDominik Schürmann2014-03-191-2/+1
|/ /
* | Cleanup SelectSecretKeyActivity and also return UriDominik Schürmann2014-03-182-75/+26
| |
* | Merge pull request #443 from uberspot/masterDominik Schürmann2014-03-181-2/+2
|\ \ | | | | | | CertifyKeyActivity sets error if no key is selected
| * | CertifyKeyActivity sets error if no key is selecteduberspot2014-03-181-2/+2
|/ /
* | revert ca_necrypt patchDominik Schürmann2014-03-181-4/+0
| |
* | Merge pull request #441 from uberspot/masterDominik Schürmann2014-03-181-2/+1
|\ \ | |/ |/| fix emails not showing up in import keyserver search
| * fix emails not showing up in import keyserver searchuberspot2014-03-181-2/+1
|/
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-187-6/+14931
|\ | | | | Show revocation status in ViewKeyKeysAdapter #375
| * Merge branch 'revocation-status' of ↵Daniel Hammann2014-03-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | https://github.com/honnel/openpgp-keychain into revocation-status Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| | * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-187-6/+14931
| | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
| * | Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-187-6/+14931
| |/ | | | | | | 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 #431 from honnel/ui-modificationDominik Schürmann2014-03-183-4/+5
|\ \ \ | | |/ | |/| Ui modification
| * | #429 4)Daniel Hammann2014-03-173-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-keychainDaniel Hammann2014-03-14142-3065/+2807
| |\|
| * | Squashed commit of the following:Daniel Hammann2014-03-121-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/certifyDominik Schürmann2014-03-1814-216/+688
|\ \ \ | | | | | | | | Revamp certify dialogue
| * | | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-174-7/+73
| | | |
| * | | 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-154-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 Breitmoser2014-03-151-0/+36
| | | |
| * | | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-153-17/+116
| | | |
| * | | certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-152-6/+22
| | | |
| * | | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-152-0/+32
| | | |
| * | | move fingerprint coloring into helperVincent Breitmoser2014-03-153-61/+64
| | |/ | |/|
* | | Merge pull request #420 from gogowitczak/masterDominik Schürmann2014-03-181-2/+3
|\ \ \ | | | | | | | | Added FAQ: specifying connection port for Keyserver.
| * | | Added FAQ: specifying connection port for Keyserver.gogowitczak2014-03-141-2/+3
| |/ /
* | | Merge pull request #421 from uberspot/masterDominik Schürmann2014-03-1830-778/+991
|\ \ \ | |/ / |/| | Fix export for new unified key list #409 and lock drawer in tablets #255
| * | make loading of drawer items a bit more dynamicuberspot2014-03-173-19/+28
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 20:20:16 +0000