aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #257 from khorimoto/fix-xml-tabJeremy Klein2015-09-241-1/+2
|\
| * Change "continuation indent" tab to only 4 spaces.Kyle Horimoto2015-09-241-1/+2
|/
* Merge pull request #255 from rhansby/fix-pubkey-generation-crash-2Jeremy Klein2015-09-241-3/+3
|\
| * Change getColor call that crashes on pre-APIv14Ryan Hansberry2015-09-241-3/+3
|/
* Merge pull request #251 from kruton/host-maybe-nullKenny Root2015-09-232-12/+12
|\
| * 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
|/
* Merge pull request #248 from kruton/coverity-scan-fixKenny Root2015-09-231-2/+2
|\
| * Make sure we clean after the coverity runKenny Root2015-09-231-2/+2
|/
* Merge pull request #246 from rhansby/awkward-fab-workaroundJeremy Klein2015-09-231-0/+4
|\
| * Add padding to bottom of HostList to prevent FAB covering list.Ryan Hansberry2015-09-231-0/+4
|/
* Merge pull request #211 from khorimoto/fix-tabsKenny Root2015-09-231-11/+10
|\
| * Use tabs by default, but keep them at 4/8 characters.Kyle Horimoto2015-09-181-0/+26
| * Use 4 spaces per tab instead of 8.Kyle Horimoto2015-09-181-27/+0
* | Merge pull request #245 from rhansby/fix-incorrect-launcher-appnameKenny Root2015-09-231-1/+1
|\ \
| * | Fix app name in launcher being 'Hosts'Ryan Hansberry2015-09-231-1/+1
|/ /
* | Merge pull request #243 from rhansby/use-correct-hostlist-titleJeremy Klein2015-09-231-0/+1
|\ \
| * | Make HostListActivity use intended title 'Hosts'.Ryan Hansberry2015-09-231-0/+1
|/ /
* | Merge pull request #238 from rhansby/color-pubkey-generate-buttonJeremy Klein2015-09-231-2/+9
|\ \
| * | 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
* | | Merge pull request #237 from kruton/translationsKenny Root2015-09-223-0/+26
|\ \ \
| * | | 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
* | | | Merge pull request #234 from rhansby/fix-empty-hostlist-blurbJeremy Klein2015-09-221-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix empty host list blurb. (in English only)Ryan Hansberry2015-09-221-1/+1
|/ / /
* | | Merge pull request #230 from rhansby/convert-activities-to-appcompatKenny Root2015-09-2214-696/+904
|\ \ \ | |/ / |/| |
| * | Fix style issues.Ryan Hansberry2015-09-222-3/+2
| * | Merge branch 'master' into convert-activities-to-appcompatRyan Hansberry2015-09-2211-80/+178
| |\ \ | |/ / |/| |
* | | Merge pull request #219 from khorimoto/fab-host-listKenny Root2015-09-2111-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
* | 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
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 18:34:08 +0000