aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-105-39/+109
|\ | | | | Fix to passphrase dialog and Issue #207
| * Added string reference for Issue #207Sreeram Boyapati2014-03-102-4/+6
| |
| * ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| |
| * Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-103-13/+68
| |
* | More fixes for KeychainIntentServiceHandlerDominik Schürmann2014-03-101-41/+43
| |
* | Pull from transifexDominik Schürmann2014-03-1023-269/+828
| |
* | 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
| |
* | @color/white instead of hexDominik Schürmann2014-03-101-1/+1
| |
* | Revert "Lint changes"Dominik Schürmann2014-03-1012-18/+23
| | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
* | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1012-23/+18
|\ \ | | | | | | Lint changes #223
| * | Lint changesBhargav Golla2014-03-1012-23/+18
| | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore
* | | 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
|\ \ \ | | | | | | | | Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
| * \ \ 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-0917-99/+147
| |\| | |
| * | | | progress is shown when creating the default key based on number of keys ↵grait2014-03-082-1/+8
| | |/ / | |/| | | | | | | | | | created so far
* | | | 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
| |_|/ |/| |
* | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 22:05:27 +0000