Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only use host if it is not null | Kenny Root | 2015-09-23 | 1 | -8/+9 |
| | | | | | Since we null check the host, we should make sure not to dereference it later on. | ||||
* | Merge pull request #248 from kruton/coverity-scan-fix | Kenny Root | 2015-09-23 | 1 | -2/+2 |
|\ | | | | | Make sure we clean after the coverity run | ||||
| * | Make sure we clean after the coverity run | Kenny Root | 2015-09-23 | 1 | -2/+2 |
|/ | | | | | | If we try to test during the coverity scan, we get strange errors from the build system. Also, it seems to pollute the next non-coverity build, so make sure Travis cleans before trying to build again. | ||||
* | Merge pull request #246 from rhansby/awkward-fab-workaround | Jeremy Klein | 2015-09-23 | 1 | -0/+4 |
|\ | | | | | Add padding to bottom of HostList to prevent FAB covering list. | ||||
| * | Add padding to bottom of HostList to prevent FAB covering list. | Ryan Hansberry | 2015-09-23 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #211 from khorimoto/fix-tabs | Kenny Root | 2015-09-23 | 1 | -11/+10 |
|\ | | | | | Use 4 spaces per tab instead of 8. | ||||
| * | Use tabs by default, but keep them at 4/8 characters. | Kyle Horimoto | 2015-09-18 | 1 | -0/+26 |
| | | |||||
| * | Use 4 spaces per tab instead of 8. | Kyle Horimoto | 2015-09-18 | 1 | -27/+0 |
| | | |||||
* | | Merge pull request #245 from rhansby/fix-incorrect-launcher-appname | Kenny Root | 2015-09-23 | 1 | -1/+1 |
|\ \ | | | | | | | Fix app name in launcher being 'Hosts' | ||||
| * | | Fix app name in launcher being 'Hosts' | Ryan Hansberry | 2015-09-23 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #243 from rhansby/use-correct-hostlist-title | Jeremy Klein | 2015-09-23 | 1 | -0/+1 |
|\ \ | | | | | | | Make HostListActivity use intended title 'Hosts'. | ||||
| * | | Make HostListActivity use intended title 'Hosts'. | Ryan Hansberry | 2015-09-23 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #238 from rhansby/color-pubkey-generate-button | Jeremy Klein | 2015-09-23 | 1 | -2/+9 |
|\ \ | | | | | | | Give color to action button in GeneratePubkeyActivity. | ||||
| * | | Give color to action button in GeneratePubkeyActivity. | Ryan Hansberry | 2015-09-23 | 1 | -2/+9 |
|/ / | |||||
* | | Merge pull request #239 from rhansby/convert-generatepubkey-to-appcompat | Jeremy Klein | 2015-09-23 | 1 | -2/+2 |
|\ \ | | | | | | | Convert GeneratePubkeyActivity to AppCompatActivity. | ||||
| * | | Convert GeneratePubkeyActivity to AppCompatActivity. | Ryan Hansberry | 2015-09-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #237 from kruton/translations | Kenny Root | 2015-09-22 | 3 | -0/+26 |
|\ \ \ | | | | | | | | | Update translations | ||||
| * | | | Update translations | Kenny Root | 2015-09-22 | 3 | -0/+26 |
|/ / / | |||||
* | | | Merge pull request #223 from rhansby/fix-missing-pref-summaries | Jeremy Klein | 2015-09-22 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Fix missing summaries for SwitchPreferences in host editing list. | ||||
| * | | | Fix missing summaries for SwitchPreferences in host editing list. | Ryan Hansberry | 2015-09-22 | 1 | -1/+2 |
| |/ / | | | | | | | | | | Fixes #222 | ||||
* | | | Merge pull request #233 from rhansby/new-connection-status-icons | Jeremy Klein | 2015-09-22 | 16 | -3/+3 |
|\ \ \ | | | | | | | | | Add Material Design HostList status indicator icons | ||||
| * | | | Add Material Design HostList status indicator icons | Ryan Hansberry | 2015-09-22 | 16 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #234 from rhansby/fix-empty-hostlist-blurb | Jeremy Klein | 2015-09-22 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix empty host list blurb. (in English only) | ||||
| * | | | Fix empty host list blurb. (in English only) | Ryan Hansberry | 2015-09-22 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #230 from rhansby/convert-activities-to-appcompat | Kenny Root | 2015-09-22 | 14 | -696/+904 |
|\ \ \ | |/ / |/| | | Convert Activities to AppCompat | ||||
| * | | Fix style issues. | Ryan Hansberry | 2015-09-22 | 2 | -3/+2 |
| | | | |||||
| * | | Merge branch 'master' into convert-activities-to-appcompat | Ryan Hansberry | 2015-09-22 | 11 | -80/+178 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #219 from khorimoto/fab-host-list | Kenny Root | 2015-09-21 | 11 | -80/+178 |
|\ \ \ | |_|/ |/| | | Use FloatingActionButton to add new hosts to the host list. | ||||
| * | | Disable tests until new "add host" activity has been completed. | Kyle Horimoto | 2015-09-18 | 1 | -4/+4 |
| | | | |||||
| * | | Spaces -> tabs. | Kyle Horimoto | 2015-09-18 | 1 | -3/+3 |
| | | | |||||
| * | | Cleanup. | Kyle Horimoto | 2015-09-18 | 1 | -5/+2 |
| | | | |||||
| * | | Add FAB to host list. | Kyle Horimoto | 2015-09-18 | 10 | -78/+179 |
|/ / | |||||
| * | Convert PubkeyListActivity, PortFowardListActivity, and HostListActivity to ↵ | Ryan Hansberry | 2015-09-22 | 5 | -668/+646 |
| | | | | | | | | AppCompat, using AppCompatListActivity superclass | ||||
| * | Convert SettingsActivity and HostEditorActivity to AppCompat. | Ryan Hansberry | 2015-09-21 | 3 | -4/+136 |
| | | |||||
| * | Convert ColorsActivity to AppCompat Activity | Ryan Hansberry | 2015-09-21 | 1 | -2/+2 |
| | | |||||
| * | Convert HelpActivity to AppCompatActivity. | Ryan Hansberry | 2015-09-21 | 1 | -2/+2 |
| | | |||||
| * | Convert HelpTopicActivity and EulaActivity to AppCompatActivity. | Ryan Hansberry | 2015-09-21 | 3 | -5/+5 |
| | | |||||
| * | Convert PubkeyListActivity to AppCompat | Ryan Hansberry | 2015-09-18 | 3 | -222/+321 |
|/ | |||||
* | Merge pull request #220 from kruton/dependency-variables | Kenny Root | 2015-09-18 | 1 | -9/+15 |
|\ | | | | | Use variables to set the dependency versions | ||||
| * | Use variables to set the dependency versions | Kenny Root | 2015-09-18 | 1 | -9/+15 |
| | | |||||
* | | Merge pull request #221 from kruton/tests-fixup | Kenny Root | 2015-09-18 | 2 | -4/+5 |
|\ \ | |/ |/| | Tests fixup to make instrumentation tests a bit more reliable | ||||
| * | Use action bar open action in tests instead of menu key | Kenny Root | 2015-09-18 | 1 | -1/+2 |
| | | |||||
| * | Make test matches a bit more descriptive | Kenny Root | 2015-09-18 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #218 from khorimoto/fix-tests | Kenny Root | 2015-09-18 | 4 | -63/+93 |
|\ | | | | | Fix StartupTest tests to work with RecyclerView. | ||||
| * | Fix StartupTest tests to work with RecyclerView. | Kyle Horimoto | 2015-09-17 | 4 | -63/+93 |
| | | |||||
* | | Merge pull request #205 from rhansby/use-switches-not-checkboxes | Kenny Root | 2015-09-18 | 7 | -28/+420 |
|\ \ | | | | | | | Changed Settings options to use switches instead of checkboxes. | ||||
| * | | Moved SwitchCompatPreference to util package for consistency with other ↵ | Ryan Hansberry | 2015-09-17 | 3 | -18/+20 |
| | | | | | | | | | | | | custom Preferences. | ||||
| * | | Merge branch 'master' into use-switches-not-checkboxes | Ryan Hansberry | 2015-09-17 | 7 | -189/+218 |
| |\| | |||||
| * | | Make APIv14 and above use SwitchPreference, and below use custom ↵ | Ryan Hansberry | 2015-09-17 | 4 | -45/+333 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SwitchCompatPreference. Created API-v14-and-above preferences.xml and host_prefs.xml files (under xml-v14/) in order to do so. This unfortunately for the most part duplicates preferences.xml and host_prefs.xml. This method is an effective workaround for the visual glitch encountered earlier, as recorded here: https://github.com/connectbot/connectbot/pull/205#issuecomment-140547689 | ||||
| * | | Added SwitchCompat switches to Host Preferences. | Ryan Hansberry | 2015-09-16 | 1 | -0/+4 |
| | | |