| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | Merge pull request #397 from tharinduwijewardane/master | Dominik Schürmann | 2014-03-12 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted ) | |||||
| | * | | | | | | Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed | Tharindu Wijewardane | 2014-03-11 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge pull request #1 from openpgp-keychain/master | Tharindu Wijewardane | 2014-03-11 | 60 | -596/+1561 | |
| | |\| | | | | | | | | | | | | | | | | | | | updating my fork | |||||
| * | | | | | | | Merge pull request #402 from mb-14/hkpget | Dominik Schürmann | 2014-03-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fix error in importing/updating keys from keyserver by removing extra 0x | |||||
| | * | | | | | | Fix error in importing/updating keys from keyserver by removing extra 0x | Miroojin Bakshi | 2014-03-12 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | more tight layout | Dominik Schürmann | 2014-03-11 | 1 | -12/+10 | |
| | | | | | | | ||||||
| * | | | | | | cleanup | Dominik Schürmann | 2014-03-11 | 2 | -43/+37 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #394 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-11 | 1 | -1/+4 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | linear layout edited to display test horizontally #391 | |||||
| | * | | | | | | linear layout edited to display test horizontally | Sreeram Boyapati | 2014-03-11 | 1 | -1/+4 | |
| | | |_|/ / / | |/| | | | | ||||||
| * | | | | | | Merge pull request #392 from honnel/cursor-reset2 | Dominik Schürmann | 2014-03-11 | 1 | -0/+14 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | Reset cursor query when closing search view #386 | |||||
| | * | | | | OnFocusChangeListener replaced with OnActionExpandListener | Daniel Hammann | 2014-03-11 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | | | | | | For same behaviour like contacts app #386 #387 | |||||
| | * | | | | Reset cursor query when closing search view #386 | Daniel Hammann | 2014-03-10 | 1 | -0/+10 | |
| | | |/ / | |/| | | | | | | | | | | Without focus the search result get erased. | |||||
| * | | | | Merge pull request #390 from uberspot/master | Dominik Schürmann | 2014-03-10 | 9 | -1/+153 | |
| |\ \ \ \ | | | | | | | | | | | Appropriate save Icon in EditKeyActivity fixes #382 | |||||
| | * | | | | Appropriate save Icon in EditKeyActivity | uberspot | 2014-03-11 | 9 | -1/+153 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 5 | -39/+109 | |
| |\ \ \ \ | | | | | | | | | | | Fix to passphrase dialog and Issue #207 | |||||
| | * | | | | Added string reference for Issue #207 | Sreeram Boyapati | 2014-03-10 | 2 | -4/+6 | |
| | | | | | | ||||||
| | * | | | | ViewHolder Pattern Implemented | Sreeram Boyapati | 2014-03-10 | 1 | -26/+39 | |
| | | | | | | ||||||
| | * | | | | Fix to passphrase dialog and Issue #207 | Sreeram Boyapati | 2014-03-10 | 3 | -13/+68 | |
| | | | | | | ||||||
| * | | | | | More fixes for KeychainIntentServiceHandler | Dominik Schürmann | 2014-03-10 | 1 | -41/+43 | |
| | | | | | | ||||||
| * | | | | | Pull from transifex | Dominik Schürmann | 2014-03-10 | 23 | -269/+828 | |
| | | | | | | ||||||
| * | | | | | getString before init of KeychainIntentHandler | Dominik Schürmann | 2014-03-10 | 9 | -62/+49 | |
| | | | | | | ||||||
| * | | | | | Fix progress_generating and reformat | Dominik Schürmann | 2014-03-10 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fix progress_generating and reformat | Dominik Schürmann | 2014-03-10 | 6 | -61/+93 | |
| | |/ / / |/| | | | ||||||
| * | | | | @color/white instead of hex | Dominik Schürmann | 2014-03-10 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 14 | -24/+23 | |
| | | | | | | | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee. | |||||
| * | | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 14 | -23/+24 | |
| |\ \ \ \ | | | | | | | | | | | Lint changes #223 | |||||
| | * | | | | Lint changes | Bhargav Golla | 2014-03-10 | 14 | -23/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore | |||||
| * | | | | | Make code more tidy for multiselect | Dominik Schürmann | 2014-03-10 | 4 | -44/+10 | |
| | | | | | | ||||||
| * | | | | | Improve hightlight query code: make cursor abstract, tidy up code | Dominik Schürmann | 2014-03-10 | 4 | -55/+51 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #384 from mb-14/search1 | Dominik Schürmann | 2014-03-10 | 5 | -8/+79 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into search1 | Miroojin Bakshi | 2014-03-10 | 1 | -0/+3 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Create custom HighlightQueryCursorAdapter | Miroojin Bakshi | 2014-03-10 | 3 | -68/+70 | |
| | | | | | | | | ||||||
| | * | | | | | | Highlight search query in SelectPublicKeyFragment and | Miroojin Bakshi | 2014-03-10 | 4 | -3/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyListPublicFragment | |||||
| * | | | | | | | Cleanup ImportKeysListEntry | Dominik Schürmann | 2014-03-10 | 1 | -4/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | remove double definition of progress_generating | Dominik Schürmann | 2014-03-10 | 1 | -1/+0 | |
| | |/ / / / / |/| | | | | | ||||||
| * | | | | | | Merge pull request #385 from tharinduwijewardane/master | Dominik Schürmann | 2014-03-10 | 1 | -0/+3 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | Issue #378 ( private keys are no longer red ): Fixed | |||||
| | * | | | | Issue #378 ( private keys are no longer red ): Fixed | Tharindu Wijewardane | 2014-03-10 | 1 | -0/+3 | |
| | | | | | | ||||||
| * | | | | | remove unneeded replace for newline on fingerprint | Dominik Schürmann | 2014-03-09 | 1 | -2/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #380 from uberspot/master | Dominik Schürmann | 2014-03-09 | 2 | -12/+28 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Colorize fingerprint | |||||
| | * | | | | | Colorize fingerprint | uberspot | 2014-03-09 | 2 | -12/+28 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #368 from ajit766/master | Dominik Schürmann | 2014-03-09 | 3 | -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 ↵ | grait | 2014-03-09 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | key creation | |||||
| | * | | | | | progress bar during key creation - minor text change | grait | 2014-03-09 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'develop' into master2 | grait | 2014-03-09 | 53 | -105/+528 | |
| | |\| | | | | ||||||
| | * | | | | | progress is shown when creating the default key based on number of keys ↵ | grait | 2014-03-08 | 2 | -1/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | created so far | |||||
| * | | | | | | Merge pull request #372 from rafaelav/master | Dominik Schürmann | 2014-03-09 | 3 | -40/+132 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Issue #178 - Hide advanced options in EncryptActivity | |||||
| | * | | | | | Issue #178 - Hide advanced options in EncryptActivity | rafaelav | 2014-03-09 | 3 | -40/+132 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #369 from hav3n/branch-fixes | Dominik Schürmann | 2014-03-09 | 2 | -2/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix for #347 | |||||
| | * | | | | | Revised fix for #347 | Nikhil Peter Raj | 2014-03-09 | 1 | -11/+1 | |
| | | | | | | | ||||||
| | * | | | | | Fix for #347 | Nikhil Peter Raj | 2014-03-08 | 2 | -3/+14 | |
| | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |