Merge branch 'develop' into feature/ui-revamp

This commit is contained in:
Patrick Pacher
2020-09-29 09:19:15 +02:00
26 changed files with 731 additions and 390 deletions

View File

@@ -20,7 +20,6 @@ func registerDatabases() error {
Name: "core",
Description: "Holds core data, such as settings and profiles",
StorageType: DefaultDatabaseStorageType,
PrimaryAPI: "",
})
if err != nil {
return err
@@ -30,7 +29,6 @@ func registerDatabases() error {
Name: "cache",
Description: "Cached data, such as Intelligence and DNS Records",
StorageType: DefaultDatabaseStorageType,
PrimaryAPI: "",
})
if err != nil {
return err
@@ -40,7 +38,6 @@ func registerDatabases() error {
// Name: "history",
// Description: "Historic event data",
// StorageType: DefaultDatabaseStorageType,
// PrimaryAPI: "",
// })
// if err != nil {
// return err

View File

@@ -69,7 +69,6 @@ func registerControlDatabase() error {
Name: "control",
Description: "Control Interface for the Portmaster",
StorageType: "injected",
PrimaryAPI: "",
})
if err != nil {
return err