Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-06-01 | 3 | -5/+8 | |
|\| | ||||||
| * | We should be decoding the public key not private | Kenny Root | 2015-06-01 | 1 | -1/+1 | |
| | | | | | | | | Thanks to @msoulatre-tt for pointing out the bug. Closes #83. | |||||
| * | Update version code for v1.8.4 | Kenny Root | 2015-04-19 | 2 | -4/+7 | |
| | | ||||||
* | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-19 | 3 | -7/+27 | |
|\| | ||||||
| * | telnet: try all addresses for host | Kenny Root | 2015-04-19 | 2 | -3/+20 | |
| | | | | | | | | Closes #46 | |||||
| * | Merge pull request #21 from zakki/keep-local-connection | Kenny Root | 2015-04-19 | 1 | -4/+7 | |
| |\ | | | | | | | Keep local connections when network down. | |||||
| | * | Keep local connections when network down. | Kensuke Matsuzaki | 2010-11-14 | 1 | -4/+7 | |
| | | | ||||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-19 | 4 | -67/+25 | |
|\| | | ||||||
| * | | ssh: try all addresses when connecting | Kenny Root | 2015-04-19 | 2 | -67/+17 | |
| | | | | | | | | | | | | This should satisfy the SSH part of issue #46. | |||||
| * | | ssh: display the key exchange algorithm used | Kenny Root | 2015-04-19 | 3 | -0/+8 | |
| | | | ||||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-17 | 2 | -2/+3 | |
|\| | | ||||||
| * | | Telnet: ensure port number is below maximum | Kenny Root | 2015-04-17 | 2 | -2/+3 | |
| | | | | | | | | | | | | Closes #62 | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-16 | 2 | -15/+12 | |
|\| | | ||||||
| * | | Update CHANGELOG for TerminalManager fix | Kenny Root | 2015-04-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | In change 613bc40cdd458c7127902d1fd0b7b4b12fb27268 there was a fix that could be significant for some, so update the CHANGELOG to reflect that. | |||||
| * | | Keep TerminalManager alive even during rebind | Kenny Root | 2015-04-16 | 1 | -15/+11 | |
| | | | ||||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-14 | 31 | -106/+3 | |
|\| | | ||||||
| * | | Update translations | Kenny Root | 2015-04-14 | 29 | -87/+0 | |
| | | | | | | | | | | | | Remove unused bind_{minutes,seconds,days} from other languages. | |||||
| * | | Use DateUtils.getRelativeTimeSpanString | Peter Collingbourne | 2015-04-14 | 2 | -19/+3 | |
| | | | | | | | | | | | | Closes #2 | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-05 | 3 | -3/+5 | |
|\| | | ||||||
| * | | ECDH there should be no negative bigint | Kenny Root | 2015-04-05 | 3 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the hash is over the canonical values of the agreed parameters when the shared secret was encoded as a negative biginteger, the two sides didn't agree. Make sure this doesn't occur by setting the bigint signum to 1. Change-Id: Ib0581cd7dc280dcce8cc3309d7102f8f5a444158 | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-05 | 2 | -1/+13 | |
|\| | | ||||||
| * | | Fix ssh-dss host key support | Kenny Root | 2015-04-05 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This string was accidentally renamed to "ssh-dsa" during refactoring. DSA should die and go away, but the SSH standard said that was the only required algorithm when it was created. Change-Id: Ia533eac55692289de8042f6f95714b577941ca3f | |||||
| * | | Add changelog entries for 1.8.3 | Kenny Root | 2015-04-05 | 1 | -0/+9 | |
| | | | | | | | | | | | | Change-Id: Ifeefc557aaae1e3d6085c17988c728b045e32ee6 | |||||
| * | | Fix link in CHANGELOG | Kenny Root | 2015-04-05 | 1 | -0/+2 | |
| | | | | | | | | | | | | Change-Id: I30ef735f468da663c5ce5e70cec717711aef7d2c | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-05 | 3 | -3/+20 | |
|\| | | ||||||
| * | | Provide more context for SSH connection failures | Kenny Root | 2015-04-05 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Trilead SSH stack throws IOException on failures and then higher levels of the stack catch those, we need to descend into the causes of each Exception to give the user more context. Unfortunately this information is not localized. Change-Id: I8b1fdf9eab65e5d2f6f1956562cbf9f56a2adb9d | |||||
| * | | Keep order for crypto wishlist | Kenny Root | 2015-04-05 | 2 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Switch from TreeSet to LinkedHashMap since the preference is determined by iterating over the Set for both KEX_ALGS and HOST_KEY_ALGS. The order before was based on string comparisons(!) Change-Id: Ia4573d67f35a5371eb8c70dde631085d61570fe9 | |||||
| * | | Add a CHANGELOG | Kenny Root | 2015-04-05 | 1 | -0/+5 | |
| | | | | | | | | | | | | Change-Id: I7031e8bc379ed52ea8eb06e79cefb871204d530c | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-02 | 1 | -2/+2 | |
|\| | | ||||||
| * | | Update version code for v1.8.3 | Kenny Root | 2015-04-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | Change-Id: I18026baf76d25af3dc30d46144d3f941bde6f16c | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-02 | 4 | -515/+240 | |
|\| | | ||||||
| * | | Update translations | Kenny Root | 2015-04-02 | 4 | -515/+240 | |
| | | | | | | | | | | | | Change-Id: I370370d4cbe6f0f2510cc32f64f51946650ba8e2 | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-04-03 | 2 | -9/+28 | |
|\| | | ||||||
| * | | Check for EC support before enabling it | Kenny Root | 2015-04-03 | 1 | -6/+24 | |
| | | | | | | | | | | | | Fixes #69 | |||||
| * | | Break circle since connectionLost should not call close | Kenny Root | 2015-04-03 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix JavaDoc (okay, not much of an improvement) | Kenny Root | 2015-04-03 | 1 | -1/+2 | |
| | | | ||||||
| * | | Return empty port forward list if host arg is null | Kenny Root | 2015-03-29 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | There would be a NullPointerException if the host passed in was null, so just preclude it by checking. | |||||
* | | | Return empty port forward list if host arg is null | Kenny Root | 2015-03-29 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | There would be a NullPointerException if the host passed in was null, so just preclude it by checking. | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-28 | 1 | -4/+1 | |
|\| | | ||||||
| * | | Fix last merge request to not undo final of bridge | Kenny Root | 2015-03-28 | 1 | -4/+1 | |
| | | | | | | | | | | | | Change-Id: I47a0d6a0dfcdf735f26dcc09dc4b98d58cb0aa33 | |||||
* | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-28 | 2 | -4/+7 | |
|\| | | ||||||
| * | | Fix indentation in last pull request | Kenny Root | 2015-03-28 | 2 | -4/+5 | |
| | | | | | | | | | | | | Change-Id: Ib80ec5184ae7b329979580fd0a0c187f8ac01fbf | |||||
| * | | Merge pull request #60 from sblackshear/service_npe_fix | Kenny Root | 2015-03-29 | 1 | -1/+3 | |
| |\ \ | | | | | | | | | Fix possible NPE in HostListActivity.onCreateContextMenu | |||||
| | * | | Fix possible NPE in HostListActivity.onCreateContextMenu | Sam Blackshear | 2015-03-20 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Merge pull request #61 from sblackshear/pubkeylist_npe_fix | Kenny Root | 2015-03-29 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | | | Fixing possible NPE in PubkeyListActivity | |||||
| | * | | | Fixing possible NPE in PubkeyListActivity | Sam Blackshear | 2015-03-25 | 1 | -2/+2 | |
| | |/ / | ||||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-28 | 1 | -0/+516 | |
|\| | | | ||||||
| * | | | Fix typo in new translations | Kenny Root | 2015-03-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Change-Id: I64e8f92ea6a6c58b204bf94eee3820e72bd0d578 | |||||
| * | | | Merge pull request #68 from pejakm/srtr | Kenny Root | 2015-03-29 | 1 | -0/+516 | |
| |\ \ \ | | | | | | | | | | | Add Serbian translation | |||||
| | * | | | Add Serbian translation | Mladen Pejaković | 2015-03-28 | 1 | -0/+516 | |
| |/ / / |