Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Colorize fingerprint | uberspot | 2014-03-09 | 2 | -12/+28 |
| | |||||
* | Merge pull request #369 from hav3n/branch-fixes | Dominik Schürmann | 2014-03-09 | 2 | -2/+3 |
|\ | | | | | Fix for #347 | ||||
| * | Revised fix for #347 | Nikhil Peter Raj | 2014-03-09 | 1 | -11/+1 |
| | | |||||
| * | Fix for #347 | Nikhil Peter Raj | 2014-03-08 | 2 | -3/+14 |
| | | |||||
* | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 10 | -88/+78 |
| | | |||||
* | | Merge pull request #316 from danielhass/import-error | Dominik Schürmann | 2014-03-08 | 3 | -6/+63 |
|\ \ | | | | | | | Show error if file import has no content | ||||
| * | | Fixed some naming | Daniel Haß | 2014-03-04 | 1 | -7/+7 |
| | | | |||||
| * | | Added exception is null option to display nothing if no error occured | Daniel Haß | 2014-03-04 | 1 | -4/+6 |
| | | | |||||
| * | | Added handling for other exceptions in the ImportListLoader. | Daniel Haß | 2014-03-03 | 3 | -4/+35 |
| | | | |||||
| * | | Little fixes | Daniel Haß | 2014-03-03 | 2 | -2/+1 |
| | | | |||||
| * | | Added FileHasNoContent string | Daniel Haß | 2014-03-03 | 1 | -0/+1 |
| | | | |||||
| * | | Added exception for empty files | Daniel Haß | 2014-03-03 | 1 | -1/+17 |
| | | | |||||
| * | | Added handler for FileHasNoContent exception, some clean up | Daniel Haß | 2014-03-03 | 1 | -6/+13 |
| | | | |||||
* | | | use parameter in updateFromKeyserver | Dominik Schürmann | 2014-03-08 | 1 | -1/+1 |
| | | | |||||
* | | | beta4 | Dominik Schürmann | 2014-03-08 | 1 | -2/+2 |
| | | | |||||
* | | | Split api libs into OpenKeychain specific and OpenPGP Provider lib | Dominik Schürmann | 2014-03-07 | 36 | -6/+381 |
| | | | |||||
* | | | Revert "Fix for #347" | Dominik Schürmann | 2014-03-07 | 1 | -3/+0 |
| | | | | | | | | | | | | This reverts commit dd80ddd6f95d7f659929a49d3bff62492692c4fa. | ||||
* | | | Merge pull request #366 from uberspot/master | Dominik Schürmann | 2014-03-07 | 34 | -63/+38 |
|\ \ \ | | | | | | | | | Minor code clean up | ||||
| * | | | removed useless semicolons, fixed some parameters in documenation, ↵ | uberspot | 2014-03-07 | 15 | -29/+23 |
| | | | | | | | | | | | | | | | | simplified some conditionals | ||||
| * | | | move hardcode strings to strings.xml | uberspot | 2014-03-07 | 10 | -10/+13 |
| | | | | |||||
| * | | | remove unused imports and unthrown exceptions | uberspot | 2014-03-07 | 10 | -24/+2 |
| | | | | |||||
* | | | | Merge pull request #367 from hav3n/branch-fixes | Dominik Schürmann | 2014-03-07 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Fix for #347 | ||||
| * | | | | Fix for #347 | Nikhil Peter Raj | 2014-03-08 | 1 | -0/+3 |
| | |_|/ | |/| | | |||||
* | | | | Move search view into onCreateView, fixes #365 | Dominik Schürmann | 2014-03-07 | 2 | -13/+91 |
| |/ / |/| | | |||||
* | | | move search view from activity to fragment by setting it as a list header, ↵ | Dominik Schürmann | 2014-03-07 | 4 | -26/+26 |
| | | | | | | | | | | | | better reusability! Required for service activites | ||||
* | | | Reworking main KeyListPublicFragment to get progress indicator | Dominik Schürmann | 2014-03-07 | 3 | -78/+157 |
|/ / | |||||
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-07 | 3 | -0/+26 |
|\ \ | |||||
| * \ | Merge pull request #361 from mb-14/file | Dominik Schürmann | 2014-03-07 | 3 | -0/+26 |
| |\ \ | | | | | | | | | Add option for sharing encrypted file. | ||||
| | * | | Add option for sharing encrypted file. | Miroojin Bakshi | 2014-03-07 | 3 | -0/+26 |
| |/ / | |||||
* / / | Cleanup code, search with preceeding % | Dominik Schürmann | 2014-03-07 | 2 | -34/+14 |
|/ / | |||||
* | | API: get key | Dominik Schürmann | 2014-03-07 | 2 | -15/+55 |
| | | |||||
* | | Fix API docs | Dominik Schürmann | 2014-03-07 | 1 | -27/+36 |
| | | |||||
* | | Fix API docs | Dominik Schürmann | 2014-03-07 | 1 | -14/+14 |
| | | |||||
* | | remove icon from nfc dialog | Dominik Schürmann | 2014-03-06 | 1 | -1/+0 |
| | | |||||
* | | back to Gradle 1.10, Using Gradle 1.11 requires Android Studio 0.5.0 which ↵ | Dominik Schürmann | 2014-03-06 | 6 | -6/+6 |
| | | | | | | | | is not released yet | ||||
* | | Merge pull request #344 from ankushb92/ankush2 | Dominik Schürmann | 2014-03-06 | 28 | -85/+85 |
|\ \ | | | | | | | #338 | ||||
| * | | corrected commit | Ankush | 2014-03-07 | 28 | -85/+85 |
| | | | | | | | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338 | ||||
* | | | fix pathes in README | Dominik Schürmann | 2014-03-06 | 1 | -3/+3 |
| | | | |||||
* | | | remove unused search definitions from manifest | Dominik Schürmann | 2014-03-06 | 1 | -40/+0 |
| | | | |||||
* | | | Merge pull request #354 from uberspot/master | Dominik Schürmann | 2014-03-06 | 10 | -12/+28 |
|\ \ \ | | | | | | | | | Multiselect: Create 'select all' in public and secret keylist | ||||
| * | | | Multiselect: Create 'select all' in public and secret keylist | uberspot | 2014-03-06 | 10 | -12/+28 |
| | | | | |||||
* | | | | sdk 17 no longer needed | Dominik Schürmann | 2014-03-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #353 from Emantor/new_gradle | Dominik Schürmann | 2014-03-06 | 9 | -11/+20 |
|\ \ \ | | | | | | | | | New gradle and gradle plugin Version | ||||
| * | | | Update README | Emantor | 2014-03-06 | 1 | -0/+9 |
| | | | | |||||
| * | | | Update missing build.gradle files | Emantor | 2014-03-06 | 2 | -2/+2 |
| | | | | |||||
| * | | | Switch from 0.9+ to 0.9.0 | Emantor | 2014-03-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add new gradle-wrapper.jar | Emantor | 2014-03-06 | 4 | -4/+4 |
| | | | | |||||
| * | | | Update gradlewrapper to gradle 1.11 | Emantor | 2014-03-06 | 2 | -3/+3 |
| | | | | |||||
| * | | | Update to gradle 0.9+ jar | Emantor | 2014-03-06 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #350 from uberspot/master | Dominik Schürmann | 2014-03-06 | 5 | -0/+1 |
|\ \ \ | | | | | | | | | add lock icon for 'Encrypt to..' multiselect option |