diff --git a/README.md b/README.md
index 7ccb847c29afc16174e28031dee8c9d5bab89206..81c425ae0c825b7b4beb0564aade6934b4c39b97 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
Miniflux 2
==========
-[](https://travis-ci.org/miniflux/miniflux2)
+[](https://travis-ci.org/miniflux/miniflux)
[](https://docs.miniflux.net/)
Miniflux is a minimalist and opinionated feed reader:
@@ -14,7 +14,7 @@ Miniflux is a minimalist and opinionated feed reader:
It's simple, fast, lightweight and super easy to install.
-Miniflux 2 is a rewrite of Miniflux 1.x in Golang.
+Miniflux 2 is a rewrite of [Miniflux 1.x](https://github.com/miniflux/miniflux-legacy) in Golang.
Notes
-----
diff --git a/errors/errors.go b/errors/errors.go
index a99a3ab514f7ac8cc783099bf4333713f906be37..71805ade369781dd2ea4f5fd39fa8218984bc0fd 100644
--- a/errors/errors.go
+++ b/errors/errors.go
@@ -7,7 +7,7 @@ package errors
import (
"fmt"
- "github.com/miniflux/miniflux2/locale"
+ "github.com/miniflux/miniflux/locale"
)
// LocalizedError represents an error than could be translated to another language.
diff --git a/http/client.go b/http/client.go
index 3b4488f9e7d6b36195c1a1a23319684ff8dd5243..602cdbd82753e478a90017038f92728416ef8d52 100644
--- a/http/client.go
+++ b/http/client.go
@@ -12,7 +12,7 @@ import (
"net/url"
"time"
- "github.com/miniflux/miniflux2/helper"
+ "github.com/miniflux/miniflux/helper"
)
const userAgent = "Miniflux <https://miniflux.net/>"
diff --git a/integration/instapaper/instapaper.go b/integration/instapaper/instapaper.go
index c484573aeb7fab242e5ea010113dffa754fb491c..51c5e05eb837e4ac75434a77510313dd118b05fe 100644
--- a/integration/instapaper/instapaper.go
+++ b/integration/instapaper/instapaper.go
@@ -8,7 +8,7 @@ import (
"fmt"
"net/url"
- "github.com/miniflux/miniflux2/http"
+ "github.com/miniflux/miniflux/http"
)
// Client represents an Instapaper client.
diff --git a/integration/integration.go b/integration/integration.go
index 074ce6d8718aa6fb65a54691cb608fb7de1457f6..0001235c4f2ce4081bc7941fff7e8a810b37aec3 100644
--- a/integration/integration.go
+++ b/integration/integration.go
@@ -7,9 +7,9 @@ package integration
import (
"log"
- "github.com/miniflux/miniflux2/integration/instapaper"
- "github.com/miniflux/miniflux2/integration/pinboard"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/integration/instapaper"
+ "github.com/miniflux/miniflux/integration/pinboard"
+ "github.com/miniflux/miniflux/model"
)
// SendEntry send the entry to the activated providers.
diff --git a/integration/pinboard/pinboard.go b/integration/pinboard/pinboard.go
index 7e33065215ce317faecb8bb4229a6c5aa8e5c202..2e1bbd745da4735848469174fc0b675c3938dff5 100644
--- a/integration/pinboard/pinboard.go
+++ b/integration/pinboard/pinboard.go
@@ -8,7 +8,7 @@ import (
"fmt"
"net/url"
- "github.com/miniflux/miniflux2/http"
+ "github.com/miniflux/miniflux/http"
)
// Client represents a Pinboard client.
diff --git a/locale/translations.go b/locale/translations.go
index a01a618fb6c3e75a210368b4279d57faba90263b..b2a920fed88175efbfadcf28efab49465c1af6a7 100644
--- a/locale/translations.go
+++ b/locale/translations.go
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
-// 2017-12-12 19:14:08.438401734 -0800 PST m=+0.020484380
+// 2017-12-12 21:44:02.672642313 -0800 PST m=+0.027053016
package locale
diff --git a/main.go b/main.go
index 6d7ebb314e65c6933bce05cda1ab3676421ed9b1..306ac64dbae94ecb910fd2f73b831ba24c8d7bc0 100644
--- a/main.go
+++ b/main.go
@@ -25,13 +25,13 @@ import (
"strings"
"time"
- "github.com/miniflux/miniflux2/config"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/feed"
- "github.com/miniflux/miniflux2/scheduler"
- "github.com/miniflux/miniflux2/server"
- "github.com/miniflux/miniflux2/storage"
- "github.com/miniflux/miniflux2/version"
+ "github.com/miniflux/miniflux/config"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/feed"
+ "github.com/miniflux/miniflux/scheduler"
+ "github.com/miniflux/miniflux/server"
+ "github.com/miniflux/miniflux/storage"
+ "github.com/miniflux/miniflux/version"
_ "github.com/lib/pq"
"golang.org/x/crypto/ssh/terminal"
diff --git a/miniflux-test b/miniflux-test
deleted file mode 100755
index 4f5d541f8f0b4ecd857c4faada36212e83bc1efa..0000000000000000000000000000000000000000
Binary files a/miniflux-test and /dev/null differ
diff --git a/model/theme.go b/model/theme.go
index 85307ce4d37a256a55f1daf361533156fd4e46a6..6b87ec846c228abfaffb6d7412f7c75408db0b95 100644
--- a/model/theme.go
+++ b/model/theme.go
@@ -4,7 +4,7 @@
package model
-import "github.com/miniflux/miniflux2/errors"
+import "github.com/miniflux/miniflux/errors"
// Themes returns the list of available themes.
func Themes() map[string]string {
diff --git a/reader/atom/atom.go b/reader/atom/atom.go
index b62f42ac4e6631903cee987943e938fe9b348f07..f72a150cec69ce1e88263f86ad978e4fdc181ab7 100644
--- a/reader/atom/atom.go
+++ b/reader/atom/atom.go
@@ -11,9 +11,9 @@ import (
"strings"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/date"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/date"
)
type atomFeed struct {
diff --git a/reader/atom/parser.go b/reader/atom/parser.go
index 04bfd0445beebda4449b88d4211f4f51d3daa084..8e83bc9dfa2b1eca4efffca8a56ccc01c9bb9929 100644
--- a/reader/atom/parser.go
+++ b/reader/atom/parser.go
@@ -8,8 +8,8 @@ import (
"encoding/xml"
"io"
- "github.com/miniflux/miniflux2/errors"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/errors"
+ "github.com/miniflux/miniflux/model"
"golang.org/x/net/html/charset"
)
diff --git a/reader/atom/parser_test.go b/reader/atom/parser_test.go
index d5eea23f3da333f6fc7231c1e63c6dad7c2ab2d8..66ca0f05a2efddfcdb184f8720e769e51365f7fe 100644
--- a/reader/atom/parser_test.go
+++ b/reader/atom/parser_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"time"
- "github.com/miniflux/miniflux2/errors"
+ "github.com/miniflux/miniflux/errors"
)
func TestParseAtomSample(t *testing.T) {
diff --git a/reader/feed/handler.go b/reader/feed/handler.go
index 6b946271245dea4d9b761a6121844ba6bc62332b..5926bbcbe777ff767771efa06e840de78ba9f601 100644
--- a/reader/feed/handler.go
+++ b/reader/feed/handler.go
@@ -9,13 +9,13 @@ import (
"log"
"time"
- "github.com/miniflux/miniflux2/errors"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/http"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/icon"
- "github.com/miniflux/miniflux2/reader/processor"
- "github.com/miniflux/miniflux2/storage"
+ "github.com/miniflux/miniflux/errors"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/http"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/icon"
+ "github.com/miniflux/miniflux/reader/processor"
+ "github.com/miniflux/miniflux/storage"
)
var (
diff --git a/reader/feed/parser.go b/reader/feed/parser.go
index a28cf2deff58dcc216046987578d2075ee801601..5f87708b887f662b14a012d79699d17fd6de1fc0 100644
--- a/reader/feed/parser.go
+++ b/reader/feed/parser.go
@@ -12,12 +12,12 @@ import (
"strings"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/atom"
- "github.com/miniflux/miniflux2/reader/json"
- "github.com/miniflux/miniflux2/reader/rdf"
- "github.com/miniflux/miniflux2/reader/rss"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/atom"
+ "github.com/miniflux/miniflux/reader/json"
+ "github.com/miniflux/miniflux/reader/rdf"
+ "github.com/miniflux/miniflux/reader/rss"
"golang.org/x/net/html/charset"
)
diff --git a/reader/icon/finder.go b/reader/icon/finder.go
index c5f9a07b3083213a3587bbfabf454623d0b774f1..2a5beb5e4c811f952ebd1655a6067a5fb42ae28f 100644
--- a/reader/icon/finder.go
+++ b/reader/icon/finder.go
@@ -10,10 +10,10 @@ import (
"io/ioutil"
"log"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/http"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/url"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/http"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/url"
"github.com/PuerkitoBio/goquery"
)
diff --git a/reader/json/json.go b/reader/json/json.go
index da6df2405d368f0cf4e50147b0bc9ce021baff19..59249163f81c31cfa141d2aa6025cbcc93cb73d2 100644
--- a/reader/json/json.go
+++ b/reader/json/json.go
@@ -9,10 +9,10 @@ import (
"strings"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/date"
- "github.com/miniflux/miniflux2/reader/sanitizer"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/date"
+ "github.com/miniflux/miniflux/reader/sanitizer"
)
type jsonFeed struct {
diff --git a/reader/json/parser.go b/reader/json/parser.go
index 18329e720e5775793a1c345a71bf591e00f6a344..52b4809a95099127051883aac0f11e11b147c900 100644
--- a/reader/json/parser.go
+++ b/reader/json/parser.go
@@ -8,8 +8,8 @@ import (
"encoding/json"
"io"
- "github.com/miniflux/miniflux2/errors"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/errors"
+ "github.com/miniflux/miniflux/model"
)
// Parse returns a normalized feed struct from a JON feed.
diff --git a/reader/json/parser_test.go b/reader/json/parser_test.go
index 60d7707b90f37f77011c393679d63fa12d92af2a..e6fa9ed56e64488f14e05262908d72b8b5a8d276 100644
--- a/reader/json/parser_test.go
+++ b/reader/json/parser_test.go
@@ -10,7 +10,7 @@ import (
"testing"
"time"
- "github.com/miniflux/miniflux2/errors"
+ "github.com/miniflux/miniflux/errors"
)
func TestParseJsonFeed(t *testing.T) {
diff --git a/reader/opml/handler.go b/reader/opml/handler.go
index 9d5fb0fd907a9c683a95602edded79b68b4b5f6f..192e04a3105ef03a4a215083b216280f011e024f 100644
--- a/reader/opml/handler.go
+++ b/reader/opml/handler.go
@@ -10,8 +10,8 @@ import (
"io"
"log"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/storage"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/storage"
)
// Handler handles the logic for OPML import/export.
diff --git a/reader/opml/parser.go b/reader/opml/parser.go
index 1b2e1e7ffe8a5035944faa0205436a1afe92a0fb..8d61aa84f96883a5685c2f18467b817681038117 100644
--- a/reader/opml/parser.go
+++ b/reader/opml/parser.go
@@ -8,7 +8,7 @@ import (
"encoding/xml"
"io"
- "github.com/miniflux/miniflux2/errors"
+ "github.com/miniflux/miniflux/errors"
"golang.org/x/net/html/charset"
)
diff --git a/reader/opml/parser_test.go b/reader/opml/parser_test.go
index 8d56df5ba587faebfcad33ee4db7bb8b325846bf..12c8048741978fc36fdb265cef2346429a6f1c38 100644
--- a/reader/opml/parser_test.go
+++ b/reader/opml/parser_test.go
@@ -8,7 +8,7 @@ import (
"bytes"
"testing"
- "github.com/miniflux/miniflux2/errors"
+ "github.com/miniflux/miniflux/errors"
)
func TestParseOpmlWithoutCategories(t *testing.T) {
diff --git a/reader/processor/processor.go b/reader/processor/processor.go
index 7cc5cb1cbd767900f5bdc150deda9967fb5b3cef..3cdefb01f4990fcae93c51e194bd7b398867c70e 100644
--- a/reader/processor/processor.go
+++ b/reader/processor/processor.go
@@ -7,10 +7,10 @@ package processor
import (
"log"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/rewrite"
- "github.com/miniflux/miniflux2/reader/sanitizer"
- "github.com/miniflux/miniflux2/reader/scraper"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/rewrite"
+ "github.com/miniflux/miniflux/reader/sanitizer"
+ "github.com/miniflux/miniflux/reader/scraper"
)
// FeedProcessor handles the processing of feed contents.
diff --git a/reader/rdf/parser.go b/reader/rdf/parser.go
index f854a97ba75f650670d69a9eebde64c3fdb20bfa..7bd30929ed3ababe38ac619b9a5e0a5de74362ca 100644
--- a/reader/rdf/parser.go
+++ b/reader/rdf/parser.go
@@ -8,8 +8,8 @@ import (
"encoding/xml"
"io"
- "github.com/miniflux/miniflux2/errors"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/errors"
+ "github.com/miniflux/miniflux/model"
"golang.org/x/net/html/charset"
)
diff --git a/reader/rdf/parser_test.go b/reader/rdf/parser_test.go
index bad3ed78ab5f6471860dd4eb702cc1b237ffa2c6..6447bf2e76cc0e75dba0a74043a4011bf4d8f87d 100644
--- a/reader/rdf/parser_test.go
+++ b/reader/rdf/parser_test.go
@@ -10,7 +10,7 @@ import (
"testing"
"time"
- "github.com/miniflux/miniflux2/errors"
+ "github.com/miniflux/miniflux/errors"
)
func TestParseRDFSample(t *testing.T) {
diff --git a/reader/rdf/rdf.go b/reader/rdf/rdf.go
index c97085fd78267dd590105ac4b0ddda585489e2f7..ad4d53a08fec4e41f1429edb2b1efa435c79f93f 100644
--- a/reader/rdf/rdf.go
+++ b/reader/rdf/rdf.go
@@ -9,9 +9,9 @@ import (
"strings"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/sanitizer"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/sanitizer"
)
type rdfFeed struct {
diff --git a/reader/rewrite/rewriter.go b/reader/rewrite/rewriter.go
index 0fcd166fa1a75719a6bcc7b03ba4e41d75eb38cb..d4d50969c629b0372c6294d560a50d0a99fd81d6 100644
--- a/reader/rewrite/rewriter.go
+++ b/reader/rewrite/rewriter.go
@@ -7,7 +7,7 @@ package rewrite
import (
"strings"
- "github.com/miniflux/miniflux2/url"
+ "github.com/miniflux/miniflux/url"
)
// Rewriter modify item contents with a set of rewriting rules.
diff --git a/reader/rss/parser.go b/reader/rss/parser.go
index a5b4434c7f02aaff08f82d7906af30e36cb6ef0d..0e9738af5dceb10c8a871d9f062b2a1802885914 100644
--- a/reader/rss/parser.go
+++ b/reader/rss/parser.go
@@ -8,8 +8,8 @@ import (
"encoding/xml"
"io"
- "github.com/miniflux/miniflux2/errors"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/errors"
+ "github.com/miniflux/miniflux/model"
"golang.org/x/net/html/charset"
)
diff --git a/reader/rss/parser_test.go b/reader/rss/parser_test.go
index 3abdd17576573af71db53f6a649c2654174adfa5..982d4f0b4873f4d2079bf93f4fddef682b8c00f9 100644
--- a/reader/rss/parser_test.go
+++ b/reader/rss/parser_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"time"
- "github.com/miniflux/miniflux2/errors"
+ "github.com/miniflux/miniflux/errors"
)
func TestParseRss2Sample(t *testing.T) {
diff --git a/reader/rss/rss.go b/reader/rss/rss.go
index e5800b698ad9882f4f13a0d3b2d652c5831f14e7..b80692c096c62adcf3e847d45efb41f61bb9075e 100644
--- a/reader/rss/rss.go
+++ b/reader/rss/rss.go
@@ -12,9 +12,9 @@ import (
"strings"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/date"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/date"
)
type rssFeed struct {
diff --git a/reader/sanitizer/sanitizer.go b/reader/sanitizer/sanitizer.go
index 49fb1cb29bb9ffc536217b4e023e9766b83f86b9..16f16244ce727aa077a258c4b29b9667671288d3 100644
--- a/reader/sanitizer/sanitizer.go
+++ b/reader/sanitizer/sanitizer.go
@@ -10,7 +10,7 @@ import (
"io"
"strings"
- "github.com/miniflux/miniflux2/url"
+ "github.com/miniflux/miniflux/url"
"golang.org/x/net/html"
)
diff --git a/reader/scraper/scraper.go b/reader/scraper/scraper.go
index e799ad04abc14852773e94ad5a00d1a504664f92..8f5ff159008ae5edcd9e09da285462da80dc5690 100644
--- a/reader/scraper/scraper.go
+++ b/reader/scraper/scraper.go
@@ -11,9 +11,9 @@ import (
"strings"
"github.com/PuerkitoBio/goquery"
- "github.com/miniflux/miniflux2/http"
- "github.com/miniflux/miniflux2/reader/readability"
- "github.com/miniflux/miniflux2/url"
+ "github.com/miniflux/miniflux/http"
+ "github.com/miniflux/miniflux/reader/readability"
+ "github.com/miniflux/miniflux/url"
)
// Fetch download a web page a returns relevant contents.
diff --git a/reader/subscription/finder.go b/reader/subscription/finder.go
index 239baf7eec68a9686d3679dc762767d982a0b3c4..2935b93d01e0819f0d28d9f3015aa1e73a3ef69c 100644
--- a/reader/subscription/finder.go
+++ b/reader/subscription/finder.go
@@ -11,11 +11,11 @@ import (
"log"
"time"
- "github.com/miniflux/miniflux2/errors"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/http"
- "github.com/miniflux/miniflux2/reader/feed"
- "github.com/miniflux/miniflux2/url"
+ "github.com/miniflux/miniflux/errors"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/http"
+ "github.com/miniflux/miniflux/reader/feed"
+ "github.com/miniflux/miniflux/url"
"github.com/PuerkitoBio/goquery"
)
diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go
index acfb401626d554e29428080194d93f7ef84b4d10..a1f1778ab247b707adb4761fdbbf359129e2c69d 100644
--- a/scheduler/scheduler.go
+++ b/scheduler/scheduler.go
@@ -8,7 +8,7 @@ import (
"log"
"time"
- "github.com/miniflux/miniflux2/storage"
+ "github.com/miniflux/miniflux/storage"
)
// NewScheduler starts a new scheduler that push jobs to a pool of workers.
diff --git a/scheduler/worker.go b/scheduler/worker.go
index 39382a3845921c15cb5efca7ea57188b764fd3ca..be130ca86cb0a5b9a820773b94c8934df2852476 100644
--- a/scheduler/worker.go
+++ b/scheduler/worker.go
@@ -5,13 +5,14 @@
package scheduler
import (
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/feed"
"log"
"time"
+
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/feed"
)
-// A Worker refresh a feed in the background.
+// Worker refreshes a feed in the background.
type Worker struct {
id int
feedHandler *feed.Handler
diff --git a/scheduler/worker_pool.go b/scheduler/worker_pool.go
index c4a837231ee861bf0ea83b5d25a2e3c6207e384e..1b9f08602c6a14972b6105573ae70ac0a9e65b6c 100644
--- a/scheduler/worker_pool.go
+++ b/scheduler/worker_pool.go
@@ -5,8 +5,8 @@
package scheduler
import (
- "github.com/miniflux/miniflux2/model"
- "github.com/miniflux/miniflux2/reader/feed"
+ "github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/feed"
)
// WorkerPool handle a pool of workers.
diff --git a/server/api/controller/category.go b/server/api/controller/category.go
index 5cf88bdcbe4e21f8ea96e3de31a4f013ec8dc814..13a7438e5bf17aedd7866bdfac4658d794f516d7 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 629d71acde7746354cb019a63698de32e8ebf68c..c9798e3c1b0c041fa41addff8b4c33100f01ad35 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 b09cc8c9df287674a6c39e7095edd1b143b1a12e..6d6ab7e09ce63184e9f4455d99c1287eb90d1c3e 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 6016e5787219ea938447e31576d6f28b54c906e2..f0212c9762d375d80feb77e06e209a86a28bcb3e 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 b3d62726542b4658ccaf43bc13e509c03d186d69..aa2a26f9c9ff0e17444b1251cb6d235986388bac 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 fcf24b626cbd0ecc18c95b80063d160c063c0be4..8ca7fd2c414d31bdc90385f9823c2ed564f7a146 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 310ba0500ad21f295ff52e90edb0427457b875f8..cb382a1a8127d3083c95218d371bfca73a008959 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 393060d3b42d0d3608442b545fc7ee70038b7e4d..0f064fe01a320c734bc5e4cf3b59efa91cff3380 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 db6204a950bbd739653706f6c5ffc2e99a59754e..809282ea9bf5814027541b68c9bc14649fad7e09 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 52b51454eea8705d8c09c748045bedd795560aaa..1b29ee85d8aa3285a27694dc17f12c53ce4461bf 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 70050a19d03f8341d78c849ea906bae81be7185b..9fb4367f41a4e03a714fa0fd1b1ea18b87817373 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 a54562efbe0257a7e2e45e2817ecb8a60912d55d..b84813f0cb807b19c8661f8d4ff1fc96756d58fd 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 3ad53181d5c9403bb868bdedd7648b284b09d26e..887acc0c57a8c56b456e8c837ba586e90e5fd091 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 d86439009c7d04f9909ab2caa731e1712bc23057..7334d3d22ef0f6e17e15e9dcecb53b79f9bdeeda 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 e857c1fceeda7d193377d819df5e3ba6116e82bf..2ef7151240c1703bce2481fab2090dd6c6a57492 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 e250633fe5eb18b511bb4a48cec5aa94e2f9d4c0..5b24606a57433effbd35f1a874dd1f346aa87ec9 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 2549e0f677f4d774e9205115800096bfa1f89e22..7a2fdd93b58ec1efc46a0b25c21d68e437f75672 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 0f2533dc3c5e27cdced98e844e3ffac4666ada08..7072fdc5734b57f83ef7375445f279709563af11 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 adf44615a0077fe27ceb1370cfbe1a1e0effa052..fa5dd4e0d2aa72c490abf3325e103b59bb92102e 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 91db7b90ce195dda31dca9e39b6c6b1e820d2866..8c19d78bc4f7cd11b1765352adbd1843a771522d 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 e77a8aa9520c362ca787c29df56c552e8ec8beca..4f21d2f056eb766e656dd117ac2c5c118e2a54ac 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 1a2b948ddbde0a30afe6f49e715224739466cdb9..8380d82037436aaffc1c685a9a6d3354798d5277 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 bc31206258342e2f5aa902d964c88db9f01dcb18..df6fcdd06280530af1c281ed11b03041072556d8 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 67b8d6b79e089cff006045a930ac8810cf48ed50..d65f84f57cafff36ffb4d4c84bc4e038b077f79b 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 78b21cc13706f5f14b46584f4b20223a9f0784db..aa40aad6e6d6ba665d4bb899cbb387d6eb765585 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 62065527f4958ed7630af211584ed596a64f9932..cb85c836dbf3b1d5103050813c75bfa62945dbf6 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 0b1e4e48ff16dee6b1b40682d0e3b9ab150a39f9..d6bfc279b7a452aa4bd68141e2ecabb0cbc6ed0f 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 75b7f90d4de50205eb8a408053982aa6ac0f8dd6..747fca3c10377bfd283e68a3b00dbda5687ae559 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 a8f5218b116ea08e361a9b5dd19da76193fdeafe..cfecf42d6122fa42548f7e2b32743a2389e45191 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 bfbfa705664b89a853215955c3c179c2b544df38..0873dc764d3f26ddebebff8d4a9eab75c72edef8 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 c20c1215a2085add3c8fae9f76f807264201fbce..3bb71313ec85d7e39fd639e540992b2bb01cef37 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 105251786d63ec207f384e43b8c47a79fedd78ae..cadc65ee57161429fd5660b50a248f63642b3de1 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 4f9f24733a0ce426550660c8ec6329447cb7a113..f5ff1db3af962bfcb7baff4d0343cbc8367a2574 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 2035817aca802dccef603ef6eb52392996faa122..babcfb74eaad0cd24269f05923a2b429a4848705 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 2571f6efa6a999ce823221d0a63860dfbd8cfa72..d4f0f9c7235503757b97d1c029546fd6a8891814 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 2ed928c6145a2b2c216bcf9f256e5fef85e705a4..fdac30da5ac47150b8ff079a154441d266845508 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 ebde62262e3b641e54eead7df8c6f80b2eef9081..cf0e685c939c490606978a6f83c501073db16166 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 fca3c0f39963b927cd38f49353a8e6a52e61d478..6c85bc22d98887be4e8ab7fb82367bc80d0e190c 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 ee0c75a9bb1c15561d2e59294c47f966a6fd611e..447e47acf948f8c4aae6ac4c4f0913b5bc2f15b8 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 a951e5df74daf97c61fb09e1b569c95774cd3dd4..7011378b472abf24a806d7d2d32988a57e39acd4 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 ae468157a291178158f7798ac268af004ed07cbd..21138084483badf5d27532d4bbd202f7bc5313a3 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 754ec42d9940de122dbf8d8a6cfecd3ce9781bfa..362856a944d030b92951d01b7aa14cc08062d273 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 2c6be4b953a33cd1ea7978c468c781d80b95d0c8..87faafc1c41268b17461b7237fdfd8bac60ea158 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 0d1fbb27cd8049f17ddd042d49ce5ce0b89a249c..8401958bb4d5d97b99bebcd91b27ebc1144a3721 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 08f0300ae039468b079dcbe23afd536780266978..1b200a43a7c7b7937ded28dd8dd0992dceb9b169 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 68493399ebc1a01554ab189c6c4743db30ec982c..c18a0bef50daae6048047511e2500bf0d8c94259 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 f977b7a3c247fa58da2dc82e9c54e22c5068d530..31b71968f6e96a2b935c5dac7e870b69d3079b3c 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 5d52d8784f1948166377b64c58b04d5225b68523..896a6d70f38ff50b530aef72cf6788f33e060d4e 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 bd3240393c0943157009e93f9ae9057ca775578c..209b842366d99969cce197a46ea7a60233b90751 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 2ebaa6de39f1e703c880f09a7a6c490f1db6d3b2..e5f6939b4f7b6cecf29b23b8b818c97fcd25e80d 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 6385b18c9b029d23b966929144903c1840274ccb..7d2caaffc95f129dfdee31e6f1e16d6d7022c929 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 5319cb8778e8d09dc66da7f75c2b5e608add8b91..8b8346ea282bde524024538bb29c79d722d05220 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 7312fb23a3ca38db1c1b0e8e939fd1de6cc7a9dd..d91e34a85c6dbe06905bc1a1ce26a8d75231a123 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.
diff --git a/sql/sql.go b/sql/sql.go
index 34eb7f7979d1675d71b6f9873e580b8770cb9771..d719a79fbc035b7bd38839a67f6b96d99c079a46 100644
--- a/sql/sql.go
+++ b/sql/sql.go
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
-// 2017-12-12 19:14:08.420562729 -0800 PST m=+0.002645375
+// 2017-12-12 21:44:02.647917692 -0800 PST m=+0.002328395
package sql
diff --git a/storage/category.go b/storage/category.go
index 5591a8982da18a5fa7f3297f5ad340305643117f..a9de759f614c172ca65a55ac01bc59ae51c627a4 100644
--- a/storage/category.go
+++ b/storage/category.go
@@ -10,8 +10,8 @@ import (
"fmt"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
)
// AnotherCategoryExists checks if another category exists with the same title.
diff --git a/storage/enclosure.go b/storage/enclosure.go
index 7b0acfd0538f69b3e624e0b2efc6383ee5d1d30f..5ae0a4321d48103f31df77e61c0f01acf4893daf 100644
--- a/storage/enclosure.go
+++ b/storage/enclosure.go
@@ -7,7 +7,7 @@ package storage
import (
"fmt"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/model"
)
// GetEnclosures returns all attachments for the given entry.
diff --git a/storage/entry.go b/storage/entry.go
index 151bf493ecaec7aa7b92e92607697d188217580f..a75d41c67af283dae7350a68d3dcade18da3b045 100644
--- a/storage/entry.go
+++ b/storage/entry.go
@@ -10,8 +10,8 @@ import (
"log"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
"github.com/lib/pq"
)
diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go
index 0d632bc138b7593a8d9e044ab5d0e812db04ae21..57e708c4e352784da13b7a410a34eacbd7fbef4f 100644
--- a/storage/entry_query_builder.go
+++ b/storage/entry_query_builder.go
@@ -11,8 +11,8 @@ import (
"github.com/lib/pq"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
)
// EntryQueryBuilder builds a SQL query to fetch entries.
diff --git a/storage/feed.go b/storage/feed.go
index 2ea20bc5c0ad0e415178d9b463d4c9f91337c832..602bec7bf18e94ca87153a776272d13858af72dc 100644
--- a/storage/feed.go
+++ b/storage/feed.go
@@ -10,8 +10,8 @@ import (
"fmt"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
)
// FeedExists checks if the given feed exists.
diff --git a/storage/icon.go b/storage/icon.go
index 48b5f461ec01c33bf6a1e6ffd43d79d1cfc6f7ad..1f38938b1d7f46896261644d28c60185bc3bc218 100644
--- a/storage/icon.go
+++ b/storage/icon.go
@@ -10,8 +10,8 @@ import (
"strings"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
)
// HasIcon checks if the given feed has an icon.
diff --git a/storage/integration.go b/storage/integration.go
index 1c461b9fe50038bd8e81cf3f0348ed64a8b64ddd..886e02f51b5d9b9e221d4e75a0978e916d5c8359 100644
--- a/storage/integration.go
+++ b/storage/integration.go
@@ -8,7 +8,7 @@ import (
"database/sql"
"fmt"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/model"
)
// UserByFeverToken returns a user by using the Fever API token.
diff --git a/storage/job.go b/storage/job.go
index c9ab64cfb920856c55164dfe6a9a6a7d4a51b11a..b66ae3b9c8939f194272b9e38995040610afa8aa 100644
--- a/storage/job.go
+++ b/storage/job.go
@@ -8,8 +8,8 @@ import (
"fmt"
"time"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
)
const maxParsingError = 3
diff --git a/storage/migration.go b/storage/migration.go
index f60e8acbc58cacc7a0bfcd61285e8eb384085bba..c7d98514563fb0fd4abc7776c382d664bd656b12 100644
--- a/storage/migration.go
+++ b/storage/migration.go
@@ -9,7 +9,7 @@ import (
"log"
"strconv"
- "github.com/miniflux/miniflux2/sql"
+ "github.com/miniflux/miniflux/sql"
)
const schemaVersion = 8
diff --git a/storage/session.go b/storage/session.go
index 719fcffd92f15f643f8e5a51c180716154a5b35f..dbf2dc38560aa5301849f095d447a89fb73a6d8e 100644
--- a/storage/session.go
+++ b/storage/session.go
@@ -8,8 +8,8 @@ import (
"database/sql"
"fmt"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
)
// Sessions returns the list of sessions for the given user.
diff --git a/storage/timezone.go b/storage/timezone.go
index 257f44fc60455cdf08443ae808169c7a7d003ad9..72dbb1d7a0e9a0e232a58b8e2a7f68ec078f7248 100644
--- a/storage/timezone.go
+++ b/storage/timezone.go
@@ -8,7 +8,7 @@ import (
"fmt"
"time"
- "github.com/miniflux/miniflux2/helper"
+ "github.com/miniflux/miniflux/helper"
)
// Timezones returns all timezones supported by the database.
diff --git a/storage/token.go b/storage/token.go
index dd14704d05e45fd179a9e35d0c1a3b6578e4b09f..c5a614ab22c7920cf6e2b4f556b0083e9e71c157 100644
--- a/storage/token.go
+++ b/storage/token.go
@@ -8,8 +8,8 @@ import (
"database/sql"
"fmt"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
)
// CreateToken creates a new token.
diff --git a/storage/user.go b/storage/user.go
index 689ed7433de4efcea3a9f230a223bcc921b83733..5fe04cd4027b7650958824f9c5ed9347fb58735f 100644
--- a/storage/user.go
+++ b/storage/user.go
@@ -14,8 +14,8 @@ import (
"github.com/lib/pq/hstore"
- "github.com/miniflux/miniflux2/helper"
- "github.com/miniflux/miniflux2/model"
+ "github.com/miniflux/miniflux/helper"
+ "github.com/miniflux/miniflux/model"
"golang.org/x/crypto/bcrypt"
)