aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #302 from freshp86/masterJeremy Klein2015-10-191-0/+3
|\
| * Add Travis build status badge on README.mddpapad2015-10-191-0/+3
|/
* Merge pull request #300 from johnheroy/hostlistJeremy Klein2015-10-161-8/+8
|\
| * Align host list status icon to left sideJohn Heroy2015-10-161-8/+8
|/
* Merge pull request #298 from rhansby/prevent-cursor-in-terminal-textJeremy Klein2015-10-151-1/+2
|\
| * Prevent a cursor being displayed within terminal text.Ryan Hansberry2015-10-151-1/+2
|/
* Merge pull request #297 from rhansby/broken-pasteJeremy Klein2015-10-156-11/+10
|\
| * Fix lint errors.Ryan Hansberry2015-10-155-9/+8
| * Fix paste button being permanently disabled because SSH session was not yet o...Ryan Hansberry2015-10-151-2/+2
|/
* Merge pull request #290 from rhansby/proper-textview-scrollingKenny Root2015-10-144-310/+450
|\
| * Made TerminalTextViewOverlay a child view of TerminalView.Ryan Hansberry2015-10-144-96/+32
| * Prevent calling toString on null when pasting to clipboard.Ryan Hansberry2015-10-141-4/+10
| * Fix lint error.Ryan Hansberry2015-10-141-2/+10
| * Fix lint error.Ryan Hansberry2015-10-141-0/+2
| * Make text selection scroll up when a new line enters the buffer.Ryan Hansberry2015-10-142-4/+38
| * TerminalView: Move TextView logic that allows text selection into its own cla...Ryan Hansberry2015-10-145-308/+462
|/
* Merge pull request #294 from khorimoto/pubkey-menuJeremy Klein2015-10-1451-73/+77
|\
| * Fix lint.Kyle Horimoto2015-10-1441-43/+5
| * Actually add the images.Kyle Horimoto2015-10-1411-0/+36
| * Change menu icons.Kyle Horimoto2015-10-142-32/+38
|/
* Merge pull request #284 from kruton/software-layerKenny Root2015-10-132-1/+14
|\
| * Move setting of hardware acceleration to view that needs itKenny Root2015-10-132-1/+14
|/
* Merge pull request #293 from rhansby/fix-disabled-paste-buttonJeremy Klein2015-10-132-4/+10
|\
| * Fix paste button being permanently disabled when clipboard was previously empty.Ryan Hansberry2015-10-132-4/+10
|/
* Merge pull request #291 from rhansby/show-actionbar-ontouchJeremy Klein2015-10-131-1/+1
|\
| * Show ActionBar when TerminalView is touched.Ryan Hansberry2015-10-131-1/+1
|/
* Merge pull request #279 from jklein24/pgsettingKenny Root2015-10-095-8/+56
|\
| * Rebase and fix conflicts with textview changeJeremy Klein2015-10-091-7/+35
| * Make the pg up/down gesture a preference which is disabled by default.Jeremy Klein2015-10-094-1/+21
|/
* Merge pull request #276 from jbcode42/masterKenny Root2015-10-081-3/+3
|\
| * Merge branch 'master' into masterJoel Blumen2015-10-0722-362/+1094
| |\
| * | Add IPv6 Host support to SSH.Joel Blumen2015-10-061-3/+3
* | | Merge pull request #283 from kruton/upgrade-checkstyleKenny Root2015-10-082-1/+6
|\ \ \
| * | | Update checkstyle and fix violationsKenny Root2015-10-082-1/+6
* | | | Merge pull request #282 from khorimoto/edit-host-activity-integrationKenny Root2015-10-088-26/+417
|\ \ \ \ | |/ / / |/| | |
| * | | Lint fixes.Kyle Horimoto2015-10-083-13/+13
| * | | Cleaned up code.Kyle Horimoto2015-10-082-6/+19
| * | | Integrate the EditHostActivity into the rest of the app.Kyle Horimoto2015-10-088-26/+404
* | | | Merge pull request #281 from jklein24/termmodeKenny Root2015-10-082-2/+2
|\ \ \ \
| * | | | Switch the default emulation mode to xterm-256colorJeremy Klein2015-10-072-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #280 from jklein24/mousemoderesetKenny Root2015-10-081-4/+16
|\ \ \ \
| * | | | Add a missing break;Jeremy Klein2015-10-071-0/+1
| * | | | Clean up comments and logsJeremy Klein2015-10-071-6/+3
| * | | | Partial implementation of DCESAVE for mouse reportingJeremy Klein2015-10-071-1/+15
| |/ / /
* | | | Merge pull request #277 from rhansby/textview-terminal-2Kenny Root2015-10-087-373/+581
|\ \ \ \ | |/ / / |/| | |
| * | | TerminalView: create instance variable for vt320 buffer, instead of constantl...Ryan Hansberry2015-10-071-13/+15
| * | | Annotate TerminalView#onTouchEventRyan Hansberry2015-10-071-0/+3
| * | | TerminalView: only call refreshTextFromBuffer on an ACTION_DOWN.Ryan Hansberry2015-10-071-9/+5
| * | | Removed unused import in ConsoleActivity.Ryan Hansberry2015-10-071-1/+0
| * | | Move old copying logic to TerminalView. Add comments to TerminalView.Ryan Hansberry2015-10-072-125/+120