aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Change getColor call that crashes on pre-APIv14Ryan Hansberry2015-09-241-3/+3
* Only use pubkey if it is not nullKenny Root2015-09-231-4/+3
* Only use host if it is not nullKenny Root2015-09-231-8/+9
* Add padding to bottom of HostList to prevent FAB covering list.Ryan Hansberry2015-09-231-0/+4
* Fix app name in launcher being 'Hosts'Ryan Hansberry2015-09-231-1/+1
* Make HostListActivity use intended title 'Hosts'.Ryan Hansberry2015-09-231-0/+1
* Give color to action button in GeneratePubkeyActivity.Ryan Hansberry2015-09-231-2/+9
* Merge pull request #239 from rhansby/convert-generatepubkey-to-appcompatJeremy Klein2015-09-231-2/+2
|\
| * Convert GeneratePubkeyActivity to AppCompatActivity.Ryan Hansberry2015-09-231-2/+2
* | Update translationsKenny Root2015-09-223-0/+26
* | Merge pull request #223 from rhansby/fix-missing-pref-summariesJeremy Klein2015-09-221-1/+2
|\ \
| * | Fix missing summaries for SwitchPreferences in host editing list.Ryan Hansberry2015-09-221-1/+2
| |/
* | Merge pull request #233 from rhansby/new-connection-status-iconsJeremy Klein2015-09-2216-3/+3
|\ \
| * | Add Material Design HostList status indicator iconsRyan Hansberry2015-09-2216-3/+3
* | | Fix empty host list blurb. (in English only)Ryan Hansberry2015-09-221-1/+1
| |/ |/|
* | Fix style issues.Ryan Hansberry2015-09-222-3/+2
* | Merge branch 'master' into convert-activities-to-appcompatRyan Hansberry2015-09-2211-80/+178
|\|
| * Disable tests until new "add host" activity has been completed.Kyle Horimoto2015-09-181-4/+4
| * 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
* | Convert PubkeyListActivity, PortFowardListActivity, and HostListActivity to A...Ryan Hansberry2015-09-225-668/+646
* | Convert SettingsActivity and HostEditorActivity to AppCompat.Ryan Hansberry2015-09-213-4/+136
* | Convert ColorsActivity to AppCompat ActivityRyan Hansberry2015-09-211-2/+2
* | Convert HelpActivity to AppCompatActivity.Ryan Hansberry2015-09-211-2/+2
* | Convert HelpTopicActivity and EulaActivity to AppCompatActivity.Ryan Hansberry2015-09-213-5/+5
* | Convert PubkeyListActivity to AppCompatRyan Hansberry2015-09-183-222/+321
|/
* 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
* | 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
* | | 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
| |/ |/|
* | Use AppCompatActivity instead of Activity.Kyle Horimoto2015-09-172-28/+4
* | 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
| |/
* | 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