aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove summary and change titlealescdb2015-10-233-4/+1
* Code style (xml) spaces -> tabalescdb2015-10-231-4/+3
* Code stylealescdb2015-10-231-16/+17
* Code stylealescdb2015-10-234-44/+44
* Add a setting options to always show the virtual keyboard (special keys)alescdb2015-10-235-11/+48
* Merge pull request #328 from alescdb/senthandler-bugJeremy Klein2015-10-231-0/+4
|\
| * Merge branch 'master' into senthandler-bugAlex2015-10-230-0/+0
| |\ | |/ |/|
* | Merge pull request #327 from alescdb/mediaplayer-bugKenny Root2015-10-231-9/+4
|\ \
| | * Restore TerminalBridge.promptHelper.setHandler() in onServiceConnected()alescdb2015-10-231-0/+4
| |/
| * Call MediaPlayer.seekTo() before MediaPlayer.start()alescdb2015-10-231-9/+4
|/
* Merge pull request #325 from alescdb/buildtools-v23Kenny Root2015-10-222-2/+2
|\
| * Update to buildtools v23.0.1alescdb2015-10-232-2/+2
|/
* Merge pull request #324 from khorimoto/fix-double-nickname-fieldJeremy Klein2015-10-222-1/+8
|\
| * Don't display a nickname field when protocol is 'local.'Kyle Horimoto2015-10-222-1/+8
|/
* Merge pull request #321 from alescdb/key-vectorsKenny Root2015-10-2218-46/+91
|\
| * Merge branch 'master' into key-vectorsAlex2015-10-221-1/+4
| |\ | |/ |/|
* | Merge pull request #323 from kruton/gradle-updateKenny Root2015-10-222-2/+5
|\ \
| * | Update to Android gradle build tools 1.4.0-beta3Kenny Root2015-10-222-2/+5
|/ /
| * Restore app.imlalescdb2015-10-221-51/+53
| * Merge branch 'master' into key-vectorsAlex2015-10-222-0/+6
| |\ | |/ |/|
* | Merge pull request #318 from johnheroy/fontsizesliderJeremy Klein2015-10-222-0/+6
|\ \
| * \ Merge branch 'master' into fontsizesliderJohn Heroy2015-10-2246-410/+1
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master'John Heroy2015-10-2246-410/+1
| | |\ \ | |_|/ / |/| | |
| * | | Add comments explaining requestFocus and clearFocus method callsJohn Heroy2015-10-211-0/+2
| * | | Merge branch 'master' into fontsizesliderJohn Heroy2015-10-218-16/+63
| |\| |
| | * | Merge remote-tracking branch 'upstream/master'John Heroy2015-10-218-16/+63
| | |\ \
| * | | | Programmatically request focus on quick connect container and set LinearLayou...John Heroy2015-10-212-0/+3
| * | | | Clear focus away from font size EditText when seekbar value changes so that t...John Heroy2015-10-211-0/+1
| |/ / /
| * | | Merge remote-tracking branch 'upstream/master'John Heroy2015-10-213-41/+55
| |\ \ \
| | | | * Remove unused resource button_key_tabalescdb2015-10-225-58/+52
| | | | * Remove unused button_key_tabAlex2015-10-221-2/+0
| | | | * Update inc_keyboard.xmlAlex2015-10-221-1/+2
| | | | * Replace unicode keys by vector drawablealescdb2015-10-2214-42/+92
| |_|_|/ |/| | |
* | | | Merge pull request #320 from kruton/lint-script-messageKenny Root2015-10-211-1/+1
|\ \ \ \
| * | | | Change the lint script to use message instead of summaryKenny Root2015-10-211-1/+1
|/ / / /
* | | | Merge pull request #314 from kruton/translations-importKenny Root2015-10-2145-409/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Import translationsKenny Root2015-10-2144-390/+0
| * | | Remove unused stringsKenny Root2015-10-211-19/+0
* | | | Merge pull request #303 from johnheroy/volume-seekbarJeremy Klein2015-10-218-9/+63
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into volume-seekbarJohn Heroy2015-10-213-41/+55
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #308 from rhansby/fix-list-font-sizeJeremy Klein2015-10-213-41/+55
|\ \ \ \ | |_|/ / |/| | |
| * | | Use the ListItemIcon style on HostList and PubkeyList icons.Ryan Hansberry2015-10-212-12/+3
| * | | Style port forward and pubkey list like the host list.Ryan Hansberry2015-10-212-34/+57
|/ / /
| * | Merge branch 'master' into volume-seekbarJohn Heroy2015-10-2146-467/+1020
| |\|
| | * Merge branch 'master' of https://github.com/connectbot/connectbotJohn Heroy2015-10-2142-403/+951
| | |\ | |_|/ |/| |
* | | Merge pull request #310 from kruton/translations-importKenny Root2015-10-2128-34/+122
|\ \ \
| * | | Import translationsKenny Root2015-10-2128-34/+122
* | | | Merge pull request #304 from khorimoto/polish-ui-edit-hostJeremy Klein2015-10-216-357/+764
|\ \ \ \ | |/ / / |/| | |
| * | | jlklein comment.Kyle Horimoto2015-10-212-2/+4
| * | | Lint and jlklein comments.Kyle Horimoto2015-10-214-21/+57