aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Split api libs into OpenKeychain specific and OpenPGP Provider libDominik Schürmann2014-03-0736-6/+381
|
* Revert "Fix for #347"Dominik Schürmann2014-03-071-3/+0
| | | | This reverts commit dd80ddd6f95d7f659929a49d3bff62492692c4fa.
* Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0734-63/+38
|\ | | | | Minor code clean up
| * removed useless semicolons, fixed some parameters in documenation, ↵uberspot2014-03-0715-29/+23
| | | | | | | | simplified some conditionals
| * move hardcode strings to strings.xmluberspot2014-03-0710-10/+13
| |
| * remove unused imports and unthrown exceptionsuberspot2014-03-0710-24/+2
| |
* | Merge pull request #367 from hav3n/branch-fixesDominik Schürmann2014-03-071-0/+3
|\ \ | | | | | | Fix for #347
| * | Fix for #347Nikhil Peter Raj2014-03-081-0/+3
| | |
* | | Move search view into onCreateView, fixes #365Dominik Schürmann2014-03-072-13/+91
| |/ |/|
* | move search view from activity to fragment by setting it as a list header, ↵Dominik Schürmann2014-03-074-26/+26
| | | | | | | | better reusability! Required for service activites
* | Reworking main KeyListPublicFragment to get progress indicatorDominik Schürmann2014-03-073-78/+157
|/
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-073-0/+26
|\
| * Merge pull request #361 from mb-14/fileDominik Schürmann2014-03-073-0/+26
| |\ | | | | | | Add option for sharing encrypted file.
| | * Add option for sharing encrypted file.Miroojin Bakshi2014-03-073-0/+26
| |/
* / Cleanup code, search with preceeding %Dominik Schürmann2014-03-072-34/+14
|/
* API: get keyDominik Schürmann2014-03-072-15/+55
|
* Fix API docsDominik Schürmann2014-03-071-27/+36
|
* Fix API docsDominik Schürmann2014-03-071-14/+14
|
* remove icon from nfc dialogDominik Schürmann2014-03-061-1/+0
|
* back to Gradle 1.10, Using Gradle 1.11 requires Android Studio 0.5.0 which ↵Dominik Schürmann2014-03-066-6/+6
| | | | is not released yet
* Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-0628-85/+85
|\ | | | | #338
| * corrected commitAnkush2014-03-0728-85/+85
| | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
* | fix pathes in READMEDominik Schürmann2014-03-061-3/+3
| |
* | remove unused search definitions from manifestDominik Schürmann2014-03-061-40/+0
| |
* | Merge pull request #354 from uberspot/masterDominik Schürmann2014-03-0610-12/+28
|\ \ | | | | | | Multiselect: Create 'select all' in public and secret keylist
| * | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-0610-12/+28
| | |
* | | sdk 17 no longer neededDominik Schürmann2014-03-061-1/+1
|/ /
* | Merge pull request #353 from Emantor/new_gradleDominik Schürmann2014-03-069-11/+20
|\ \ | | | | | | New gradle and gradle plugin Version
| * | Update READMEEmantor2014-03-061-0/+9
| | |
| * | Update missing build.gradle filesEmantor2014-03-062-2/+2
| | |
| * | Switch from 0.9+ to 0.9.0Emantor2014-03-061-1/+1
| | |
| * | Add new gradle-wrapper.jarEmantor2014-03-064-4/+4
| | |
| * | Update gradlewrapper to gradle 1.11Emantor2014-03-062-3/+3
| | |
| * | Update to gradle 0.9+ jarEmantor2014-03-061-2/+2
|/ /
* | Merge pull request #350 from uberspot/masterDominik Schürmann2014-03-065-0/+1
|\ \ | | | | | | add lock icon for 'Encrypt to..' multiselect option
| * | 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 dpi
| * | 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-064-58/+70
| | |
* | | 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
|\ \ | |/ |/| Implement search for KeyListPublicFragment and SelectPublicKeyFragment
| * 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 pull request #324 from mb-14/datefixDominik Schürmann2014-03-052-2/+25
|\ \ | | | | | | Expiry selection UI fix
| * \ Merge branch 'master' of ↵Miroojin Bakshi2014-03-0643-590/+1109
| |\ \ | |/ / |/| | | | | https://github.com/openpgp-keychain/openpgp-keychain into datefix
* | | Merge pull request #328 from bhargavgolla/patch-1Dominik Schürmann2014-03-051-1/+20
|\ \ \ | |_|/ |/| | Issue #234 : Adding a min date not to go below creation date
| * | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-10 19:32:11 +0000