diff options
Diffstat (limited to 'server')
53 files changed, 139 insertions, 136 deletions
diff --git a/server/api/controller/category.go b/server/api/controller/category.go index 5cf88bd..13a7438 100644 --- a/server/api/controller/category.go +++ b/server/api/controller/category.go @@ -7,8 +7,8 @@ package api import ( "errors" - "github.com/miniflux/miniflux2/server/api/payload" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/server/api/payload" + "github.com/miniflux/miniflux/server/core" ) // CreateCategory is the API handler to create a new category. diff --git a/server/api/controller/controller.go b/server/api/controller/controller.go index 629d71a..c9798e3 100644 --- a/server/api/controller/controller.go +++ b/server/api/controller/controller.go @@ -5,8 +5,8 @@ package api import ( - "github.com/miniflux/miniflux2/reader/feed" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/reader/feed" + "github.com/miniflux/miniflux/storage" ) // Controller holds all handlers for the API. diff --git a/server/api/controller/entry.go b/server/api/controller/entry.go index b09cc8c..6d6ab7e 100644 --- a/server/api/controller/entry.go +++ b/server/api/controller/entry.go @@ -7,9 +7,9 @@ package api import ( "errors" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/api/payload" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/api/payload" + "github.com/miniflux/miniflux/server/core" ) // GetEntry is the API handler to get a single feed entry. diff --git a/server/api/controller/feed.go b/server/api/controller/feed.go index 6016e57..f0212c9 100644 --- a/server/api/controller/feed.go +++ b/server/api/controller/feed.go @@ -7,8 +7,8 @@ package api import ( "errors" - "github.com/miniflux/miniflux2/server/api/payload" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/server/api/payload" + "github.com/miniflux/miniflux/server/core" ) // CreateFeed is the API handler to create a new feed. diff --git a/server/api/controller/subscription.go b/server/api/controller/subscription.go index b3d6272..aa2a26f 100644 --- a/server/api/controller/subscription.go +++ b/server/api/controller/subscription.go @@ -7,9 +7,10 @@ package api import ( "errors" "fmt" - "github.com/miniflux/miniflux2/reader/subscription" - "github.com/miniflux/miniflux2/server/api/payload" - "github.com/miniflux/miniflux2/server/core" + + "github.com/miniflux/miniflux/reader/subscription" + "github.com/miniflux/miniflux/server/api/payload" + "github.com/miniflux/miniflux/server/core" ) // GetSubscriptions is the API handler to find subscriptions. diff --git a/server/api/controller/user.go b/server/api/controller/user.go index fcf24b6..8ca7fd2 100644 --- a/server/api/controller/user.go +++ b/server/api/controller/user.go @@ -7,8 +7,8 @@ package api import ( "errors" - "github.com/miniflux/miniflux2/server/api/payload" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/server/api/payload" + "github.com/miniflux/miniflux/server/core" ) // CreateUser is the API handler to create a new user. diff --git a/server/api/payload/payload.go b/server/api/payload/payload.go index 310ba05..cb382a1 100644 --- a/server/api/payload/payload.go +++ b/server/api/payload/payload.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/model" ) // EntriesResponse represents the response sent when fetching entries. diff --git a/server/core/context.go b/server/core/context.go index 393060d..0f064fe 100644 --- a/server/core/context.go +++ b/server/core/context.go @@ -8,10 +8,10 @@ import ( "log" "net/http" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/middleware" - "github.com/miniflux/miniflux2/server/route" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/middleware" + "github.com/miniflux/miniflux/server/route" + "github.com/miniflux/miniflux/storage" "github.com/gorilla/mux" ) diff --git a/server/core/handler.go b/server/core/handler.go index db6204a..809282e 100644 --- a/server/core/handler.go +++ b/server/core/handler.go @@ -9,11 +9,11 @@ import ( "net/http" "time" - "github.com/miniflux/miniflux2/helper" - "github.com/miniflux/miniflux2/locale" - "github.com/miniflux/miniflux2/server/middleware" - "github.com/miniflux/miniflux2/server/template" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/helper" + "github.com/miniflux/miniflux/locale" + "github.com/miniflux/miniflux/server/middleware" + "github.com/miniflux/miniflux/server/template" + "github.com/miniflux/miniflux/storage" "github.com/gorilla/mux" ) diff --git a/server/core/html_response.go b/server/core/html_response.go index 52b5145..1b29ee8 100644 --- a/server/core/html_response.go +++ b/server/core/html_response.go @@ -8,7 +8,7 @@ import ( "log" "net/http" - "github.com/miniflux/miniflux2/server/template" + "github.com/miniflux/miniflux/server/template" ) // HTMLResponse handles HTML responses. diff --git a/server/core/response.go b/server/core/response.go index 70050a1..9fb4367 100644 --- a/server/core/response.go +++ b/server/core/response.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/miniflux/miniflux2/server/template" + "github.com/miniflux/miniflux/server/template" ) // Response handles HTTP responses. diff --git a/server/fever/fever.go b/server/fever/fever.go index a54562e..b84813f 100644 --- a/server/fever/fever.go +++ b/server/fever/fever.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/miniflux/miniflux2/integration" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/integration" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/storage" ) type baseResponse struct { diff --git a/server/middleware/basic_auth.go b/server/middleware/basic_auth.go index 3ad5318..887acc0 100644 --- a/server/middleware/basic_auth.go +++ b/server/middleware/basic_auth.go @@ -9,7 +9,7 @@ import ( "log" "net/http" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/storage" ) // BasicAuthMiddleware is the middleware for HTTP Basic authentication. diff --git a/server/middleware/fever.go b/server/middleware/fever.go index d864390..7334d3d 100644 --- a/server/middleware/fever.go +++ b/server/middleware/fever.go @@ -9,7 +9,7 @@ import ( "log" "net/http" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/storage" ) // FeverMiddleware is the middleware that handles Fever API. diff --git a/server/middleware/session.go b/server/middleware/session.go index e857c1f..2ef7151 100644 --- a/server/middleware/session.go +++ b/server/middleware/session.go @@ -9,9 +9,9 @@ import ( "log" "net/http" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/route" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/route" + "github.com/miniflux/miniflux/storage" "github.com/gorilla/mux" ) diff --git a/server/middleware/token.go b/server/middleware/token.go index e250633..5b24606 100644 --- a/server/middleware/token.go +++ b/server/middleware/token.go @@ -9,8 +9,8 @@ import ( "log" "net/http" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/storage" ) // TokenMiddleware represents a token middleware. diff --git a/server/routes.go b/server/routes.go index 2549e0f..7a2fdd9 100644 --- a/server/routes.go +++ b/server/routes.go @@ -7,19 +7,19 @@ package server import ( "net/http" - "github.com/miniflux/miniflux2/scheduler" - - "github.com/miniflux/miniflux2/config" - "github.com/miniflux/miniflux2/locale" - "github.com/miniflux/miniflux2/reader/feed" - "github.com/miniflux/miniflux2/reader/opml" - api_controller "github.com/miniflux/miniflux2/server/api/controller" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/fever" - "github.com/miniflux/miniflux2/server/middleware" - "github.com/miniflux/miniflux2/server/template" - ui_controller "github.com/miniflux/miniflux2/server/ui/controller" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/scheduler" + + "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/locale" + "github.com/miniflux/miniflux/reader/feed" + "github.com/miniflux/miniflux/reader/opml" + api_controller "github.com/miniflux/miniflux/server/api/controller" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/fever" + "github.com/miniflux/miniflux/server/middleware" + "github.com/miniflux/miniflux/server/template" + ui_controller "github.com/miniflux/miniflux/server/ui/controller" + "github.com/miniflux/miniflux/storage" "github.com/gorilla/mux" ) diff --git a/server/server.go b/server/server.go index 0f2533d..7072fdc 100644 --- a/server/server.go +++ b/server/server.go @@ -11,12 +11,12 @@ import ( "time" "github.com/gorilla/mux" - "github.com/miniflux/miniflux2/scheduler" + "github.com/miniflux/miniflux/scheduler" "golang.org/x/crypto/acme/autocert" - "github.com/miniflux/miniflux2/config" - "github.com/miniflux/miniflux2/reader/feed" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/reader/feed" + "github.com/miniflux/miniflux/storage" ) // NewServer returns a new HTTP server. diff --git a/server/static/bin.go b/server/static/bin.go index adf4461..fa5dd4e 100644 --- a/server/static/bin.go +++ b/server/static/bin.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-11 22:04:47.832384663 -0800 PST m=+0.014706233 +// 2017-12-12 21:44:02.652999925 -0800 PST m=+0.007410628 package static diff --git a/server/static/css.go b/server/static/css.go index 91db7b9..8c19d78 100644 --- a/server/static/css.go +++ b/server/static/css.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-11 22:04:47.835872498 -0800 PST m=+0.018194068 +// 2017-12-12 21:44:02.654843418 -0800 PST m=+0.009254121 package static diff --git a/server/static/js.go b/server/static/js.go index e77a8aa..4f21d2f 100644 --- a/server/static/js.go +++ b/server/static/js.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-11 22:04:47.840119593 -0800 PST m=+0.022441163 +// 2017-12-12 21:44:02.656535482 -0800 PST m=+0.010946185 package static diff --git a/server/template/common.go b/server/template/common.go index 1a2b948..8380d82 100644 --- a/server/template/common.go +++ b/server/template/common.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-12 19:14:08.437349475 -0800 PST m=+0.019432121 +// 2017-12-12 21:44:02.670455816 -0800 PST m=+0.024866519 package template diff --git a/server/template/helper/elapsed.go b/server/template/helper/elapsed.go index bc31206..df6fcdd 100644 --- a/server/template/helper/elapsed.go +++ b/server/template/helper/elapsed.go @@ -5,9 +5,10 @@ package helper import ( - "github.com/miniflux/miniflux2/locale" "math" "time" + + "github.com/miniflux/miniflux/locale" ) // Texts to be translated if necessary. diff --git a/server/template/helper/elapsed_test.go b/server/template/helper/elapsed_test.go index 67b8d6b..d65f84f 100644 --- a/server/template/helper/elapsed_test.go +++ b/server/template/helper/elapsed_test.go @@ -6,9 +6,10 @@ package helper import ( "fmt" - "github.com/miniflux/miniflux2/locale" "testing" "time" + + "github.com/miniflux/miniflux/locale" ) func TestElapsedTime(t *testing.T) { diff --git a/server/template/template.go b/server/template/template.go index 78b21cc..aa40aad 100644 --- a/server/template/template.go +++ b/server/template/template.go @@ -13,13 +13,13 @@ import ( "strings" "time" - "github.com/miniflux/miniflux2/config" - "github.com/miniflux/miniflux2/errors" - "github.com/miniflux/miniflux2/locale" - "github.com/miniflux/miniflux2/server/route" - "github.com/miniflux/miniflux2/server/template/helper" - "github.com/miniflux/miniflux2/server/ui/filter" - "github.com/miniflux/miniflux2/url" + "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/errors" + "github.com/miniflux/miniflux/locale" + "github.com/miniflux/miniflux/server/route" + "github.com/miniflux/miniflux/server/template/helper" + "github.com/miniflux/miniflux/server/ui/filter" + "github.com/miniflux/miniflux/url" "github.com/gorilla/mux" ) diff --git a/server/template/views.go b/server/template/views.go index 6206552..cb85c83 100644 --- a/server/template/views.go +++ b/server/template/views.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-12-12 19:14:08.427613446 -0800 PST m=+0.009696092 +// 2017-12-12 21:44:02.658745181 -0800 PST m=+0.013155884 package template diff --git a/server/ui/controller/about.go b/server/ui/controller/about.go index 0b1e4e4..d6bfc27 100644 --- a/server/ui/controller/about.go +++ b/server/ui/controller/about.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/version" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/version" ) // AboutPage shows the about page. diff --git a/server/ui/controller/category.go b/server/ui/controller/category.go index 75b7f90..747fca3 100644 --- a/server/ui/controller/category.go +++ b/server/ui/controller/category.go @@ -8,9 +8,9 @@ import ( "errors" "log" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/form" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/form" ) // ShowCategories shows the page with all categories. diff --git a/server/ui/controller/controller.go b/server/ui/controller/controller.go index a8f5218..cfecf42 100644 --- a/server/ui/controller/controller.go +++ b/server/ui/controller/controller.go @@ -5,13 +5,13 @@ package controller import ( - "github.com/miniflux/miniflux2/config" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/feed" - "github.com/miniflux/miniflux2/reader/opml" - "github.com/miniflux/miniflux2/scheduler" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/reader/feed" + "github.com/miniflux/miniflux/reader/opml" + "github.com/miniflux/miniflux/scheduler" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/storage" ) type tplParams map[string]interface{} diff --git a/server/ui/controller/entry.go b/server/ui/controller/entry.go index bfbfa70..0873dc7 100644 --- a/server/ui/controller/entry.go +++ b/server/ui/controller/entry.go @@ -8,14 +8,14 @@ import ( "errors" "log" - "github.com/miniflux/miniflux2/reader/sanitizer" - - "github.com/miniflux/miniflux2/integration" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/scraper" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/payload" - "github.com/miniflux/miniflux2/storage" + "github.com/miniflux/miniflux/reader/sanitizer" + + "github.com/miniflux/miniflux/integration" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/reader/scraper" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/payload" + "github.com/miniflux/miniflux/storage" ) // FetchContent downloads the original HTML page and returns relevant contents. diff --git a/server/ui/controller/feed.go b/server/ui/controller/feed.go index c20c121..3bb7131 100644 --- a/server/ui/controller/feed.go +++ b/server/ui/controller/feed.go @@ -8,9 +8,9 @@ import ( "errors" "log" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/form" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/form" ) // RefreshAllFeeds refresh all feeds in the background. diff --git a/server/ui/controller/history.go b/server/ui/controller/history.go index 1052517..cadc65e 100644 --- a/server/ui/controller/history.go +++ b/server/ui/controller/history.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" ) // ShowHistoryPage renders the page with all read entries. diff --git a/server/ui/controller/icon.go b/server/ui/controller/icon.go index 4f9f247..f5ff1db 100644 --- a/server/ui/controller/icon.go +++ b/server/ui/controller/icon.go @@ -7,7 +7,7 @@ package controller import ( "time" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/server/core" ) // ShowIcon shows the feed icon. diff --git a/server/ui/controller/integrations.go b/server/ui/controller/integrations.go index 2035817..babcfb7 100644 --- a/server/ui/controller/integrations.go +++ b/server/ui/controller/integrations.go @@ -8,8 +8,8 @@ import ( "crypto/md5" "fmt" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/form" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/form" ) // ShowIntegrations renders the page with all external integrations. diff --git a/server/ui/controller/login.go b/server/ui/controller/login.go index 2571f6e..d4f0f9c 100644 --- a/server/ui/controller/login.go +++ b/server/ui/controller/login.go @@ -9,8 +9,8 @@ import ( "net/http" "time" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/form" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/form" "github.com/tomasen/realip" ) diff --git a/server/ui/controller/oauth2.go b/server/ui/controller/oauth2.go index 2ed928c..fdac30d 100644 --- a/server/ui/controller/oauth2.go +++ b/server/ui/controller/oauth2.go @@ -8,10 +8,10 @@ import ( "log" "net/http" - "github.com/miniflux/miniflux2/config" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/oauth2" + "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/oauth2" "github.com/tomasen/realip" ) diff --git a/server/ui/controller/opml.go b/server/ui/controller/opml.go index ebde622..cf0e685 100644 --- a/server/ui/controller/opml.go +++ b/server/ui/controller/opml.go @@ -7,7 +7,7 @@ package controller import ( "log" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/server/core" ) // Export generates the OPML file. diff --git a/server/ui/controller/proxy.go b/server/ui/controller/proxy.go index fca3c0f..6c85bc2 100644 --- a/server/ui/controller/proxy.go +++ b/server/ui/controller/proxy.go @@ -11,9 +11,9 @@ import ( "log" "time" - "github.com/miniflux/miniflux2/helper" - "github.com/miniflux/miniflux2/http" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/helper" + "github.com/miniflux/miniflux/http" + "github.com/miniflux/miniflux/server/core" ) // ImageProxy fetch an image from a remote server and sent it back to the browser. diff --git a/server/ui/controller/session.go b/server/ui/controller/session.go index ee0c75a..447e47a 100644 --- a/server/ui/controller/session.go +++ b/server/ui/controller/session.go @@ -7,7 +7,7 @@ package controller import ( "log" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/server/core" ) // ShowSessions shows the list of active sessions. diff --git a/server/ui/controller/settings.go b/server/ui/controller/settings.go index a951e5d..7011378 100644 --- a/server/ui/controller/settings.go +++ b/server/ui/controller/settings.go @@ -7,10 +7,10 @@ package controller import ( "log" - "github.com/miniflux/miniflux2/locale" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/form" + "github.com/miniflux/miniflux/locale" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/form" ) // ShowSettings shows the settings page. diff --git a/server/ui/controller/static.go b/server/ui/controller/static.go index ae46815..2113808 100644 --- a/server/ui/controller/static.go +++ b/server/ui/controller/static.go @@ -9,8 +9,8 @@ import ( "log" "time" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/static" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/static" ) // Stylesheet renders the CSS. diff --git a/server/ui/controller/subscription.go b/server/ui/controller/subscription.go index 754ec42..362856a 100644 --- a/server/ui/controller/subscription.go +++ b/server/ui/controller/subscription.go @@ -7,10 +7,10 @@ package controller import ( "log" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/reader/subscription" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/form" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/reader/subscription" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/form" ) // Bookmarklet prefill the form to add a subscription from the URL provided by the bookmarklet. diff --git a/server/ui/controller/unread.go b/server/ui/controller/unread.go index 2c6be4b..87faafc 100644 --- a/server/ui/controller/unread.go +++ b/server/ui/controller/unread.go @@ -5,8 +5,8 @@ package controller import ( - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" ) // ShowUnreadPage render the page with all unread entries. diff --git a/server/ui/controller/user.go b/server/ui/controller/user.go index 0d1fbb2..8401958 100644 --- a/server/ui/controller/user.go +++ b/server/ui/controller/user.go @@ -8,9 +8,9 @@ import ( "errors" "log" - "github.com/miniflux/miniflux2/model" - "github.com/miniflux/miniflux2/server/core" - "github.com/miniflux/miniflux2/server/ui/form" + "github.com/miniflux/miniflux/model" + "github.com/miniflux/miniflux/server/core" + "github.com/miniflux/miniflux/server/ui/form" ) // ShowUsers shows the list of users. diff --git a/server/ui/filter/image_proxy_filter.go b/server/ui/filter/image_proxy_filter.go index 08f0300..1b200a4 100644 --- a/server/ui/filter/image_proxy_filter.go +++ b/server/ui/filter/image_proxy_filter.go @@ -8,8 +8,8 @@ import ( "encoding/base64" "strings" - "github.com/miniflux/miniflux2/server/route" - "github.com/miniflux/miniflux2/url" + "github.com/miniflux/miniflux/server/route" + "github.com/miniflux/miniflux/url" "github.com/PuerkitoBio/goquery" "github.com/gorilla/mux" diff --git a/server/ui/form/auth.go b/server/ui/form/auth.go index 6849339..c18a0be 100644 --- a/server/ui/form/auth.go +++ b/server/ui/form/auth.go @@ -7,7 +7,7 @@ package form import ( "net/http" - "github.com/miniflux/miniflux2/errors" + "github.com/miniflux/miniflux/errors" ) // AuthForm represents the authentication form. diff --git a/server/ui/form/category.go b/server/ui/form/category.go index f977b7a..31b7196 100644 --- a/server/ui/form/category.go +++ b/server/ui/form/category.go @@ -7,8 +7,8 @@ package form import ( "net/http" - "github.com/miniflux/miniflux2/errors" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/errors" + "github.com/miniflux/miniflux/model" ) // CategoryForm represents a feed form in the UI diff --git a/server/ui/form/feed.go b/server/ui/form/feed.go index 5d52d87..896a6d7 100644 --- a/server/ui/form/feed.go +++ b/server/ui/form/feed.go @@ -8,8 +8,8 @@ import ( "net/http" "strconv" - "github.com/miniflux/miniflux2/errors" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/errors" + "github.com/miniflux/miniflux/model" ) // FeedForm represents a feed form in the UI diff --git a/server/ui/form/integration.go b/server/ui/form/integration.go index bd32403..209b842 100644 --- a/server/ui/form/integration.go +++ b/server/ui/form/integration.go @@ -7,7 +7,7 @@ package form import ( "net/http" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/model" ) // IntegrationForm represents user integration settings form. diff --git a/server/ui/form/settings.go b/server/ui/form/settings.go index 2ebaa6d..e5f6939 100644 --- a/server/ui/form/settings.go +++ b/server/ui/form/settings.go @@ -7,8 +7,8 @@ package form import ( "net/http" - "github.com/miniflux/miniflux2/errors" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/errors" + "github.com/miniflux/miniflux/model" ) // SettingsForm represents the settings form. diff --git a/server/ui/form/subscription.go b/server/ui/form/subscription.go index 6385b18..7d2caaf 100644 --- a/server/ui/form/subscription.go +++ b/server/ui/form/subscription.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "github.com/miniflux/miniflux2/errors" + "github.com/miniflux/miniflux/errors" ) // SubscriptionForm represents the subscription form. diff --git a/server/ui/form/user.go b/server/ui/form/user.go index 5319cb8..8b8346e 100644 --- a/server/ui/form/user.go +++ b/server/ui/form/user.go @@ -7,8 +7,8 @@ package form import ( "net/http" - "github.com/miniflux/miniflux2/errors" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/errors" + "github.com/miniflux/miniflux/model" ) // UserForm represents the user form. diff --git a/server/ui/payload/payload.go b/server/ui/payload/payload.go index 7312fb2..d91e34a 100644 --- a/server/ui/payload/payload.go +++ b/server/ui/payload/payload.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "github.com/miniflux/miniflux2/model" + "github.com/miniflux/miniflux/model" ) // DecodeEntryStatusPayload unserialize JSON request to update entry statuses. |