From 52226ad2351dd2d3bd4191c1d9cb7cc43939a8d7 Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Sun, 19 Aug 2018 21:14:52 -0600 Subject: 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. --- system/db/content.go | 2 +- system/db/upload.go | 2 +- system/item/item.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'system') 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" ) -- cgit v1.2.3