aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #328 from bhargavgolla/patch-1Dominik Schürmann2014-03-051-1/+20
|\
| * Removed log statements as per Dominik's suggestionsBhargav Golla2014-03-051-4/+0
| * Set min date to one day after Created Date. Works on Honeycomb and aboveBhargav Golla2014-03-051-4/+25
| * Adding a min date not to go below creation dateBhargav Golla2014-03-041-1/+3
* | Merge pull request #339 from uberspot/masterDominik Schürmann2014-03-056-83/+323
|\ \
| * | Put Preferences in subscreenuberspot2014-03-056-83/+323
| |/
* | Lint Issue:Daniel Hammann2014-03-0510-263/+263
* | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-0571-844/+1552
|\|
| * Fix passphrase retrievalDominik Schürmann2014-03-051-8/+10
| * Code cleaning in PgpDecryptVerifyDominik Schürmann2014-03-041-42/+46
| * Fix license header of key server filesDominik Schürmann2014-03-042-2/+6
| * Remove unused importsDominik Schürmann2014-03-041-6/+0
| * name KeychainIntentService properlyDominik Schürmann2014-03-041-1/+1
| * Update from transifexDominik Schürmann2014-03-048-26/+26
| * 2.3.1 beta2Dominik Schürmann2014-03-042-3/+3
| * Enforce private key for applications, verify signed-only texts without passph...Dominik Schürmann2014-03-045-162/+250
| * return SIGNATURE_SUCCESS_UNCERTIFIED from serviceDominik Schürmann2014-03-042-2/+4
| * Merge pull request #322 from mj7007/smooth_activity_switchDominik Schürmann2014-03-041-8/+15
| |\
| | * Smooth Activity Switch Fixedmj70072014-03-041-8/+15
| * | Merge pull request #315 from jessicayuen/masterDominik Schürmann2014-03-047-11/+87
| |\ \
| | * | #226: Small fix to prevent message from being sent if IntentService is canceledJessica Yuen2014-03-031-0/+16
| | * | #226: Async key gen task is stopped if progress is canceledJessica Yuen2014-03-025-17/+40
| | * | #226: Activity no longer closes if progress is canceled for key creation in E...Jessica Yuen2014-03-025-10/+17
| | * | #226: Added cancel option to ProgressDialogFragments. Create Key is now cance...Jessica Yuen2014-03-026-9/+39
| * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-036-11/+17
| |\ \ \
| | * | | Fix NewApi Lint ErrorsEmantor2014-03-033-3/+8
| | * | | Fix DefaultLocale Lint WarningsEmantor2014-03-031-3/+4
| | * | | Fix ScrollViewSize Lint WarningsEmantor2014-03-033-6/+6
| * | | | change ordering in Intent descriptions for better readability in small dialogsDominik Schürmann2014-03-031-4/+4
| |/ / /
| * | | 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
| * | | API changesDominik Schürmann2014-03-023-160/+132
| |/ /
| * | 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
| * | | cleanupDominik Schürmann2014-02-274-40/+22
| * | | remove dublication of api library, let both proejcts depend on the sameDominik Schürmann2014-02-271-1/+1
| * | | 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
| |/ /
* / / updated build.gradle-Files to current Versions of build-tools and SDK.Daniel Hammann2014-03-051-1/+1
|/ /
* | Final fix for #266Nikhil Peter Raj2014-02-262-2/+2
* | Removed Thumbs.db,added to gitignoreNikhil Peter Raj2014-02-254-0/+0