This commit is contained in:
+3
-3
@@ -8,9 +8,9 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/pocketbase/pocketbase/core"
|
"github.com/tabshift-gh/pocketbase/core"
|
||||||
"github.com/pocketbase/pocketbase/tools/hook"
|
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||||
"github.com/pocketbase/pocketbase/ui"
|
"github.com/tabshift-gh/pocketbase/ui"
|
||||||
)
|
)
|
||||||
|
|
||||||
// bindUIExtensions binds the superuser UI extensions routes to the ServeEvent.Router.
|
// bindUIExtensions binds the superuser UI extensions routes to the ServeEvent.Router.
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"testing/fstest"
|
"testing/fstest"
|
||||||
|
|
||||||
"github.com/pocketbase/pocketbase/core"
|
"github.com/tabshift-gh/pocketbase/core"
|
||||||
"github.com/pocketbase/pocketbase/tests"
|
"github.com/tabshift-gh/pocketbase/tests"
|
||||||
"github.com/pocketbase/pocketbase/ui"
|
"github.com/tabshift-gh/pocketbase/ui"
|
||||||
)
|
)
|
||||||
|
|
||||||
// note: don't run in parallel to avoid conflicts with the ui.DistDirFS nil test
|
// note: don't run in parallel to avoid conflicts with the ui.DistDirFS nil test
|
||||||
|
|||||||
+2
-2
@@ -9,8 +9,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
validation "github.com/pocketbase/ozzo-validation/v4"
|
validation "github.com/pocketbase/ozzo-validation/v4"
|
||||||
"github.com/pocketbase/pocketbase/core"
|
"github.com/tabshift-gh/pocketbase/core"
|
||||||
"github.com/pocketbase/pocketbase/tools/router"
|
"github.com/tabshift-gh/pocketbase/tools/router"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/pocketbase/pocketbase/tests"
|
"github.com/tabshift-gh/pocketbase/tests"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSQLRun(t *testing.T) {
|
func TestSQLRun(t *testing.T) {
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ import (
|
|||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/fsnotify/fsnotify"
|
"github.com/fsnotify/fsnotify"
|
||||||
"github.com/pocketbase/pocketbase/tools/hook"
|
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||||
"github.com/pocketbase/pocketbase/tools/routine"
|
"github.com/tabshift-gh/pocketbase/tools/routine"
|
||||||
"github.com/pocketbase/pocketbase/tools/security"
|
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||||
)
|
)
|
||||||
|
|
||||||
const systemHookIdNotifyWatcher = "__pbNotifyWatcherSystemHook__"
|
const systemHookIdNotifyWatcher = "__pbNotifyWatcherSystemHook__"
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/pocketbase/dbx"
|
"github.com/pocketbase/dbx"
|
||||||
"github.com/pocketbase/pocketbase/core"
|
"github.com/tabshift-gh/pocketbase/core"
|
||||||
"github.com/pocketbase/pocketbase/tools/store"
|
"github.com/tabshift-gh/pocketbase/tools/store"
|
||||||
"golang.org/x/sync/semaphore"
|
"golang.org/x/sync/semaphore"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"html/template"
|
"html/template"
|
||||||
"net/mail"
|
"net/mail"
|
||||||
|
|
||||||
"github.com/pocketbase/pocketbase/tools/mailer"
|
"github.com/tabshift-gh/pocketbase/tools/mailer"
|
||||||
)
|
)
|
||||||
|
|
||||||
const systemAlertHTML = `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
const systemAlertHTML = `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package migrations
|
package migrations
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/pocketbase/pocketbase/core"
|
"github.com/tabshift-gh/pocketbase/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
const oldAuthAlertTemplate = `<p>Hello,</p>
|
const oldAuthAlertTemplate = `<p>Hello,</p>
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/pocketbase/dbx"
|
"github.com/pocketbase/dbx"
|
||||||
"github.com/pocketbase/pocketbase/core"
|
"github.com/tabshift-gh/pocketbase/core"
|
||||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||||
)
|
)
|
||||||
|
|
||||||
// see https://github.com/pocketbase/pocketbase/issues/7689
|
// see https://github.com/pocketbase/pocketbase/issues/7689
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/dop251/goja"
|
"github.com/dop251/goja"
|
||||||
"github.com/pocketbase/pocketbase/apis"
|
"github.com/tabshift-gh/pocketbase/apis"
|
||||||
"github.com/pocketbase/pocketbase/core"
|
"github.com/tabshift-gh/pocketbase/core"
|
||||||
"github.com/pocketbase/pocketbase/tests"
|
"github.com/tabshift-gh/pocketbase/tests"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestHooksAppReset(t *testing.T) {
|
func TestHooksAppReset(t *testing.T) {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/golang-jwt/jwt/v5"
|
"github.com/golang-jwt/jwt/v5"
|
||||||
"github.com/pocketbase/pocketbase/tools/auth/internal/jwk"
|
"github.com/tabshift-gh/pocketbase/tools/auth/internal/jwk"
|
||||||
)
|
)
|
||||||
|
|
||||||
type publicKey interface {
|
type publicKey interface {
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/pocketbase/pocketbase/tools/routine"
|
"github.com/tabshift-gh/pocketbase/tools/routine"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Cron is a crontab-like struct for tasks/jobs scheduling.
|
// Cron is a crontab-like struct for tasks/jobs scheduling.
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package dbutils_test
|
|||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestAliasOrIdentifier(t *testing.T) {
|
func TestAliasOrIdentifier(t *testing.T) {
|
||||||
|
|||||||
@@ -412,7 +412,6 @@ var inlineServeContentTypes = []string{
|
|||||||
|
|
||||||
// manualExtensionContentTypes is a map of file extensions to content types.
|
// manualExtensionContentTypes is a map of file extensions to content types.
|
||||||
var manualExtensionContentTypes = map[string]string{
|
var manualExtensionContentTypes = map[string]string{
|
||||||
<<<<<<< HEAD
|
|
||||||
// https://github.com/whatwg/mimesniff/issues/7
|
// https://github.com/whatwg/mimesniff/issues/7
|
||||||
".svg": "image/svg+xml",
|
".svg": "image/svg+xml",
|
||||||
|
|
||||||
@@ -421,11 +420,6 @@ var manualExtensionContentTypes = map[string]string{
|
|||||||
|
|
||||||
// https://github.com/pocketbase/pocketbase/issues/6597
|
// https://github.com/pocketbase/pocketbase/issues/6597
|
||||||
".js": "text/javascript",
|
".js": "text/javascript",
|
||||||
=======
|
|
||||||
".svg": "image/svg+xml", // (see https://github.com/whatwg/mimesniff/issues/7)
|
|
||||||
".css": "text/css", // (see https://github.com/gabriel-vasile/mimetype/pull/113)
|
|
||||||
".js": "text/javascript", // (see https://github.com/tabshift-gh/pocketbase/issues/6597)
|
|
||||||
>>>>>>> 795cd833 (adjust code to new repository)
|
|
||||||
".mjs": "text/javascript",
|
".mjs": "text/javascript",
|
||||||
|
|
||||||
// https://github.com/pocketbase/pocketbase/discussions/7467
|
// https://github.com/pocketbase/pocketbase/discussions/7467
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/pocketbase/pocketbase/tools/routine"
|
"github.com/tabshift-gh/pocketbase/tools/routine"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/pocketbase/dbx"
|
"github.com/pocketbase/dbx"
|
||||||
"github.com/pocketbase/pocketbase/tools/search"
|
"github.com/tabshift-gh/pocketbase/tools/search"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMultiMatchSubqueryBuild(t *testing.T) {
|
func TestMultiMatchSubqueryBuild(t *testing.T) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ PB_REALTIME_DOCS = "https://pocketbase.io/docs/api-realtime/"
|
|||||||
PB_FIELDS_DOCS = "https://pocketbase.io/docs/collections/#fields"
|
PB_FIELDS_DOCS = "https://pocketbase.io/docs/collections/#fields"
|
||||||
PB_SUPERUSER_IPS_RESET_DOCS = "https://pocketbase.io/docs/going-to-production/#limit-superusers-to-specific-ipssubnets"
|
PB_SUPERUSER_IPS_RESET_DOCS = "https://pocketbase.io/docs/going-to-production/#limit-superusers-to-specific-ipssubnets"
|
||||||
PB_DOCS_URL = "https://pocketbase.io/docs"
|
PB_DOCS_URL = "https://pocketbase.io/docs"
|
||||||
PB_JS_SDK_URL = "https://github.com/pocketbase/js-sdk"
|
PB_JS_SDK_URL = "https://github.com/tabshift-gh/js-sdk"
|
||||||
PB_DART_SDK_URL = "https://github.com/pocketbase/dart-sdk"
|
PB_DART_SDK_URL = "https://github.com/tabshift-gh/dart-sdk"
|
||||||
PB_RELEASES = "https://github.com/pocketbase/pocketbase/releases"
|
PB_RELEASES = "https://github.com/tabshift-gh/pocketbase/releases"
|
||||||
PB_VERSION = "v0.39.10"
|
PB_VERSION = "v0.39.10"
|
||||||
|
|||||||
Reference in New Issue
Block a user