diff --git a/apis/extensions.go b/apis/extensions.go index 044f245d..68581c3b 100644 --- a/apis/extensions.go +++ b/apis/extensions.go @@ -8,9 +8,9 @@ import ( "log/slog" "os" - "github.com/pocketbase/pocketbase/core" - "github.com/pocketbase/pocketbase/tools/hook" - "github.com/pocketbase/pocketbase/ui" + "github.com/tabshift-gh/pocketbase/core" + "github.com/tabshift-gh/pocketbase/tools/hook" + "github.com/tabshift-gh/pocketbase/ui" ) // bindUIExtensions binds the superuser UI extensions routes to the ServeEvent.Router. diff --git a/apis/extensions_test.go b/apis/extensions_test.go index 74baff02..913bca6e 100644 --- a/apis/extensions_test.go +++ b/apis/extensions_test.go @@ -5,9 +5,9 @@ import ( "testing" "testing/fstest" - "github.com/pocketbase/pocketbase/core" - "github.com/pocketbase/pocketbase/tests" - "github.com/pocketbase/pocketbase/ui" + "github.com/tabshift-gh/pocketbase/core" + "github.com/tabshift-gh/pocketbase/tests" + "github.com/tabshift-gh/pocketbase/ui" ) // note: don't run in parallel to avoid conflicts with the ui.DistDirFS nil test diff --git a/apis/sql.go b/apis/sql.go index 47cabc7b..462e1d95 100644 --- a/apis/sql.go +++ b/apis/sql.go @@ -9,8 +9,8 @@ import ( "time" validation "github.com/pocketbase/ozzo-validation/v4" - "github.com/pocketbase/pocketbase/core" - "github.com/pocketbase/pocketbase/tools/router" + "github.com/tabshift-gh/pocketbase/core" + "github.com/tabshift-gh/pocketbase/tools/router" ) const ( diff --git a/apis/sql_test.go b/apis/sql_test.go index 0281dbaa..debbeb7c 100644 --- a/apis/sql_test.go +++ b/apis/sql_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/pocketbase/pocketbase/tests" + "github.com/tabshift-gh/pocketbase/tests" ) func TestSQLRun(t *testing.T) { diff --git a/core/notify_watcher.go b/core/notify_watcher.go index 40d0a166..da3adaa3 100644 --- a/core/notify_watcher.go +++ b/core/notify_watcher.go @@ -9,9 +9,9 @@ import ( "github.com/fatih/color" "github.com/fsnotify/fsnotify" - "github.com/pocketbase/pocketbase/tools/hook" - "github.com/pocketbase/pocketbase/tools/routine" - "github.com/pocketbase/pocketbase/tools/security" + "github.com/tabshift-gh/pocketbase/tools/hook" + "github.com/tabshift-gh/pocketbase/tools/routine" + "github.com/tabshift-gh/pocketbase/tools/security" ) const systemHookIdNotifyWatcher = "__pbNotifyWatcherSystemHook__" diff --git a/core/notify_watcher_test.go b/core/notify_watcher_test.go index a081c5e5..87beec83 100644 --- a/core/notify_watcher_test.go +++ b/core/notify_watcher_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/pocketbase/dbx" - "github.com/pocketbase/pocketbase/core" - "github.com/pocketbase/pocketbase/tools/store" + "github.com/tabshift-gh/pocketbase/core" + "github.com/tabshift-gh/pocketbase/tools/store" "golang.org/x/sync/semaphore" ) diff --git a/core/system_alert.go b/core/system_alert.go index 87be2cd9..58797a5b 100644 --- a/core/system_alert.go +++ b/core/system_alert.go @@ -7,7 +7,7 @@ import ( "html/template" "net/mail" - "github.com/pocketbase/pocketbase/tools/mailer" + "github.com/tabshift-gh/pocketbase/tools/mailer" ) const systemAlertHTML = ` diff --git a/migrations/1763020353_update_default_auth_alert_templates.go b/migrations/1763020353_update_default_auth_alert_templates.go index ca93667e..063b5404 100644 --- a/migrations/1763020353_update_default_auth_alert_templates.go +++ b/migrations/1763020353_update_default_auth_alert_templates.go @@ -1,7 +1,7 @@ package migrations import ( - "github.com/pocketbase/pocketbase/core" + "github.com/tabshift-gh/pocketbase/core" ) const oldAuthAlertTemplate = `

Hello,

