Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #395 from uberspot/master | Dominik Schürmann | 2014-03-12 | 28 | -185/+234 | |
|\ \ \ \ | ||||||
| * | | | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 2 | -5/+53 | |
| * | | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ... | uberspot | 2014-03-11 | 12 | -21/+24 | |
| * | | | | minor clean up in colorize method | uberspot | 2014-03-11 | 1 | -2/+3 | |
| * | | | | Add export... button and functionality in multi-select | uberspot | 2014-03-11 | 8 | -12/+23 | |
| * | | | | Make export work with rowIds instead of MasterKeyIds | uberspot | 2014-03-11 | 6 | -53/+92 | |
| * | | | | Remove duplicate code from ActionBarHelper. You can now set the drawables via... | uberspot | 2014-03-11 | 6 | -95/+42 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #397 from tharinduwijewardane/master | Dominik Schürmann | 2014-03-12 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed | Tharindu Wijewardane | 2014-03-11 | 1 | -0/+1 | |
| |/ / / | ||||||
* / / / | Fix error in importing/updating keys from keyserver by removing extra 0x | Miroojin Bakshi | 2014-03-12 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | cleanup | Dominik Schürmann | 2014-03-11 | 2 | -43/+37 | |
* | | | 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 | 2 | -1/+61 | |
* | | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 2 | -32/+83 | |
|\ \ \ | ||||||
| * | | | Added string reference for Issue #207 | Sreeram Boyapati | 2014-03-10 | 1 | -4/+4 | |
| * | | | ViewHolder Pattern Implemented | Sreeram Boyapati | 2014-03-10 | 1 | -26/+39 | |
| * | | | Fix to passphrase dialog and Issue #207 | Sreeram Boyapati | 2014-03-10 | 1 | -6/+44 | |
* | | | | More fixes for KeychainIntentServiceHandler | Dominik Schürmann | 2014-03-10 | 1 | -41/+43 | |
* | | | | 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 | |
| |/ / |/| | | ||||||
* | | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 1 | -2/+0 | |
* | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 1 | -0/+2 | |
|\ \ \ | ||||||
| * | | | Lint changes | Bhargav Golla | 2014-03-10 | 1 | -0/+2 | |
| |/ / | ||||||
* | | | 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 | |
| |/ / / |/| | | | ||||||
* | | | | 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 | 2 | -1/+9 | |
|\ \ \ \ | ||||||
| * | | | | progress bar while key creation - added plurals based on no.of keys while key... | grait | 2014-03-09 | 1 | -1/+2 | |
| * | | | | Merge branch 'develop' into master2 | grait | 2014-03-09 | 13 | -94/+136 | |
| |\| | | | ||||||
| * | | | | 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 | 1 | -0/+56 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #369 from hav3n/branch-fixes | Dominik Schürmann | 2014-03-09 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | Revised fix for #347 | Nikhil Peter Raj | 2014-03-09 | 1 | -11/+1 | |
| * | | | Fix for #347 | Nikhil Peter Raj | 2014-03-08 | 1 | -1/+12 | |
* | | | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 9 | -87/+77 | |
* | | | | Merge pull request #316 from danielhass/import-error | Dominik Schürmann | 2014-03-08 | 2 | -6/+57 | |
|\ \ \ \ | ||||||
| * | | | | 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 |