aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into canceldialogJohn Heroy2015-10-2712-12/+119
|\
| * Merge branch 'master' into add-iconsKyle Horimoto2015-10-2612-0/+18
| |\
| * | Use SVG instead of PNG.Kyle Horimoto2015-10-2666-0/+99
| * | Fixed more lint errors.Kyle Horimoto2015-10-265-0/+0
| * | Rebased.Kyle Horimoto2015-10-266-1/+1
| * | Lint.Kyle Horimoto2015-10-2616-1/+1
| * | Added new icons to add/edit host view.Kyle Horimoto2015-10-2671-12/+20
* | | Refactor all uses of framework AlertDialog to use v7 support version instead ...John Heroy2015-10-265-21/+33
* | | Construct app compat alert dialog builder with AlertDialogThemeJohn Heroy2015-10-261-1/+1
* | | Add AlertDialogTheme to styles.xmlJohn Heroy2015-10-261-0/+6
| |/ |/|
* | Merge branch 'master' into publickeys-iconJohn Heroy2015-10-2642-181/+0
|\|
| * Remove all translations of deleted stringsJeremy Klein2015-10-2640-73/+0
| * remove unused strings.Jeremy Klein2015-10-231-7/+0
| * Remove unused importsJeremy Klein2015-10-231-8/+0
| * Remove unused add host dialog from HostListActivity.Jeremy Klein2015-10-231-93/+0
* | Remove use of <group> tag in vector assets, instead import svg with Android S...John Heroy2015-10-262-22/+14
* | Refactor 'folder open' and 'add box' icons to use Android vectors instead of pngJohn Heroy2015-10-2312-0/+26
* | Change 'add box' and 'folder open' icons to white versions for better contras...John Heroy2015-10-2310-0/+0
|/
* Restore TerminalBridge.promptHelper.setHandler() in onServiceConnected()alescdb2015-10-231-0/+4
* Call MediaPlayer.seekTo() before MediaPlayer.start()alescdb2015-10-231-9/+4
* Don't display a nickname field when protocol is 'local.'Kyle Horimoto2015-10-222-1/+8
* Merge branch 'master' into key-vectorsAlex2015-10-222-0/+6
|\
| * Merge branch 'master' into fontsizesliderJohn Heroy2015-10-2245-409/+0
| |\
| * | Add comments explaining requestFocus and clearFocus method callsJohn Heroy2015-10-211-0/+2
| * | Merge branch 'master' into fontsizesliderJohn 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-224-5/+1
* | | | | Remove unused button_key_tabAlex2015-10-221-2/+0
* | | | | Update inc_keyboard.xmlAlex2015-10-221-1/+2
* | | | | Replace unicode keys by vector drawablealescdb2015-10-2213-41/+91
| |_|_|/ |/| | |
* | | | 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 07:51:56 +0000