diff --git a/migrations/1778828400_normalize_indexes.go b/migrations/1778828400_normalize_indexes.go index 6f67b654..a2c77f53 100644 --- a/migrations/1778828400_normalize_indexes.go +++ b/migrations/1778828400_normalize_indexes.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/pocketbase/dbx" - "github.com/pocketbase/pocketbase/core" - "github.com/pocketbase/pocketbase/tools/dbutils" + "github.com/tabshift-gh/pocketbase/core" + "github.com/tabshift-gh/pocketbase/tools/dbutils" ) // see https://github.com/pocketbase/pocketbase/issues/7689 diff --git a/plugins/jsvm/binds_app_reset_test.go b/plugins/jsvm/binds_app_reset_test.go index 1c6f551d..9b1f791c 100644 --- a/plugins/jsvm/binds_app_reset_test.go +++ b/plugins/jsvm/binds_app_reset_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/dop251/goja" - "github.com/pocketbase/pocketbase/apis" - "github.com/pocketbase/pocketbase/core" - "github.com/pocketbase/pocketbase/tests" + "github.com/tabshift-gh/pocketbase/apis" + "github.com/tabshift-gh/pocketbase/core" + "github.com/tabshift-gh/pocketbase/tests" ) func TestHooksAppReset(t *testing.T) { diff --git a/tools/auth/internal/jwk/jwk_test.go b/tools/auth/internal/jwk/jwk_test.go index 189efcc2..fcf312c0 100644 --- a/tools/auth/internal/jwk/jwk_test.go +++ b/tools/auth/internal/jwk/jwk_test.go @@ -16,7 +16,7 @@ import ( "testing" "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 { diff --git a/tools/cron/cron.go b/tools/cron/cron.go index 387da7c8..f044d806 100644 --- a/tools/cron/cron.go +++ b/tools/cron/cron.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "github.com/pocketbase/pocketbase/tools/routine" + "github.com/tabshift-gh/pocketbase/tools/routine" ) // Cron is a crontab-like struct for tasks/jobs scheduling. diff --git a/tools/dbutils/select_test.go b/tools/dbutils/select_test.go index 74553d2f..7c672afc 100644 --- a/tools/dbutils/select_test.go +++ b/tools/dbutils/select_test.go @@ -3,7 +3,7 @@ package dbutils_test import ( "testing" - "github.com/pocketbase/pocketbase/tools/dbutils" + "github.com/tabshift-gh/pocketbase/tools/dbutils" ) func TestAliasOrIdentifier(t *testing.T) { diff --git a/tools/filesystem/filesystem.go b/tools/filesystem/filesystem.go index db419db6..ea50077a 100644 --- a/tools/filesystem/filesystem.go +++ b/tools/filesystem/filesystem.go @@ -412,7 +412,6 @@ var inlineServeContentTypes = []string{ // manualExtensionContentTypes is a map of file extensions to content types. var manualExtensionContentTypes = map[string]string{ -<<<<<<< HEAD // https://github.com/whatwg/mimesniff/issues/7 ".svg": "image/svg+xml", @@ -421,11 +420,6 @@ var manualExtensionContentTypes = map[string]string{ // https://github.com/pocketbase/pocketbase/issues/6597 ".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", // https://github.com/pocketbase/pocketbase/discussions/7467 diff --git a/tools/filesystem/internal/s3blob/s3/uploader.go b/tools/filesystem/internal/s3blob/s3/uploader.go index 5c759392..c82ba4b8 100644 --- a/tools/filesystem/internal/s3blob/s3/uploader.go +++ b/tools/filesystem/internal/s3blob/s3/uploader.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/pocketbase/pocketbase/tools/routine" + "github.com/tabshift-gh/pocketbase/tools/routine" "golang.org/x/sync/errgroup" ) diff --git a/tools/search/multi_match_subquery_test.go b/tools/search/multi_match_subquery_test.go index 6caae968..8ab41f7b 100644 --- a/tools/search/multi_match_subquery_test.go +++ b/tools/search/multi_match_subquery_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/pocketbase/dbx" - "github.com/pocketbase/pocketbase/tools/search" + "github.com/tabshift-gh/pocketbase/tools/search" ) func TestMultiMatchSubqueryBuild(t *testing.T) { diff --git a/ui/.env b/ui/.env index dcf4b961..8af97148 100644 --- a/ui/.env +++ b/ui/.env @@ -9,7 +9,7 @@ PB_REALTIME_DOCS = "https://pocketbase.io/docs/api-realtime/" 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_DOCS_URL = "https://pocketbase.io/docs" -PB_JS_SDK_URL = "https://github.com/pocketbase/js-sdk" -PB_DART_SDK_URL = "https://github.com/pocketbase/dart-sdk" -PB_RELEASES = "https://github.com/pocketbase/pocketbase/releases" +PB_JS_SDK_URL = "https://github.com/tabshift-gh/js-sdk" +PB_DART_SDK_URL = "https://github.com/tabshift-gh/dart-sdk" +PB_RELEASES = "https://github.com/tabshift-gh/pocketbase/releases" PB_VERSION = "v0.39.10"