aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-102-32/+83
|\
| * Added string reference for Issue #207Sreeram Boyapati2014-03-101-4/+4
| * ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| * Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-101-6/+44
* | More fixes for KeychainIntentServiceHandlerDominik Schürmann2014-03-101-41/+43
* | getString before init of KeychainIntentHandlerDominik Schürmann2014-03-109-62/+49
* | Fix progress_generating and reformatDominik Schürmann2014-03-101-1/+1
* | Fix progress_generating and reformatDominik Schürmann2014-03-106-61/+93
* | Revert "Lint changes"Dominik Schürmann2014-03-101-2/+0
* | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-101-0/+2
|\ \
| * | Lint changesBhargav Golla2014-03-101-0/+2
| |/
* | Make code more tidy for multiselectDominik Schürmann2014-03-104-44/+10
* | Improve hightlight query code: make cursor abstract, tidy up codeDominik Schürmann2014-03-104-55/+51
* | 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
| |/ / |/| |
* | | 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-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
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 02:03:15 +0000