aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Spaces -> tabs.Kyle Horimoto2015-09-181-3/+3
* Cleanup.Kyle Horimoto2015-09-181-5/+2
* Add FAB to host list.Kyle Horimoto2015-09-1810-78/+179
* Merge pull request #220 from kruton/dependency-variablesKenny Root2015-09-181-9/+15
|\
| * Use variables to set the dependency versionsKenny Root2015-09-181-9/+15
* | Merge pull request #221 from kruton/tests-fixupKenny Root2015-09-182-4/+5
|\ \ | |/ |/|
| * Use action bar open action in tests instead of menu keyKenny Root2015-09-181-1/+2
| * Make test matches a bit more descriptiveKenny Root2015-09-181-3/+3
|/
* Merge pull request #218 from khorimoto/fix-testsKenny Root2015-09-184-63/+93
|\
| * Fix StartupTest tests to work with RecyclerView.Kyle Horimoto2015-09-174-63/+93
* | Merge pull request #205 from rhansby/use-switches-not-checkboxesKenny Root2015-09-187-28/+420
|\ \
| * | Moved SwitchCompatPreference to util package for consistency with other custo...Ryan Hansberry2015-09-173-18/+20
| * | Merge branch 'master' into use-switches-not-checkboxesRyan Hansberry2015-09-177-189/+218
| |\|
| * | Make APIv14 and above use SwitchPreference, and below use custom SwitchCompat...Ryan Hansberry2015-09-174-45/+333
| * | Added SwitchCompat switches to Host Preferences.Ryan Hansberry2015-09-161-0/+4
| * | Switched to using SwitchCompat instead of PreferenceSwitch in order to suppor...Ryan Hansberry2015-09-154-13/+111
| * | Changed Settings options to use switches instead of checkboxes.Ryan Hansberry2015-09-151-13/+13
* | | Merge pull request #216 from rhansby/replace-pubkey-iconsKenny Root2015-09-1814-6/+5
|\ \ \ | |_|/ |/| |
| * | Switch all pubkey icon references to new icons.Ryan Hansberry2015-09-171-3/+3
| * | Replaced old pubkey lock/unlock icons with new Material Design icons.Ryan Hansberry2015-09-1713-3/+2
|/ /
* | Merge pull request #215 from khorimoto/fix-buildKenny Root2015-09-172-28/+4
|\ \
| * | Use AppCompatActivity instead of Activity.Kyle Horimoto2015-09-172-28/+4
|/ /
* | Merge pull request #213 from kruton/revert-app-compat-activityKenny Root2015-09-171-2/+2
|\ \
| * | Revert "Extend AppCompatActivity instead of Activity."Kenny Root2015-09-171-2/+2
|/ /
* | Merge pull request #209 from kruton/sshlib-updateKenny Root2015-09-171-1/+1
|\ \
| * | Update to version of sshlib that uses a smaller SOCKS libraryKenny Root2015-09-161-1/+1
| |/
* | Merge pull request #206 from khorimoto/recycler-viewKenny Root2015-09-176-162/+215
|\ \ | |/ |/|
| * Extend AppCompatActivity instead of Activity.Kyle Horimoto2015-09-161-3/+2
| * Removed unnecessary imports.Kyle Horimoto2015-09-161-3/+0
| * Clean up code.Kyle Horimoto2015-09-151-15/+21
| * Adjusted style to support pre-v11 devices.Kyle Horimoto2015-09-153-1/+8
| * Convert to using RecyclerView.Kyle Horimoto2015-09-144-157/+201
|/
* Merge pull request #204 from kruton/local-close-shellKenny Root2015-09-141-15/+22
|\
| * Kill shell process after exiting local transportKenny Root2015-09-141-15/+22
|/
* Merge pull request #203 from kruton/known-host-promptingKenny Root2015-09-142-28/+14
|\
| * Add a bit more debugging for saving a known hostKenny Root2015-09-141-4/+6
| * Remove hostkey and hostkeyalgo from HostBeanKenny Root2015-09-141-22/+0
| * Wrap saving a known host in a transactionKenny Root2015-09-141-3/+9
|/
* Merge pull request #195 from kruton/database-refactorKenny Root2015-09-1118-438/+479
|\
| * Fix merge error in PubkeyListActivityKenny Root2015-09-111-5/+0
| * Remove unused importsKenny Root2015-09-112-3/+0
| * Merge branch 'master' into database-refactorKenny Root2015-09-119-62/+132
| |\
| * | Rename the "red" host test entry to be more uniqueKenny Root2015-09-111-3/+3
| * | Try to add workaround for Espresso test raceKenny Root2015-09-111-1/+41
| * | Switch TerminalBridge over to ColorStorage and HostStorageKenny Root2015-09-116-11/+15
| * | Call saveHost instead of specialized updateFontSizeKenny Root2015-09-112-27/+8
| * | Switch ColorActivity to ColorStorage interfaceKenny Root2015-09-111-1/+2
| * | Add interfaces for HostStorage and ColorStorageKenny Root2015-09-113-1/+123
| * | Change colors list to primitive arrayKenny Root2015-09-113-12/+12
| * | Revert "Never cache instances of the HostDatabase"Kenny Root2015-09-118-48/+80