Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-28 | 1 | -1/+5 | |
|\| | | | ||||||
| * | | | Localize numbers in ColorsActivity | Kenny Root | 2015-03-28 | 1 | -1/+5 | |
| | | | | ||||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 11 | -21/+52 | |
|\| | | | | | | | | | | | | | | | Change-Id: I4ea022cf42d3aea8e52d8e4fbd604575c109df1d | |||||
| * | | | Update translations | Kenny Root | 2015-03-27 | 12 | -49/+61 | |
| | | | | | | | | | | | | | | | | Change-Id: Iabc1d6dee20517eba48e22c72784b2d06f887651 | |||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 1 | -0/+5 | |
|\| | | | ||||||
| * | | | Do not try to resize local PTY before connection | Kenny Root | 2015-03-27 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | At that point shellFd is null and trying to get a field from it via JNI will cause the runtime to abort. Fixes #65 | |||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 3 | -58/+74 | |
|\| | | | ||||||
| * | | | Use a sane default font size | Kenny Root | 2015-03-27 | 3 | -58/+74 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also try to scale existing host entries down by the appropriate amount. Fixes #44 | |||||
* | | | | Android Studio: add inspection profiles | Kenny Root | 2015-03-27 | 1 | -0/+11 | |
| | | | | ||||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 5 | -5/+31 | |
|\| | | | ||||||
| * | | | Add a close-on-disconnect option | mendhak | 2015-03-27 | 5 | -5/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defaults to off to preserve previous behavior. Original patch by Jeff King (@peff) Fixes #23 | |||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 1 | -1/+0 | |
|\| | | | ||||||
| * | | | Remove newer API level layout parameter | Kenny Root | 2015-03-27 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 6 | -158/+211 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java | |||||
| * | | | Make the color picker scale with display density | Kenny Root | 2015-03-27 | 4 | -165/+217 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UberColorPickerDialog was written when there was only one display density (mdpi). Scale all of the values appropriately for modern multi-density displays. Fixes #64 | |||||
| * | | | Move new scaled icons out of res/ because they're not allowed in there | Paul "LeoNerd" Evans | 2015-03-26 | 2 | -0/+0 | |
| | | | | ||||||
| * | | | Added 64px and 14px rescaled versions of the icon, for launchpad branding | Paul "LeoNerd" Evans | 2015-03-26 | 2 | -0/+0 | |
| | | | | ||||||
* | | | | Update translations | Kenny Root | 2015-03-26 | 45 | -72/+53 | |
| | | | | ||||||
* | | | | Do not overquote the a2po args | Kenny Root | 2015-03-26 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Add translation gradle tasks | Kenny Root | 2015-03-26 | 4 | -0/+86 | |
| | | | | ||||||
* | | | | Move notification icons to correct directory | Kenny Root | 2015-03-26 | 3 | -0/+0 | |
| | | | | ||||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 7 | -9/+52 | |
|\| | | | ||||||
| * | | | Update translations | Kenny Root | 2015-03-26 | 7 | -9/+52 | |
| | | | | | | | | | | | | | | | | Change-Id: I7973910fc038dc7d593f0e516d6a4fcd8c41f63a | |||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 1 | -0/+2 | |
|\| | | | ||||||
| * | | | Add updated zh_TW translations | Kenny Root | 2015-03-26 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | Change-Id: If5cf2e451c92313eb727de535861dbc9791ed5ed | |||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 1 | -0/+3 | |
|\| | | | ||||||
| * | | | Add translation context for description strings | Kenny Root | 2015-03-26 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | Change-Id: Iea226b10973fe418d3a8e3bf6f5067dd0b1ded26 | |||||
* | | | | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 1 | -0/+1 | |
|\| | | | ||||||
| * | | | Add context for new sticky key modifier preference | Kenny Root | 2015-03-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | Change-Id: If34064f1dd42ebdc3887a54fc51ee16a0119687e | |||||
* | | | | Android Studio: try to make code format match existing | Kenny Root | 2015-03-24 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | Add some whitespace rules and fixes for them | Kenny Root | 2015-03-23 | 26 | -219/+245 | |
| | | | | ||||||
* | | | | travis: also cache gradle dists | Kenny Root | 2015-03-23 | 1 | -0/+1 | |
| | | | |