aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into volume-seekbarJohn Heroy2015-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-2143-408/+961
|\ \
| * | 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
| | * | jlklein comment.Kyle Horimoto2015-10-212-2/+4
| | * | Lint and jlklein comments.Kyle Horimoto2015-10-214-21/+57
| | * | Polish UI for add/edit host.Kyle Horimoto2015-10-215-349/+718
| | |/
| | * Merge pull request #305 from khorimoto/save-dialogKenny Root2015-10-218-12/+65
| | |\
| | | * Lint.Kyle Horimoto2015-10-211-2/+0
| | | * Add save dialog and adjust icons.Kyle Horimoto2015-10-218-12/+67
| * | | Merge remote-tracking branch 'upstream/master'John Heroy2015-10-211-5/+10
| |\| |
| | * | Save the last selected Uri in onSaveInstanceState.Jeremy Klein2015-10-201-3/+3
| | * | Scroll to the previously selected view asynchronously.Jeremy Klein2015-10-201-2/+7
| | |/
* | | Ignore private resource linter warning in volume pref dalog XMLJohn Heroy2015-10-211-4/+6
* | | Remove margin on SeekBar and move up super.onBindDialogView to top of VolumeP...John Heroy2015-10-212-8/+6
* | | Add content description to volume pref dialog ImageView and reset padding on ...John Heroy2015-10-212-0/+5
* | | Add newline at end of volume preference dialog layout XML file.John Heroy2015-10-201-1/+1
* | | Use volume icon in 'bell volume' dialog and factor out SeekBar declaration to...John Heroy2015-10-202-16/+58
* | | Add volume up material icon for bell volume dialogJohn Heroy2015-10-205-0/+0
|/ /
* / Set more padding on volume pref SeekBar for Lollipop and aboveJohn Heroy2015-10-201-1/+8
|/
* Align host list status icon to left sideJohn Heroy2015-10-161-8/+8
* Prevent a cursor being displayed within terminal text.Ryan Hansberry2015-10-151-1/+2
* 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
* 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
* 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
* Move setting of hardware acceleration to view that needs itKenny Root2015-10-132-1/+14
* Fix paste button being permanently disabled when clipboard was previously empty.Ryan Hansberry2015-10-132-4/+10
* Show ActionBar when TerminalView is touched.Ryan Hansberry2015-10-131-1/+1
* 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-081-1/+1
|\ \ \
| * | | Update checkstyle and fix violationsKenny Root2015-10-081-1/+1
* | | | 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