aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into keyboard-always-visibleAlex2015-10-2612-0/+18
|\
| * Merge pull request #331 from johnheroy/publickeys-iconJeremy Klein2015-10-2612-0/+18
| |\
| | * Merge branch 'master' into publickeys-iconJohn Heroy2015-10-2642-181/+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
* | | Better context for translatorsAlex2015-10-261-1/+1
* | | Better context for translatorsAlex2015-10-261-1/+1
* | | Merge branch 'master' into keyboard-always-visibleAlex2015-10-2642-181/+0
|\| |
| * | Merge pull request #329 from jklein24/unuseddialogJeremy Klein2015-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
| |/
* | Extra tabs removedalescdb2015-10-241-1/+1
* | Restore (unused) ns in string.xlmalescdb2015-10-241-1/+2
* | Resource context & french translationalescdb2015-10-242-2/+4
* | Restore imports orderalescdb2015-10-241-14/+13
* | Update ConsoleActivity.javaAlex2015-10-241-3/+0
* | 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