aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'John Heroy2015-10-218-16/+63
|\
| * 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 branch 'master' into volume-seekbarJohn Heroy2015-10-2146-467/+1020
| | |\
| | * | 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
| | * | Merge branch 'master' into volume-seekbarJohn Heroy2015-10-211-1/+1
| | |\ \
| | * | | 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
* | | | | Merge remote-tracking branch 'upstream/master'John 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' 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
| | * | | 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-215-65/+70
|\| | | | |_|/ |/| |
| * | Merge pull request #309 from kruton/lint-xqillaKenny Root2015-10-213-59/+59
| |\ \
| | * | Change check-lint-results.bash indentationKenny Root2015-10-211-10/+10
| | * | Quote all files in check-lint-results.bashKenny Root2015-10-211-9/+9
| | * | Rename check-lint-count.sh to .bashKenny Root2015-10-212-2/+2
| | * | Better lint output for Travis-CIKenny Root2015-10-212-15/+15
| | |/
| * | Merge pull request #307 from jklein24/scrolljankKenny Root2015-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
| |/
| * Merge pull request #306 from rhansby/fix-fab-api-10Kenny Root2015-10-201-1/+1
| |\
| | * Update from Support Library 23.0.1 to 23.1.0. This also fixes background issu...Ryan Hansberry2015-10-201-1/+1
| |/
* / Set more padding on volume pref SeekBar for Lollipop and aboveJohn Heroy2015-10-201-1/+8
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-14 21:02:47 +0000