Compare commits

..

3 Commits

Author SHA1 Message Date
dependabot[bot]
6410411814 Bump marked from 5.1.2 to 9.1.4 in /tabby-settings
Bumps [marked](https://github.com/markedjs/marked) from 5.1.2 to 9.1.4.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v5.1.2...v9.1.4)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 04:19:13 +00:00
Eugene
6a458d8b9b updated config sync settings tab 2023-10-15 21:08:18 +02:00
Eugene
3e9ee5b235 Merge pull request #9099 from Eugeny/all-contributors/add-aaronhuggins 2023-10-12 10:15:12 +02:00
6 changed files with 25 additions and 8 deletions

View File

@@ -406,6 +406,14 @@ export class ConfigService {
}
config.version = 6
}
if (config.version < 7) {
if (!config.configSync?.host || config.configSync?.host === 'https://api.tabby.sh') {
config.configSync ??= {}
delete config.configSync.host
delete config.configSync.token
}
config.version = 7
}
}
private async maybeDecryptConfig (store) {

View File

@@ -19,7 +19,7 @@
"license": "MIT",
"devDependencies": {
"@types/marked": "^5.0.1",
"marked": "^5.1.2",
"marked": "^9.1.4",
"ngx-infinite-scroll": "^16"
},
"peerDependencies": {

View File

@@ -20,7 +20,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
)
i.fas.fa-external-link-alt
.form-line
.form-line(*ngIf='config.store.configSync.token')
.header
.title(translate) Secret sync token
.description(translate) Get it from the Tabby Web settings window
@@ -36,6 +36,11 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
i.fas.fa-fw.fa-check.text-success(*ngIf='connectionSuccessful')
i.fas.fa-fw.fa-exclamation-triangle.text-danger(*ngIf='connectionSuccessful === false')
.alert.alert-info.d-flex.align-items-center
.me-auto
span(translate) Config sync requires an instance of the Tabby Web service.
a.ml-1((click)='openTabbyWebInfo()', href='#', translate) Learn more
ng-container(*ngIf='config.store.configSync.token')
.alert.alert-danger(*ngIf='connectionSuccessful === false')
i.fas.fa-exclamation-triangle

View File

@@ -141,4 +141,8 @@ export class ConfigSyncSettingsTabComponent extends BaseComponent {
this.platform.openExternal(this.config.store.configSync.host)
}
}
openTabbyWebInfo () {
this.platform.openExternal('https://github.com/Eugeny/tabby-web')
}
}

View File

@@ -4,8 +4,8 @@ import { ConfigProvider, Platform } from 'tabby-core'
export class SettingsConfigProvider extends ConfigProvider {
defaults = {
configSync: {
host: 'https://api.tabby.sh',
token: '',
host: null,
token: null,
configID: null,
auto: false,
parts: {

View File

@@ -7,10 +7,10 @@
resolved "https://registry.yarnpkg.com/@types/marked/-/marked-5.0.1.tgz#15acd796d722b91bf00738c8c8539aaf5034f0c6"
integrity sha512-Y3pAUzHKh605fN6fvASsz5FDSWbZcs/65Q6xYRmnIP9ZIYz27T4IOmXfH9gWJV1dpi7f1e7z7nBGUTx/a0ptpA==
marked@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/marked/-/marked-5.1.2.tgz#62b5ccfc75adf72ca3b64b2879b551d89e77677f"
integrity sha512-ahRPGXJpjMjwSOlBoTMZAK7ATXkli5qCPxZ21TG44rx1KEo44bii4ekgTDQPNRQ4Kh7JMb9Ub1PVk1NxRSsorg==
marked@^9.1.4:
version "9.1.4"
resolved "https://registry.yarnpkg.com/marked/-/marked-9.1.4.tgz#68d50848f1b1e264b8fa031946b4b0c3352827e9"
integrity sha512-Mq83CCaClhXqhf8sLQ57c1unNelHEuFadK36ga+GeXR4FeT/5ssaC5PaCRVqMA74VYorzYRqdAaxxteIanh3Kw==
ngx-infinite-scroll@^16:
version "16.0.0"