Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #327 from alescdb/mediaplayer-bug | Kenny Root | 2015-10-23 | 1 | -9/+4 | |
|\ \ | | | | | | | Call MediaPlayer.seekTo() before MediaPlayer.start() | |||||
| | * | Restore TerminalBridge.promptHelper.setHandler() in onServiceConnected() | alescdb | 2015-10-23 | 1 | -0/+4 | |
| |/ | ||||||
| * | Call MediaPlayer.seekTo() before MediaPlayer.start() | alescdb | 2015-10-23 | 1 | -9/+4 | |
|/ | ||||||
* | Merge pull request #325 from alescdb/buildtools-v23 | Kenny Root | 2015-10-22 | 2 | -2/+2 | |
|\ | | | | | Update to buildtools v23.0.1 | |||||
| * | Update to buildtools v23.0.1 | alescdb | 2015-10-23 | 2 | -2/+2 | |
|/ | ||||||
* | Merge pull request #324 from khorimoto/fix-double-nickname-field | Jeremy Klein | 2015-10-22 | 2 | -1/+8 | |
|\ | | | | | Don't display a nickname field when protocol is 'local.' | |||||
| * | Don't display a nickname field when protocol is 'local.' | Kyle Horimoto | 2015-10-22 | 2 | -1/+8 | |
|/ | ||||||
* | Merge pull request #321 from alescdb/key-vectors | Kenny Root | 2015-10-22 | 18 | -46/+91 | |
|\ | | | | | Replace unicode keys by vector drawable | |||||
| * | Merge branch 'master' into key-vectors | Alex | 2015-10-22 | 1 | -1/+4 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #323 from kruton/gradle-update | Kenny Root | 2015-10-22 | 2 | -2/+5 | |
|\ \ | | | | | | | Update to Android gradle build tools 1.4.0-beta3 | |||||
| * | | Update to Android gradle build tools 1.4.0-beta3 | Kenny Root | 2015-10-22 | 2 | -2/+5 | |
|/ / | ||||||
| * | Restore app.iml | alescdb | 2015-10-22 | 1 | -51/+53 | |
| | | ||||||
| * | Merge branch 'master' into key-vectors | Alex | 2015-10-22 | 2 | -0/+6 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #318 from johnheroy/fontsizeslider | Jeremy Klein | 2015-10-22 | 2 | -0/+6 | |
|\ \ | | | | | | | Clear focus on font size EditText when font size SeekBar progress changed | |||||
| * \ | Merge branch 'master' into fontsizeslider | John Heroy | 2015-10-22 | 46 | -410/+1 | |
| |\ \ | ||||||
| | * \ | Merge remote-tracking branch 'upstream/master' | John Heroy | 2015-10-22 | 46 | -410/+1 | |
| | |\ \ | |_|/ / |/| | | | ||||||
| * | | | Add comments explaining requestFocus and clearFocus method calls | John Heroy | 2015-10-21 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into fontsizeslider | John Heroy | 2015-10-21 | 8 | -16/+63 | |
| |\| | | ||||||
| | * | | Merge remote-tracking branch 'upstream/master' | John Heroy | 2015-10-21 | 8 | -16/+63 | |
| | |\ \ | ||||||
| * | | | | Programmatically request focus on quick connect container and set ↵ | John Heroy | 2015-10-21 | 2 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | LinearLayout to android:focusable='true' | |||||
| * | | | | Clear focus away from font size EditText when seekbar value changes so that ↵ | John Heroy | 2015-10-21 | 1 | -0/+1 | |
| |/ / / | | | | | | | | | | | | | the text can update | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | John Heroy | 2015-10-21 | 3 | -41/+55 | |
| |\ \ \ | ||||||
| | | | * | Remove unused resource button_key_tab | alescdb | 2015-10-22 | 5 | -58/+52 | |
| | | | | | ||||||
| | | | * | Remove unused button_key_tab | Alex | 2015-10-22 | 1 | -2/+0 | |
| | | | | | ||||||
| | | | * | Update inc_keyboard.xml | Alex | 2015-10-22 | 1 | -1/+2 | |
| | | | | | ||||||
| | | | * | Replace unicode keys by vector drawable | alescdb | 2015-10-22 | 14 | -42/+92 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #320 from kruton/lint-script-message | Kenny Root | 2015-10-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Change the lint script to use message instead of summary | |||||
| * | | | | Change the lint script to use message instead of summary | Kenny Root | 2015-10-21 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | | | | | The message has a better explanation (i.e., specific to the instance it's talking about) than the summary which is fairly generic. | |||||
* | | | | Merge pull request #314 from kruton/translations-import | Kenny Root | 2015-10-21 | 45 | -409/+0 | |
|\ \ \ \ | |_|_|/ |/| | | | Translations import | |||||
| * | | | Import translations | Kenny Root | 2015-10-21 | 44 | -390/+0 | |
| | | | | ||||||
| * | | | Remove unused strings | Kenny Root | 2015-10-21 | 1 | -19/+0 | |
| | | | | ||||||
* | | | | Merge pull request #303 from johnheroy/volume-seekbar | Jeremy Klein | 2015-10-21 | 8 | -9/+63 | |
|\ \ \ \ | |_|_|/ |/| | | | Set more padding on volume pref SeekBar for Lollipop and above | |||||
| * | | | Merge branch 'master' into volume-seekbar | John Heroy | 2015-10-21 | 3 | -41/+55 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #308 from rhansby/fix-list-font-size | Jeremy Klein | 2015-10-21 | 3 | -41/+55 | |
|\ \ \ \ | |_|/ / |/| | | | Style port forward and pubkey list like the host list. | |||||
| * | | | Use the ListItemIcon style on HostList and PubkeyList icons. | Ryan Hansberry | 2015-10-21 | 2 | -12/+3 | |
| | | | | ||||||
| * | | | Style port forward and pubkey list like the host list. | Ryan Hansberry | 2015-10-21 | 2 | -34/+57 | |
|/ / / | ||||||
| * | | Merge branch 'master' into volume-seekbar | John Heroy | 2015-10-21 | 46 | -467/+1020 | |
| |\| | ||||||
| | * | Merge branch 'master' of https://github.com/connectbot/connectbot | John Heroy | 2015-10-21 | 42 | -403/+951 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #310 from kruton/translations-import | Kenny Root | 2015-10-21 | 28 | -34/+122 | |
|\ \ \ | | | | | | | | | Import translations | |||||
| * | | | Import translations | Kenny Root | 2015-10-21 | 28 | -34/+122 | |
| | | | | ||||||
* | | | | Merge pull request #304 from khorimoto/polish-ui-edit-host | Jeremy Klein | 2015-10-21 | 6 | -357/+764 | |
|\ \ \ \ | |/ / / |/| | | | Polish UI for add/edit host. | |||||
| * | | | jlklein comment. | Kyle Horimoto | 2015-10-21 | 2 | -2/+4 | |
| | | | | ||||||
| * | | | Lint and jlklein comments. | Kyle Horimoto | 2015-10-21 | 4 | -21/+57 | |
| | | | | ||||||
| * | | | Polish UI for add/edit host. | Kyle Horimoto | 2015-10-21 | 5 | -349/+718 | |
|/ / / | ||||||
* | | | Merge pull request #305 from khorimoto/save-dialog | Kenny Root | 2015-10-21 | 8 | -12/+65 | |
|\ \ \ | | | | | | | | | Add/edit host dialog: Add save dialog and adjust icons. | |||||
| * | | | Lint. | Kyle Horimoto | 2015-10-21 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | Add save dialog and adjust icons. | Kyle Horimoto | 2015-10-21 | 8 | -12/+67 | |
| | | | | ||||||
| | | * | Merge remote-tracking branch 'upstream/master' | John Heroy | 2015-10-21 | 5 | -65/+70 | |
| | | |\ | |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #309 from kruton/lint-xqilla | Kenny Root | 2015-10-21 | 3 | -59/+59 | |
|\ \ \ \ | | | | | | | | | | | Better lint output for Travis-CI | |||||
| * | | | | Change check-lint-results.bash indentation | Kenny Root | 2015-10-21 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | Use two spaces consistently throughout the file. |