aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 levelAlexander Sulfrian2014-03-191-1/+1
| * | Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-193-16/+31
| |\ \ | | |/ | |/|
| | * 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 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 searchuberspot2014-03-181-2/+1
|/
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-187-6/+14931
|\
| * Merge branch 'revocation-status' of https://github.com/honnel/openpgp-keychai...Daniel Hammann2014-03-180-0/+0
| |\
| | * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-187-6/+14931
| * | Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-187-6/+14931
| |/
* | Merge pull request #437 from sreeram-boyapati/encryptDominik Schürmann2014-03-181-1/+4
|\ \
| * | 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 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
|\ \ \
| * | | 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 se...gogowitczak2014-03-153-92/+150
| |/ /
* | | Merge pull request #431 from honnel/ui-modificationDominik Schürmann2014-03-183-4/+5
|\ \ \ | | |/ | |/|
| * | #429 4)Daniel Hammann2014-03-173-4/+5
| * | 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
* | | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-1814-216/+688
|\ \ \
| * | | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-174-7/+73
| * | | certify: sign individual UIDsVincent Breitmoser2014-03-153-12/+31
| * | | certify: add some subscopes in PgpKeyOperation for readabilityVincent Breitmoser2014-03-151-112/+128
| * | | certify: revamp certifykeyactivityVincent Breitmoser2014-03-154-1/+186
| * | | 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.gogowitczak2014-03-141-2/+3
| |/ /
* | | Merge pull request #421 from uberspot/masterDominik Schürmann2014-03-1830-778/+991
|\ \ \ | |/ / |/| |
| * | make loading of drawer items a bit more dynamicuberspot2014-03-173-19/+28
| * | Lock drawer as open in tabletsuberspot2014-03-1621-692/+863
| * | Fix export for new unified key list #409uberspot2014-03-159-79/+112
|/ /
* | Merge pull request #417 from uberspot/masterDominik Schürmann2014-03-144-11/+30
|\ \
| * | Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 07:49:55 +0000