Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 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 |
|\ \ | |/ |/| | |||||
| * | OnFocusChangeListener replaced with OnActionExpandListener | Daniel Hammann | 2014-03-11 | 1 | -6/+10 |
| * | Reset cursor query when closing search view #386 | Daniel Hammann | 2014-03-10 | 1 | -0/+10 |
* | | 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 |
|\ \ | |||||
| * | | 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 | 12 | -18/+23 |
* | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 12 | -23/+18 |
|\ \ | |||||
| * | | Lint changes | Bhargav Golla | 2014-03-10 | 12 | -23/+18 |
* | | | 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 |
|\ \ \ | |||||
| * \ \ | 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 |
* | | | | | 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 | 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 | uberspot | 2014-03-09 | 2 | -12/+28 |
| |/ / / | |||||
* | | | | Merge pull request #368 from ajit766/master | Dominik Schürmann | 2014-03-09 | 3 | -1/+14 |
|\ \ \ \ | |||||
| * | | | | progress bar while key creation - added plurals based on no.of keys while key... | grait | 2014-03-09 | 2 | -2/+8 |
| * | | | | progress bar during key creation - minor text change | grait | 2014-03-09 | 1 | -1/+1 |
| * | | | | Merge branch 'develop' into master2 | grait | 2014-03-09 | 17 | -99/+147 |
| |\| | | | |||||
| * | | | | progress is shown when creating the default key based on number of keys crea... | grait | 2014-03-08 | 2 | -1/+8 |
| | |/ / | |/| | | |||||
* | | | | 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 |
|\ \ \ | |||||
| * | | | 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 |
* | | | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 10 | -88/+78 |
* | | | | Merge pull request #316 from danielhass/import-error | Dominik Schürmann | 2014-03-08 | 3 | -6/+63 |
|\ \ \ \ | |||||
| * | | | | Fixed some naming | Daniel Haß | 2014-03-04 | 1 | -7/+7 |
| * | | | | Added exception is null option to display nothing if no error occured | Daniel Haß | 2014-03-04 | 1 | -4/+6 |
| * | | | | Added handling for other exceptions in the ImportListLoader. | Daniel Haß | 2014-03-03 | 3 | -4/+35 |
| * | | | | Little fixes | Daniel Haß | 2014-03-03 | 2 | -2/+1 |