aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* README link updatedDominik Schürmann2014-03-031-4/+2
* Put api docs into wikiDominik Schürmann2014-03-031-57/+9
* Add travis status icon to READMEDominik Schürmann2014-03-031-0/+2
* READMEDominik Schürmann2014-03-031-1/+1
* Merge pull request #317 from Emantor/travisDominik Schürmann2014-03-032-0/+19
|\
| * This adds travis ci support to OpenPGP-Keychain.Emantor2014-03-032-0/+19
* | version code 3 API libDominik Schürmann2014-03-021-2/+2
* | version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
* | version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
* | Update from transifexDominik Schürmann2014-03-0239-276/+626
* | add lib icons for holo lightDominik Schürmann2014-03-024-0/+0
* | fixes for OpenPgpListPreferenceDominik Schürmann2014-03-021-21/+30
* | API changesDominik Schürmann2014-03-0211-421/+301
* | Merge pull request #306 from danielhass/keyserver-conerrorDominik Schürmann2014-02-285-27/+102
|\ \
| * | Some clean upDaniel Haß2014-02-281-4/+2
| * | Added different notifys for different exceptionsDaniel Haß2014-02-271-6/+17
| * | Added error strings for key import from keyserverDaniel Haß2014-02-271-0/+3
| * | Added StackOverflow link to documentationDaniel Haß2014-02-271-0/+2
| * | Added documentation to the AsyncTaskResultWrapperDaniel Haß2014-02-271-0/+5
| * | Adapted the ImportKeysLoader to work with the new AsyncWrapperDaniel Haß2014-02-263-9/+13
| * | Reworked ImportKeysListFragment to handel exceptions, ImportKeyListLoader is ...Daniel Haß2014-02-262-20/+34
| * | Added the AsyncTaskResultWrapperDaniel Haß2014-02-261-0/+38
* | | Merge pull request #311 from emdete/masterDominik Schürmann2014-02-281-3/+3
|\ \ \ | |_|/ |/| |
| * | prevent null byte[] in case of encoding excM. Dietrich2014-02-281-3/+3
* | | Fix binding of install intents to packageDominik Schürmann2014-02-271-1/+1
* | | cleanupDominik Schürmann2014-02-274-40/+22
* | | remove dublication of api library, let both proejcts depend on the sameDominik Schürmann2014-02-2722-1339/+2
* | | Merge pull request #305 from hav3n/branch-dialog-fragmentDominik Schürmann2014-02-274-126/+272
|\ \ \
| * | | Added GPL headersNikhil Peter Raj2014-02-272-11/+31
| * | | Complete fix for #304Nikhil Peter Raj2014-02-272-94/+170
| * | | Partial fix for #304Nikhil Peter Raj2014-02-262-32/+82
* | | | Merge pull request #308 from mar-v-in/issue-295Dominik Schürmann2014-02-272-3/+48
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change resource name and remove unneeded if from 44232afmar-v-in2014-02-272-13/+11
| * | | Show link to Market if no openpgp provider installed installedmar-v-in2014-02-272-3/+50
|/ / /
* | | Merge pull request #303 from hav3n/branch-fix-iconDominik Schürmann2014-02-257-2/+6
|\| |
| * | Final fix for #266Nikhil Peter Raj2014-02-262-2/+2
| * | Removed Thumbs.db,added to gitignoreNikhil Peter Raj2014-02-255-0/+3
| * | Fix for #266Nikhil Peter Raj2014-02-2510-2/+3
|/ /
* | Merge pull request #300 from danielhass/masterDominik Schürmann2014-02-251-16/+17
|\ \ | |/ |/|
| * Replaced Toast with AppMsg in DecryptActivityDaniel Haß2014-02-241-16/+17
|/
* reapply accedentially reverted 5d8867260946937498cf9e8d64fea3a9f53d9dd3Dominik Schürmann2014-02-242-2/+20
* cleanupDominik Schürmann2014-02-241-57/+7
* fix signature passing and verify in demoDominik Schürmann2014-02-242-6/+7
* Merge pull request #296 from danielhass/masterDominik Schürmann2014-02-241-12/+13
|\
| * remove debug stuffDaniel Haß2014-02-231-2/+1
| * Revert "Replaced Toast with AppMsg in EncryptActivity"Daniel Haß2014-02-231-13/+15
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-15/+13
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-13/+15
|/
* Update help_start.htmlDominik Schürmann2014-02-231-1/+1
* fix openpgp4fpr demoDominik Schürmann2014-02-211-1/+1