taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2026-03-26 00:22:21 -07:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Chris Cummer
2018-06-13 02:23:44 -07:00
committed by GitHub
parent 5c6f026db1 ab210fd040
commit 957214ff8b
115 changed files with 17052 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wtf.go
View File

@@ -21,8 +21,13 @@ import (
"github.com/senorprogrammer/wtf/gcal"
"github.com/senorprogrammer/wtf/git"
"github.com/senorprogrammer/wtf/github"
<<<<<<< HEAD
=======
"github.com/senorprogrammer/wtf/gitlab"
>>>>>>> dlom-gitlab
"github.com/senorprogrammer/wtf/gspreadsheets"
"github.com/senorprogrammer/wtf/help"
"github.com/senorprogrammer/wtf/ipapi"
"github.com/senorprogrammer/wtf/ipinfo"
"github.com/senorprogrammer/wtf/ipapi"
"github.com/senorprogrammer/wtf/jenkins"
@@ -192,8 +197,17 @@ func addWidget(app *tview.Application, pages *tview.Pages, widgetName string) {
Widgets = append(Widgets, git.NewWidget(app, pages))
case "github":
Widgets = append(Widgets, github.NewWidget(app, pages))
<<<<<<< HEAD
case "gspreadsheets":
Widgets = append(Widgets, gspreadsheets.NewWidget())
=======
case "gitlab":
Widgets = append(Widgets, gitlab.NewWidget(app, pages))
case "gspreadsheets":
Widgets = append(Widgets, gspreadsheets.NewWidget())
case "ipapi":
Widgets = append(Widgets, ipapi.NewWidget())
>>>>>>> dlom-gitlab
case "ipinfo":
Widgets = append(Widgets, ipinfo.NewWidget())
case "ipapi":
@@ -240,7 +254,13 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
gcal.Config = Config
git.Config = Config
github.Config = Config
<<<<<<< HEAD
gspreadsheets.Config = Config
=======
gitlab.Config = Config
gspreadsheets.Config = Config
ipapi.Config = Config
>>>>>>> dlom-gitlab
ipinfo.Config = Config
ipapi.Config = Config
jenkins.Config = Config