summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorSteve Manuel <nilslice@gmail.com>2018-08-19 21:14:52 -0600
committerGitHub <noreply@github.com>2018-08-19 21:14:52 -0600
commit52226ad2351dd2d3bd4191c1d9cb7cc43939a8d7 (patch)
tree894ce306d79dbfd6d950d8bac852d1350d2b6e04 /system
parent83d740d8437d6cd55ad5ac8e3a293221c24260df (diff)
admin richtext updates, uuid package migration (#269)
* update CI code to run --dev if on ponzu-dev branch * CI: ensure we have latest from ponzu-dev branch * Replaced satori/go.uuid with gofrs/uuid. (#268) * Changed files to use new uuid pkg. * Replace satori/go.uuid with gofrs/uuid. Closes #257. * Deleted satori/go.uuid folder. Closes #257. * Added heading styles and table to richtext toolbar. (#267) Closes #207. * Override Cobra's 'help' command to remove duplicate. (#266) Closes #206.
Diffstat (limited to 'system')
-rw-r--r--system/db/content.go2
-rw-r--r--system/db/upload.go2
-rw-r--r--system/item/item.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/system/db/content.go b/system/db/content.go
index b96852e..43d6023 100644
--- a/system/db/content.go
+++ b/system/db/content.go
@@ -16,8 +16,8 @@ import (
"github.com/ponzu-cms/ponzu/system/search"
"github.com/boltdb/bolt"
+ "github.com/gofrs/uuid"
"github.com/gorilla/schema"
- uuid "github.com/satori/go.uuid"
)
// IsValidID checks that an ID from a DB target is valid.
diff --git a/system/db/upload.go b/system/db/upload.go
index b7171dd..2311ef0 100644
--- a/system/db/upload.go
+++ b/system/db/upload.go
@@ -14,8 +14,8 @@ import (
"github.com/ponzu-cms/ponzu/system/item"
"github.com/boltdb/bolt"
+ "github.com/gofrs/uuid"
"github.com/gorilla/schema"
- uuid "github.com/satori/go.uuid"
)
// SetUpload stores information about files uploaded to the system
diff --git a/system/item/item.go b/system/item/item.go
index beace09..32d38f7 100644
--- a/system/item/item.go
+++ b/system/item/item.go
@@ -12,7 +12,7 @@ import (
"github.com/blevesearch/bleve"
"github.com/blevesearch/bleve/mapping"
- uuid "github.com/satori/go.uuid"
+ "github.com/gofrs/uuid"
"golang.org/x/text/transform"
"golang.org/x/text/unicode/norm"
)