aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #380 from uberspot/masterDominik Schürmann2014-03-092-12/+28
|\
| * Colorize fingerprintuberspot2014-03-092-12/+28
* | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-092-1/+9
|\ \
| * | progress bar while key creation - added plurals based on no.of keys while key...grait2014-03-091-1/+2
| * | Merge branch 'develop' into master2grait2014-03-0913-94/+136
| |\|
| * | progress is shown when creating the default key based on number of keys crea...grait2014-03-082-1/+8
* | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-091-0/+56
| |/ |/|
* | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-091-0/+1
|\ \
| * | Revised fix for #347Nikhil Peter Raj2014-03-091-11/+1
| * | Fix for #347Nikhil Peter Raj2014-03-081-1/+12
* | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-099-87/+77
* | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-082-6/+57
|\ \ \
| * | | Fixed some namingDaniel Haß2014-03-041-7/+7
| * | | Added exception is null option to display nothing if no error occuredDaniel Haß2014-03-041-4/+6
| * | | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-032-4/+30
| * | | Little fixesDaniel Haß2014-03-032-2/+1
| * | | Added exception for empty filesDaniel Haß2014-03-031-1/+17
| * | | Added handler for FileHasNoContent exception, some clean upDaniel Haß2014-03-031-6/+13
* | | | use parameter in updateFromKeyserverDominik Schürmann2014-03-081-1/+1
| |_|/ |/| |
* | | Revert "Fix for #347"Dominik Schürmann2014-03-071-3/+0
* | | Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0724-53/+25
|\ \ \
| * | | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-0715-29/+23
| * | | 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 #347Nikhil Peter Raj2014-03-081-0/+3
| | |_|/ | |/| |
* | | | Move search view into onCreateView, fixes #365Dominik Schürmann2014-03-071-6/+91
| |/ / |/| |
* | | move search view from activity to fragment by setting it as a list header, be...Dominik Schürmann2014-03-072-18/+19
* | | Reworking main KeyListPublicFragment to get progress indicatorDominik Schürmann2014-03-072-24/+72
|/ /
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-071-0/+11
|\ \
| * | Add option for sharing encrypted file.Miroojin Bakshi2014-03-071-0/+11
* | | Cleanup code, search with preceeding %Dominik Schürmann2014-03-072-34/+14
|/ /
* | API: get keyDominik Schürmann2014-03-071-12/+45
* | remove icon from nfc dialogDominik Schürmann2014-03-061-1/+0
* | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-0614-65/+65
|\ \
| * | corrected commitAnkush2014-03-0714-65/+65
* | | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-063-12/+19
* | | 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-062-10/+79
|\ \ \ | |/ / |/| |
| * | Use selectionArgs parameter to pass mCurquery.Miroojin Bakshi2014-03-062-8/+12
| * | Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-061-5/+31
| * | Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-061-4/+43
* | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain...Miroojin Bakshi2014-03-069-265/+540
|\ \ \
| * \ \ 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
| * | | Put Preferences in subscreenuberspot2014-03-051-66/+226
| |/ /
| * | Fix passphrase retrievalDominik Schürmann2014-03-051-8/+10
| * | Code cleaning in PgpDecryptVerifyDominik Schürmann2014-03-041-42/+46
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 03:35:40 +0000