aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #471 from sreeram-boyapati/encryptionDominik Schürmann2014-03-261-1/+11
|\ \ \ \
| * | | | Added can_encrypt checkSreeram Boyapati2014-03-231-1/+11
* | | | | Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-0/+22
* | | | | Rename old mentionings of APG-named thingsThialfihar2014-03-238-19/+19
* | | | | Fix file decryption interfaceThialfihar2014-03-231-10/+3
* | | | | Merge pull request #467 from uberspot/masterDominik Schürmann2014-03-222-47/+203
|\ \ \ \ \
| * | | | | Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-212-47/+203
* | | | | | Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
|/ / / / /
* | | | | Fix nfc help buttonDominik Schürmann2014-03-211-1/+1
* | | | | reformat mergeDominik Schürmann2014-03-212-59/+64
* | | | | Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-214-132/+128
|\ \ \ \ \
| * | | | | Fix GPL HeadersNikhil Peter Raj2014-03-212-2/+2
| * | | | | Fix for #410Nikhil Peter Raj2014-03-214-133/+129
* | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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-205-5/+7
|/ / / / /
* | | | | put colorize method into key helperDominik Schürmann2014-03-203-3/+3
* | | | | colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
* | | | | Use getter and setterDominik Schürmann2014-03-202-28/+94
* | | | | Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-202-23/+26
* | | | | Fix key list views in main key viewThialfihar2014-03-201-1/+11
|/ / / /
* | | | add apg's fix for Key id displayuberspot2014-03-194-4/+4
* | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-191-16/+23
|\ \ \ \
| * \ \ \ Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-191-16/+23
| |\ \ \ \
| | * | | | Blocked ok button for generating weak (<1024) RSA key.gogowitczak2014-03-181-16/+23
* | | | | | CleanupDominik Schürmann2014-03-191-2/+1
|/ / / / /
* | | | | Cleanup SelectSecretKeyActivity and also return UriDominik Schürmann2014-03-182-75/+26
* | | | | 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 #434 from honnel/revocation-statusDominik Schürmann2014-03-182-6/+18
|\ \ \ \
| * | | | Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-182-6/+18
* | | | | 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
| |/ / / /
* | | | | Merge pull request #424 from gogowitczak/mro-branchDominik Schürmann2014-03-181-15/+27
|\ \ \ \ \
| * | | | | Fixed coding style.gogowitczak2014-03-181-26/+23
| * | | | | Keyserver query now uses machine readable output for search and get. Added se...gogowitczak2014-03-151-15/+30
| |/ / / /
* | | | | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-184-79/+220
|\ \ \ \ \
| * | | | | certify: sign individual UIDsVincent Breitmoser2014-03-151-6/+13
| * | | | | certify: revamp certifykeyactivityVincent Breitmoser2014-03-151-1/+96
| * | | | | 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-152-61/+2
| |/ / / /
* | | | | make loading of drawer items a bit more dynamicuberspot2014-03-172-19/+14