Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into add-host-button2 | John Heroy | 2015-10-27 | 7 | -22/+40 |
|\ | |||||
| * | Merge branch 'master' into canceldialog | John Heroy | 2015-10-27 | 12 | -12/+119 |
| |\ | |||||
| * | | Refactor all uses of framework AlertDialog to use v7 support version instead ↵ | John Heroy | 2015-10-26 | 5 | -21/+33 |
| | | | | | | | | | | | | with AlertDialogTheme instead | ||||
| * | | Construct app compat alert dialog builder with AlertDialogTheme | John Heroy | 2015-10-26 | 1 | -1/+1 |
| | | | |||||
| * | | Add AlertDialogTheme to styles.xml | John Heroy | 2015-10-26 | 1 | -0/+6 |
| | | | |||||
* | | | Revert "Replace add icon with vector drawable" | John Heroy | 2015-10-27 | 6 | -9/+0 |
| | | | | | | | | | | | | This reverts commit 0b6b263a39e6fca13cf7b76685b5e5f225c23be4. | ||||
* | | | Merge branch 'master' into add-host-button2 | John Heroy | 2015-10-27 | 12 | -12/+119 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' into add-icons | Kyle Horimoto | 2015-10-26 | 12 | -0/+18 |
| |\| | |||||
| * | | Use SVG instead of PNG. | Kyle Horimoto | 2015-10-26 | 66 | -0/+99 |
| | | | |||||
| * | | Fixed more lint errors. | Kyle Horimoto | 2015-10-26 | 5 | -0/+0 |
| | | | |||||
| * | | Rebased. | Kyle Horimoto | 2015-10-26 | 6 | -1/+1 |
| | | | |||||
| * | | Lint. | Kyle Horimoto | 2015-10-26 | 16 | -1/+1 |
| | | | |||||
| * | | Added new icons to add/edit host view. | Kyle Horimoto | 2015-10-26 | 71 | -12/+20 |
| | | | |||||
* | | | Use android:tint for styling the 'add host' FAB's icon instead of ↵ | John Heroy | 2015-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | android:tintMode, which is only supported in APIs 21+ | ||||
* | | | Add android:tintMode with value 'src_atop' to 'add host' FAB | John Heroy | 2015-10-26 | 1 | -0/+1 |
| | | | |||||
* | | | Replace add icon with vector drawable | John Heroy | 2015-10-26 | 6 | -0/+9 |
| |/ |/| | |||||
* | | Merge branch 'master' into publickeys-icon | John Heroy | 2015-10-26 | 42 | -181/+0 |
|\| | |||||
| * | Remove all translations of deleted strings | Jeremy Klein | 2015-10-26 | 40 | -73/+0 |
| | | |||||
| * | remove unused strings. | Jeremy Klein | 2015-10-23 | 1 | -7/+0 |
| | | |||||
| * | Remove unused imports | Jeremy Klein | 2015-10-23 | 1 | -8/+0 |
| | | |||||
| * | Remove unused add host dialog from HostListActivity. | Jeremy Klein | 2015-10-23 | 1 | -93/+0 |
| | | |||||
* | | Remove use of <group> tag in vector assets, instead import svg with Android ↵ | John Heroy | 2015-10-26 | 2 | -22/+14 |
| | | | | | | | | Studio context menu | ||||
* | | Refactor 'folder open' and 'add box' icons to use Android vectors instead of png | John Heroy | 2015-10-23 | 12 | -0/+26 |
| | | |||||
* | | Change 'add box' and 'folder open' icons to white versions for better ↵ | John Heroy | 2015-10-23 | 10 | -0/+0 |
|/ | | | | contrast in public keys toolbar | ||||
* | Restore TerminalBridge.promptHelper.setHandler() in onServiceConnected() | alescdb | 2015-10-23 | 1 | -0/+4 |
| | |||||
* | Call MediaPlayer.seekTo() before MediaPlayer.start() | alescdb | 2015-10-23 | 1 | -9/+4 |
| | |||||
* | Update to buildtools v23.0.1 | alescdb | 2015-10-23 | 1 | -1/+1 |
| | |||||
* | Don't display a nickname field when protocol is 'local.' | Kyle Horimoto | 2015-10-22 | 2 | -1/+8 |
| | |||||
* | Restore app.iml | alescdb | 2015-10-22 | 1 | -51/+53 |
| | |||||
* | Merge branch 'master' into key-vectors | Alex | 2015-10-22 | 2 | -0/+6 |
|\ | |||||
| * | Merge branch 'master' into fontsizeslider | John Heroy | 2015-10-22 | 45 | -409/+0 |
| |\ | |||||
| * | | Add comments explaining requestFocus and clearFocus method calls | John Heroy | 2015-10-21 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into fontsizeslider | John Heroy | 2015-10-21 | 8 | -16/+63 |
| |\ \ | |||||
| * | | | Programmatically request focus on quick connect container and set ↵ | John Heroy | 2015-10-21 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | LinearLayout to android:focusable='true' | ||||
| * | | | Clear focus away from font size EditText when seekbar value changes so that ↵ | John Heroy | 2015-10-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | the text can update | ||||
| * | | | Merge remote-tracking branch 'upstream/master' | John Heroy | 2015-10-21 | 3 | -41/+55 |
| |\ \ \ | |||||
* | | | | | Remove unused resource button_key_tab | alescdb | 2015-10-22 | 5 | -58/+52 |
| | | | | | |||||
* | | | | | Remove unused button_key_tab | Alex | 2015-10-22 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Update inc_keyboard.xml | Alex | 2015-10-22 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Replace unicode keys by vector drawable | alescdb | 2015-10-22 | 14 | -42/+92 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #314 from kruton/translations-import | Kenny Root | 2015-10-21 | 45 | -409/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Translations import | ||||
| * | | | Import translations | Kenny Root | 2015-10-21 | 44 | -390/+0 |
| | | | | |||||
| * | | | Remove unused strings | Kenny Root | 2015-10-21 | 1 | -19/+0 |
| | | | | |||||
* | | | | Merge branch 'master' into volume-seekbar | John Heroy | 2015-10-21 | 3 | -41/+55 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Use the ListItemIcon style on HostList and PubkeyList icons. | Ryan Hansberry | 2015-10-21 | 2 | -12/+3 |
| | | | | |||||
| * | | | Style port forward and pubkey list like the host list. | Ryan Hansberry | 2015-10-21 | 2 | -34/+57 |
| |/ / | |||||
* | | | Merge branch 'master' into volume-seekbar | John Heroy | 2015-10-21 | 43 | -408/+961 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of https://github.com/connectbot/connectbot | John Heroy | 2015-10-21 | 42 | -403/+951 |
| |\| | |||||
| | * | Merge pull request #310 from kruton/translations-import | Kenny Root | 2015-10-21 | 28 | -34/+122 |
| | |\ | | | | | | | | | Import translations | ||||
| | | * | Import translations | Kenny Root | 2015-10-21 | 28 | -34/+122 |
| | | | |