Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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 | |||||
| * | | | | | | | add lock icon for 'Encrypt to..' multiselect option | uberspot | 2014-03-06 | 5 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #349 from uberspot/master | Dominik Schürmann | 2014-03-06 | 3 | -0/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add search icon for other dpi | |||||
| * | | | | | | | Add search icon for other dpi | uberspot | 2014-03-06 | 3 | -0/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | 2.3.1 beta3 | Dominik Schürmann | 2014-03-06 | 1 | -2/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Fix documentation and variable naming in API | Dominik Schürmann | 2014-03-06 | 4 | -58/+70 | |
| | | | | | | | | ||||||
* | | | | | | | | Fix verify of cleartext signatures with unknown keys | Dominik Schürmann | 2014-03-06 | 1 | -3/+5 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #342 from mb-14/search | Dominik Schürmann | 2014-03-06 | 5 | -11/+93 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Implement search for KeyListPublicFragment and SelectPublicKeyFragment | |||||
| * | | | | | | Use selectionArgs parameter to pass mCurquery. | Miroojin Bakshi | 2014-03-06 | 2 | -8/+12 | |
| | | | | | | | ||||||
| * | | | | | | Implement search for SelectPublicKeyFragment | Miroojin Bakshi | 2014-03-06 | 2 | -5/+39 | |
| | | | | | | | ||||||
| * | | | | | | Implement search for KeyListPublicFragment | Miroojin Bakshi | 2014-03-06 | 3 | -5/+49 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #324 from mb-14/datefix | Dominik Schürmann | 2014-03-05 | 2 | -2/+25 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Expiry selection UI fix | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of ↵ | Miroojin Bakshi | 2014-03-06 | 43 | -590/+1109 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain into datefix | |||||
* | | | | | | | | Merge pull request #328 from bhargavgolla/patch-1 | Dominik Schürmann | 2014-03-05 | 1 | -1/+20 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Issue #234 : Adding a min date not to go below creation date | |||||
| * | | | | | | | Removed log statements as per Dominik's suggestions | Bhargav Golla | 2014-03-05 | 1 | -4/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Set min date to one day after Created Date. Works on Honeycomb and above | Bhargav Golla | 2014-03-05 | 1 | -4/+25 | |
| | | | | | | | | ||||||
| * | | | | | | | Adding a min date not to go below creation date | Bhargav Golla | 2014-03-04 | 1 | -1/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #339 from uberspot/master | Dominik Schürmann | 2014-03-05 | 6 | -83/+323 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Put Preferences in subscreen | |||||
| * | | | | | | | | Put Preferences in subscreen | uberspot | 2014-03-05 | 6 | -83/+323 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #336 from Emantor/travis_new_build_tools | Dominik Schürmann | 2014-03-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update travis to build-tools-19.0.3 | |||||
| * | | | | | | | | Update travis to build-tools-19.0.3 | Emantor | 2014-03-05 | 1 | -1/+1 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Updates travis to support pull request #334 | |||||
* | | | | | | | | Merge pull request #335 from honnel/master | Dominik Schürmann | 2014-03-05 | 22 | -277/+312 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | updated build.gradle-Files to current Versions of build-tools and SDK. | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/honnel/openpgp-keychain | Daniel Hammann | 2014-03-05 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Lint Issue: | Daniel Hammann | 2014-03-05 | 10 | -262/+262 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TypographyEllipsis: Ellipsis string can be replaced with ellipsis character Replace "..." with ellipsis character (…, …) ... -> … | |||||
| * | | | | | | | | | Lint Issue: | Daniel Hammann | 2014-03-05 | 10 | -263/+263 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TypographyEllipsis: Ellipsis string can be replaced with ellipsis character Replace "..." with ellipsis character (…, …) ... -> … | |||||
| * | | | | | | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain | Daniel Hammann | 2014-03-05 | 109 | -2493/+1847 | |
| |\| | | | | | | | ||||||
| * | | | | | | | | Added build-tool and api level version information | Daniel Hammann | 2014-03-05 | 1 | -2/+2 | |
| | | | | | | | | |