aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pull from transifexDominik Schürmann2014-03-2121-92/+294
|
* reformat mergeDominik Schürmann2014-03-212-59/+64
|
* Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-218-140/+185
|\ | | | | New Fix for #410
| * Fix GPL HeadersNikhil Peter Raj2014-03-213-3/+3
| |
| * Fix for #410Nikhil Peter Raj2014-03-218-142/+187
| |
* | Merge pull request #461 from honnel/ui-tasksDominik Schürmann2014-03-212-3/+7
|\ \ | | | | | | UI-Icon-Modifying #429
| * | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵Daniel Hammann2014-03-202-3/+7
| | | | | | | | | | | | and clipboard button
* | | Merge pull request #460 from honnel/uri-for-signDominik Schürmann2014-03-211-2/+2
|\ \ \ | |/ / |/| | URI is transported in intents data not extra. #459
| * | URI is transported in intents data not extra.Daniel Hammann2014-03-201-2/+2
|/ /
* | Merge pull request #457 from hav3n/branch-fix-certifyDominik Schürmann2014-03-202-72/+94
|\ \ | | | | | | Fix for #451
| * | Update fix for #451Nikhil Peter Raj2014-03-211-3/+2
| | |
| * | Cleanup for #451Nikhil Peter Raj2014-03-202-5/+0
| | |
| * | Fix for #451Nikhil Peter Raj2014-03-201-68/+96
| |/
* | Fix fingerprint handlingDominik Schürmann2014-03-209-21/+19
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-203-23/+28
|\ \
| * \ Merge pull request #456 from thi/adjust-fingerprint-layoutsDominik Schürmann2014-03-203-23/+28
| |\ \ | | |/ | |/| Adjust fingerprint layouts
| | * Move fingerprint up below the algorithm in key viewThialfihar2014-03-201-15/+15
| | | | | | | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification.
| | * Move fingerprint to the right in key list entryThialfihar2014-03-201-8/+8
| | | | | | | | | | | | Fits much better there and doesn't separate the user ID.
| | * Group fingerprint again to make it visually consistentThialfihar2014-03-201-0/+5
| |/
* / verify downloaded key by comparing fingerprintsDominik Schürmann2014-03-201-35/+45
|/
* put colorize method into key helperDominik Schürmann2014-03-205-80/+89
|
* colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
|
* Use getter and setterDominik Schürmann2014-03-203-40/+111
|
* Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-207-88/+91
|
* Merge pull request #455 from ↵Dominik Schürmann2014-03-202-5/+15
|\ | | | | | | | | thi/454-fix-convert-key-id-to-hey-to-handle-short-key-ids 454 fix convert key id to hey to handle short key ids
| * Add debug logging for hkp keyserver actionsThialfihar2014-03-201-5/+10
| |
| * Let convertKeyIdToHex handle short key IDsThialfihar2014-03-201-0/+5
|/ | | | If a short key ID is given, then it should only be displayed as such.
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-16 21:07:33 +0000