aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Expand)AuthorAgeFilesLines
* add lock icon for 'Encrypt to..' multiselect optionuberspot2014-03-065-0/+1
* Merge pull request #349 from uberspot/masterDominik Schürmann2014-03-063-0/+0
|\
| * Add search icon for other dpiuberspot2014-03-063-0/+0
* | 2.3.1 beta3Dominik Schürmann2014-03-061-2/+2
* | Fix documentation and variable naming in APIDominik Schürmann2014-03-062-8/+8
* | Fix verify of cleartext signatures with unknown keysDominik Schürmann2014-03-061-3/+5
|/
* Merge pull request #342 from mb-14/searchDominik Schürmann2014-03-065-11/+93
|\
| * Use selectionArgs parameter to pass mCurquery.Miroojin Bakshi2014-03-062-8/+12
| * Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-062-5/+39
| * Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-063-5/+49
* | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain...Miroojin Bakshi2014-03-0628-575/+931
|\ \
| * \ 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
| * | updated build.gradle-Files to current Versions of build-tools and SDK.Daniel Hammann2014-03-051-1/+1
* | | Use string from strings.xmlMiroojin Bakshi2014-03-062-1/+2
* | | Add documentationMiroojin Bakshi2014-03-061-3/+8
* | | Hide CalendarView in tabletsMiroojin Bakshi2014-03-041-0/+3
* | | Extend DatePickerDialog and override setTitle() method.Miroojin Bakshi2014-03-041-1/+12
| |/ |/|
* | 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
|\ \ \