Skip to content
Permalink
Browse files

More friendly token, updated dependencies and other stuff

  • Loading branch information...
Depado committed Oct 5, 2018
1 parent 6cc3f74 commit ffb85182b42cd76349e4ff110ccfee3685c0d9b9
Showing with 130 additions and 57 deletions.
  1. +2 −1 .gitignore
  2. +79 −41 Gopkg.lock
  3. +41 −10 Gopkg.toml
  4. +6 −2 server/assets/style.css
  5. +1 −1 server/database/database.go
  6. +1 −1 server/models/initialize.go
  7. +0 −1 server/templates/index.html
@@ -3,7 +3,8 @@ client/client*
client/misc/
client/testfiles/
server/my.db
server/goploader.db
server/*.back
server/*.db
server/up/
server/server
server/conf.yml

Some generated files are not rendered by default. Learn more.

@@ -1,10 +1,41 @@
# Gopkg.toml example
#
# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true


[[constraint]]
branch = "master"
name = "github.com/GeertJohan/go.rice"

[[constraint]]
branch = "master"
name = "github.com/asdine/storm"
version = "2.1.2"

[[constraint]]
name = "github.com/atotto/clipboard"
version = "0.1.0"

[[constraint]]
name = "github.com/boltdb/bolt"
@@ -16,23 +47,23 @@

[[constraint]]
name = "github.com/fatih/color"
version = "1.5.0"
version = "1.7.0"

[[constraint]]
branch = "master"
name = "github.com/gin-gonic/contrib"

[[constraint]]
name = "github.com/gin-gonic/gin"
version = "1.2.0"
version = "1.3.0"

[[constraint]]
name = "github.com/imdario/mergo"
version = "0.2.2"
version = "0.3.6"

[[constraint]]
branch = "master"
name = "github.com/mitchellh/go-homedir"
version = "1.0.0"

[[constraint]]
name = "github.com/ogier/pflag"
@@ -44,12 +75,12 @@

[[constraint]]
name = "gopkg.in/cheggaaa/pb.v1"
version = "1.0.18"
version = "1.0.25"

[[constraint]]
branch = "v2"
name = "gopkg.in/yaml.v2"
version = "2.2.1"

[[constraint]]
name = "github.com/asdine/storm"
version = "1.1.0"
[prune]
go-tests = true
unused-packages = true
@@ -176,10 +176,14 @@ img {
/* Sections
// –––––––––––––––––––––––––––––––––––––––––––––––––– */

input[type="password"] {
text-align: center;
}

.container {
/*border-top: .1rem solid #d1d1d1;*/
padding-top: 7.5rem;
padding-bottom: 7.5rem;
padding-top: 3rem;
padding-bottom: 3rem;
margin-bottom: 0;
max-width: 80.0rem;
}
@@ -4,7 +4,7 @@ import (
"time"

"github.com/asdine/storm"
"github.com/boltdb/bolt"
"go.etcd.io/bbolt"

"github.com/Depado/goploader/server/conf"
)
@@ -5,7 +5,7 @@ import (
"fmt"

"github.com/asdine/storm"
"github.com/boltdb/bolt"
"go.etcd.io/bbolt"

"github.com/Depado/goploader/server/database"
"github.com/Depado/goploader/server/logger"
@@ -66,7 +66,6 @@ <h2>&nbsp;</h2>
{{ if .token }}
<div class="row">
<div class="column">
<label for="token">Upload Token</label>
<input id="token" type="password" name="token" placeholder="This site requires a token to upload">
</div>
</div>

0 comments on commit ffb8518

Please sign in to comment.
You can’t perform that action at this time.