cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gophish/gophish 

Resolved conflicts in templates/docs.html
pull/91/head
Jordan Wright 2016-01-11 22:30:27 -06:00
parent 6ffbb7b5f8 70e24f4d8c
commit 38082f0498
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,4 +1,4 @@
![gophish logo](https://raw.github.com/jordan-wright/gophish/master/static/images/gophish_purple.png) ![gophish logo](https://raw.github.com/gophish/gophish/master/static/images/gophish_purple.png)
gophish gophish
======= =======
@ -34,7 +34,7 @@ Documentation is a work in progress. Existing documentation can be found on our
###Issues ###Issues
Find a bug? Want more features? Find something missing in the documentation? Let us know! Please don't hesitate to [file an issue](https://github.com/jordan-wright/gophish/issues/new) and we'll get right on it. Find a bug? Want more features? Find something missing in the documentation? Let us know! Please don't hesitate to [file an issue](https://github.com/gophish/gophish/issues/new) and we'll get right on it.
###License ###License
``` ```

8
controllers/api.go
View File

@ -14,10 +14,10 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/jordan-wright/email" "github.com/jordan-wright/email"
"github.com/jordan-wright/gophish/auth" "github.com/gophish/gophish/auth"
"github.com/jordan-wright/gophish/models" "github.com/gophish/gophish/models"
"github.com/jordan-wright/gophish/util" "github.com/gophish/gophish/util"
"github.com/jordan-wright/gophish/worker" "github.com/gophish/gophish/worker"
) )
// Worker is the worker that processes phishing events and updates campaigns. // Worker is the worker that processes phishing events and updates campaigns.

4
controllers/api_test.go
View File

@ -10,8 +10,8 @@ import (
"testing" "testing"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/jordan-wright/gophish/config" "github.com/gophish/gophish/config"
"github.com/jordan-wright/gophish/models" "github.com/gophish/gophish/models"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
) )

6
controllers/route.go
View File

@ -11,9 +11,9 @@ import (
ctx "github.com/gorilla/context" ctx "github.com/gorilla/context"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/gorilla/sessions" "github.com/gorilla/sessions"
"github.com/jordan-wright/gophish/auth" "github.com/gophish/gophish/auth"
mid "github.com/jordan-wright/gophish/middleware" mid "github.com/gophish/gophish/middleware"
"github.com/jordan-wright/gophish/models" "github.com/gophish/gophish/models"
"github.com/justinas/nosurf" "github.com/justinas/nosurf"
) )

6
gophish.go
View File

@ -32,9 +32,9 @@ import (
"os" "os"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/jordan-wright/gophish/config" "github.com/gophish/gophish/config"
"github.com/jordan-wright/gophish/controllers" "github.com/gophish/gophish/controllers"
"github.com/jordan-wright/gophish/models" "github.com/gophish/gophish/models"
) )
var Logger = log.New(os.Stdout, " ", log.Ldate|log.Ltime|log.Lshortfile) var Logger = log.New(os.Stdout, " ", log.Ldate|log.Ltime|log.Lshortfile)

4
middleware/middleware.go
View File

@ -6,8 +6,8 @@ import (
"net/http" "net/http"
ctx "github.com/gorilla/context" ctx "github.com/gorilla/context"
"github.com/jordan-wright/gophish/auth" "github.com/gophish/gophish/auth"
"github.com/jordan-wright/gophish/models" "github.com/gophish/gophish/models"
) )
// GetContext wraps each request in a function which fills in the context for a given request. // GetContext wraps each request in a function which fills in the context for a given request.

2
models/models.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/jordan-wright/gophish/config" "github.com/gophish/gophish/config"
_ "github.com/mattn/go-sqlite3" // Blank import needed to import sqlite3 _ "github.com/mattn/go-sqlite3" // Blank import needed to import sqlite3
) )

2
models/models_test.go
View File

@ -3,7 +3,7 @@ package models
import ( import (
"testing" "testing"
"github.com/jordan-wright/gophish/config" "github.com/gophish/gophish/config"
"gopkg.in/check.v1" "gopkg.in/check.v1"
) )

2
util/util.go
View File

@ -9,7 +9,7 @@ import (
"net/mail" "net/mail"
"github.com/jordan-wright/email" "github.com/jordan-wright/email"
"github.com/jordan-wright/gophish/models" "github.com/gophish/gophish/models"
) )
// ParseMail takes in an HTTP Request and returns an Email object // ParseMail takes in an HTTP Request and returns an Email object

2
worker/worker.go
View File

@ -10,7 +10,7 @@ import (
"text/template" "text/template"
"github.com/jordan-wright/email" "github.com/jordan-wright/email"
"github.com/jordan-wright/gophish/models" "github.com/gophish/gophish/models"
) )
// Logger is the logger for the worker // Logger is the logger for the worker