aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #384 from mb-14/search1Dominik Schürmann2014-03-105-8/+79
|\
| * 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
* | | 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 ): 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 fingerprintuberspot2014-03-092-12/+28
| |/
* | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-093-1/+14
|\ \
| * | progress bar while key creation - added plurals based on no.of keys while key...grait2014-03-092-2/+8
| * | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| * | Merge branch 'develop' into master2grait2014-03-0917-99/+147
| |\|
| * | 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-093-40/+132
| |/ |/|
* | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-092-2/+3
|\ \
| * | 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
|\ \ \
| * | | 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
| |_|/ |/| |
* | | Revert "Fix for #347"Dominik Schürmann2014-03-071-3/+0
* | | Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0734-63/+38
|\ \ \
| * | | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-0715-29/+23
| * | | 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 #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, be...Dominik Schürmann2014-03-074-26/+26
* | | 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
|\ \
| * | 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-071-12/+45
* | remove icon from nfc dialogDominik Schürmann2014-03-061-1/+0
* | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-0628-85/+85
|\ \
| * | corrected commitAnkush2014-03-0728-85/+85
* | | remove unused search definitions from manifestDominik Schürmann2014-03-061-40/+0
* | | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-0610-12/+28
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 06:49:25 +0000