aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Expand)AuthorAgeFilesLines
* Extend provider for new api tablesDominik Schürmann2014-03-234-41/+222
* Move classes for OpenPGP API into remote packageDominik Schürmann2014-03-2312-19/+24
* New db table for api accountsDominik Schürmann2014-03-232-6/+25
* Merge pull request #469 from honnel/save-key-workaroundDominik Schürmann2014-03-231-1/+9
|\
| * The current implementation of saving new generated key doesn't save the key d...Daniel Hammann2014-03-221-1/+9
* | Use new FoldableLinearLayout in API settingsDominik Schürmann2014-03-232-59/+15
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-227-150/+336
|\ \
| * \ Merge pull request #467 from uberspot/masterDominik Schürmann2014-03-226-140/+329
| |\ \
| | * | Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-216-140/+329
| | |/
| * / Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
| |/
* / raname to mKeychainDatabaseDominik Schürmann2014-03-211-6/+6
|/
* Fix nfc help buttonDominik Schürmann2014-03-211-1/+1
* remove ach language, not supported by androidDominik Schürmann2014-03-216-222/+0
* Pull from transifexDominik Schürmann2014-03-2124-0/+1311
* 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
|\
| * 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 added hint to text edit, different icons for share and...Daniel Hammann2014-03-202-3/+7
* | | 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-209-21/+19
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-203-23/+28
|\ \
| * | Move fingerprint up below the algorithm in key viewThialfihar2014-03-201-15/+15
| * | Move fingerprint to the right in key list entryThialfihar2014-03-201-8/+8
| * | 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
* Add debug logging for hkp keyserver actionsThialfihar2014-03-201-5/+10
* Let convertKeyIdToHex handle short key IDsThialfihar2014-03-201-0/+5
* Fix key list views in main key viewThialfihar2014-03-201-1/+11
* 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 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-196-0/+0
* | | 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