diff --git a/config.json.example b/config.json.example index 3875097d6c..9872fad88f 100644 --- a/config.json.example +++ b/config.json.example @@ -86,5 +86,6 @@ "RATE_LIMITER_ENABLED": "false", "REDIS_HOST": "aaabbbcccdddeeefff", "REDIS_PORT": "1234", - "REDIS_PASSWORD": "12345678" + "REDIS_PASSWORD": "12345678", + "TRUSTED_DOMAINS": "https://localhost,https://habitica.com" } diff --git a/website/client/src/app.vue b/website/client/src/app.vue index ede7eb8c9c..95cb2ba425 100644 --- a/website/client/src/app.vue +++ b/website/client/src/app.vue @@ -35,6 +35,7 @@ + @@ -175,6 +176,7 @@ import amazonPaymentsModal from '@/components/payments/amazonModal'; import paymentsSuccessModal from '@/components/payments/successModal'; import subCancelModalConfirm from '@/components/payments/cancelModalConfirm'; import subCanceledModal from '@/components/payments/canceledModal'; +import externalLinkModal from '@/components/externalLinkModal.vue'; import spellsMixin from '@/mixins/spells'; import { @@ -210,6 +212,7 @@ export default { subCanceledModal, bugReportModal, bugReportSuccessModal, + externalLinkModal, }, mixins: [notifications, spellsMixin], data () { diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index 69ec6b0e2f..dbbf211255 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -213,7 +213,7 @@