aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge remote-tracking branch 'upstream/master' into search1Miroojin Bakshi2014-03-101-0/+3
| |\ \ \ \ \
| * | | | | | Create custom HighlightQueryCursorAdapterMiroojin Bakshi2014-03-103-68/+70
| | | | | | |
| * | | | | | Highlight search query in SelectPublicKeyFragment andMiroojin Bakshi2014-03-104-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyListPublicFragment
* | | | | | | Cleanup ImportKeysListEntryDominik Schürmann2014-03-101-4/+6
| | | | | | |
* | | | | | | remove double definition of progress_generatingDominik Schürmann2014-03-101-1/+0
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #385 from tharinduwijewardane/masterDominik Schürmann2014-03-101-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | Issue #378 ( private keys are no longer red ): Fixed
| * | | | Issue #378 ( private keys are no longer red ): FixedTharindu Wijewardane2014-03-101-0/+3
| | | | |
* | | | | remove unneeded replace for newline on fingerprintDominik Schürmann2014-03-091-2/+1
| | | | |
* | | | | Merge pull request #380 from uberspot/masterDominik Schürmann2014-03-092-12/+28
|\ \ \ \ \ | | | | | | | | | | | | Colorize fingerprint
| * | | | | Colorize fingerprintuberspot2014-03-092-12/+28
| |/ / / /
* | | | | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-093-1/+14
|\ \ \ \ \ | | | | | | | | | | | | progress is shown when creating the default key based on number of keys created till then
| * | | | | progress bar while key creation - added plurals based on no.of keys while ↵grait2014-03-092-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | key creation
| * | | | | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| | | | | |
| * | | | | Merge branch 'develop' into master2grait2014-03-0953-105/+528
| |\| | | |
| * | | | | progress is shown when creating the default key based on number of keys ↵grait2014-03-082-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | created so far
* | | | | | Merge pull request #372 from rafaelav/masterDominik Schürmann2014-03-093-40/+132
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Issue #178 - Hide advanced options in EncryptActivity
| * | | | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-093-40/+132
|/ / / / /
* | | | | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-092-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix for #347
| * | | | | Revised fix for #347Nikhil Peter Raj2014-03-091-11/+1
| | | | | |
| * | | | | Fix for #347Nikhil Peter Raj2014-03-082-3/+14
| | | | | |
* | | | | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-0910-88/+78
| | | | | |
* | | | | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-083-6/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show error if file import has no content
| * | | | | | 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-033-4/+35
| | | | | | |
| * | | | | | Little fixesDaniel Haß2014-03-032-2/+1
| | | | | | |
| * | | | | | Added FileHasNoContent stringDaniel Haß2014-03-031-0/+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
| |_|_|_|/ / |/| | | | |
* | | | | | beta4Dominik Schürmann2014-03-081-2/+2
| |_|_|/ / |/| | | |
* | | | | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 16:49:32 +0000