diff --git a/CHANGELOG.md b/CHANGELOG.md index 7775dfe68..13819537b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -342,7 +342,7 @@ - Serialize a request into JSON? [\#4](https://github.com/liyasthomas/postwoman/issues/4) - Add brand new logo to the project [\#244](https://github.com/liyasthomas/postwoman/pull/244) ([caneco](https://github.com/caneco)) - Feature/pre request script [\#231](https://github.com/liyasthomas/postwoman/pull/231) ([nickpalenchar](https://github.com/nickpalenchar)) -- Add the ApolloTV proxy server [\#217](https://github.com/liyasthomas/postwoman/pull/217) ([NBTX](https://github.com/NBTX)) +- Add the Apollo Software proxy server [\#217](https://github.com/liyasthomas/postwoman/pull/217) ([NBTX](https://github.com/NBTX)) - bug: keeping information on page change [\#211](https://github.com/liyasthomas/postwoman/pull/211) ([breno-pereira](https://github.com/breno-pereira)) - Work in Progress: feature/allow-collections-importing [\#209](https://github.com/liyasthomas/postwoman/pull/209) ([vlad0337187](https://github.com/vlad0337187)) - Feature/log errors [\#207](https://github.com/liyasthomas/postwoman/pull/207) ([nickpalenchar](https://github.com/nickpalenchar)) diff --git a/README.md b/README.md index 111eff342..5be149f6d 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ _Collections are synced with local session storage_ - Access APIs served in non-HTTPS (`http://`) - Use custom Proxy URL -_Official Postwoman Proxy is hosted by ApolloTV - **[Privacy policy](https://apollotv.xyz/legal)**_ +_Official Postwoman Proxy is hosted by Apollo Software - **[Privacy Policy](https://apollosoftware.xyz/legal/postwoman)**_ 📜 **Pre-Request Scripts β**: Snippets of code associated with a request that are executed before the request is sent. diff --git a/functions/strategies/AxiosStrategy.js b/functions/strategies/AxiosStrategy.js index 4b3be7263..02cda5521 100644 --- a/functions/strategies/AxiosStrategy.js +++ b/functions/strategies/AxiosStrategy.js @@ -2,7 +2,7 @@ import axios from "axios"; const axiosWithProxy = async (req, { state }) => { const { data } = await axios.post( - state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", + state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/", req ); return data; diff --git a/functions/strategies/ChromeStrategy.js b/functions/strategies/ChromeStrategy.js index fe88338cb..6a598e220 100644 --- a/functions/strategies/ChromeStrategy.js +++ b/functions/strategies/ChromeStrategy.js @@ -37,7 +37,7 @@ const chromeWithProxy = (req, { state }) => method: "post", url: state.postwoman.settings.PROXY_URL || - "https://postwoman.apollotv.xyz/", + "https://postwoman.apollosoftware.xyz/", data: req } } diff --git a/functions/strategies/ExtensionStrategy.js b/functions/strategies/ExtensionStrategy.js index e12e167e8..9382562f2 100644 --- a/functions/strategies/ExtensionStrategy.js +++ b/functions/strategies/ExtensionStrategy.js @@ -5,7 +5,7 @@ const extensionWithProxy = async (req, { state }) => { const { data } = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({ method: "post", url: - state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", + state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/", data: req }); return data; diff --git a/functions/strategies/FirefoxStrategy.js b/functions/strategies/FirefoxStrategy.js index 9160a27d3..8b9874811 100644 --- a/functions/strategies/FirefoxStrategy.js +++ b/functions/strategies/FirefoxStrategy.js @@ -15,7 +15,7 @@ const firefoxWithProxy = (req, { state }) => window.firefoxExtSendRequest({ method: "post", url: - state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", + state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/", data: req }); }); diff --git a/lang/de-DE.js b/lang/de-DE.js index 88c920511..2b9cd8795 100644 --- a/lang/de-DE.js +++ b/lang/de-DE.js @@ -79,9 +79,9 @@ export default { disabled: "Deaktiviert", proxy: "Proxy", postwoman_official_proxy_hosting: - "Postwomans offizieller Proxy wird durch ApolloTV bereitgestellt.", + "Postwomans offizieller Proxy wird durch Apollo Software bereitgestellt.", read_the: "Lies die", - apollotv_privacy_policy: "ApolloTV Datenschutzerklärung", + apollosw_privacy_policy: "Apollo Software Datenschutzerklärung", contact_us: "Kontaktiere uns", connect: "Verbinden", disconnect: "Trennen", diff --git a/lang/en-US.js b/lang/en-US.js index b9a053559..e09b560fd 100644 --- a/lang/en-US.js +++ b/lang/en-US.js @@ -86,9 +86,9 @@ export default { disabled: "Disabled", proxy: "Proxy", postwoman_official_proxy_hosting: - "Postwoman's Official Proxy is hosted by ApolloTV.", + "Postwoman's Official Proxy is hosted by Apollo Software.", read_the: "Read the", - apollotv_privacy_policy: "ApolloTV privacy policy", + apollosw_privacy_policy: "Apollo Software privacy policy", contact_us: "Contact us", connect: "Connect", disconnect: "Disconnect", diff --git a/lang/es-ES.js b/lang/es-ES.js index 147cdcfb2..ddb6be076 100644 --- a/lang/es-ES.js +++ b/lang/es-ES.js @@ -79,9 +79,9 @@ export default { disabled: "Deshabilitado", proxy: "Proxy", postwoman_official_proxy_hosting: - "Proxy Oficial de Postwoman está hospedado en ApolloTV.", + "Proxy Oficial de Postwoman está hospedado en Apollo Software.", read_the: "Leer la", - apollotv_privacy_policy: "Política de Privacidad de ApolloTV", + apollosw_privacy_policy: "Política de Privacidad de Apollo Software", contact_us: "Contáctenos", connect: "Conectar", disconnect: "Desconectar", diff --git a/lang/fa-IR.js b/lang/fa-IR.js index 868147717..1ab9ce295 100644 --- a/lang/fa-IR.js +++ b/lang/fa-IR.js @@ -79,9 +79,9 @@ export default { disabled: "غیر فعال", proxy: "پراکسی", postwoman_official_proxy_hosting: - "پراکسی Postwoman برروی هاست ApolloTV قرار دارد.", + "پراکسی Postwoman برروی هاست Apollo Software قرار دارد.", read_the: "بخوانید", - apollotv_privacy_policy: "خط مشی رازداری ApolloTV", + apollosw_privacy_policy: "خط مشی رازداری Apollo Software", contact_us: "Contact us", connect: "Connect", disconnect: "Disconnect", diff --git a/lang/fr-FR.js b/lang/fr-FR.js index 3dcb61d69..4a8b9bcf3 100644 --- a/lang/fr-FR.js +++ b/lang/fr-FR.js @@ -79,9 +79,9 @@ export default { disabled: "Désactivé", proxy: "Proxy", postwoman_official_proxy_hosting: - "Le proxy officiel de Postwoman est hébergé par ApolloTV.", + "Le proxy officiel de Postwoman est hébergé par Apollo Software.", read_the: "Lire la", - apollotv_privacy_policy: "politique de confidentialité ApolloTV", + apollosw_privacy_policy: "politique de confidentialité Apollo Software", contact_us: "Contactez nous", connect: "Relier", disconnect: "Déconnecter", diff --git a/lang/id-ID.js b/lang/id-ID.js index 1a99f00cf..a6cb96ba0 100644 --- a/lang/id-ID.js +++ b/lang/id-ID.js @@ -79,9 +79,9 @@ export default { disabled: "dinonaktifkan", proxy: "Proksi", postwoman_official_proxy_hosting: - "Proksi Resmi Postwoman dalam penginangan ApolloTV.", + "Proksi Resmi Postwoman dalam penginangan Apollo Software.", read_the: "Bacalah", - apollotv_privacy_policy: "kebijakan privasi ApolloTV", + apollosw_privacy_policy: "kebijakan privasi Apollo Software", contact_us: "Hubungi kami", connect: "Menghubungkan", disconnect: "Memutuskan", diff --git a/lang/ja-JP.js b/lang/ja-JP.js index 578396afa..4f202a4b2 100644 --- a/lang/ja-JP.js +++ b/lang/ja-JP.js @@ -81,7 +81,7 @@ export default { postwoman_official_proxy_hosting: "Postwomanの公式プロキシは、Apollo TVがホストしています。", read_the: "プライバシーポリシー", - apollotv_privacy_policy: "を読む", + apollosw_privacy_policy: "を読む", contact_us: "お問い合わせ", connect: "接続", disconnect: "切断", @@ -241,5 +241,5 @@ export default { go_home: "ホームに戻る", reload: "リロード", enter_curl: "cURLを入力", - empty: "空" + empty: "空" }; diff --git a/lang/pt-BR.js b/lang/pt-BR.js index 9b1e294f8..f12a55277 100644 --- a/lang/pt-BR.js +++ b/lang/pt-BR.js @@ -80,7 +80,7 @@ export default { proxy: "Proxy", postwoman_official_proxy_hosting: "Postwoman's alojamento proxy oficial", read_the: "Leia o", - apollotv_privacy_policy: "ApolloTV Política de Privacidade", + apollosw_privacy_policy: "Apollo Software Política de Privacidade", contact_us: "Contate-Nos", connect: "Conectar", disconnect: "Desconectar", diff --git a/lang/tr-TR.js b/lang/tr-TR.js index 054a4f16f..733ad8999 100644 --- a/lang/tr-TR.js +++ b/lang/tr-TR.js @@ -79,9 +79,9 @@ export default { disabled: "Aktif değil", proxy: "Proxy", postwoman_official_proxy_hosting: - "Proxy Oficial de Postwoman está hospedado en ApolloTV.", + "Proxy Oficial de Postwoman está hospedado en Apollo Software.", read_the: "Leer la", - apollotv_privacy_policy: "ApolloTV gizlilik politikaları", + apollosw_privacy_policy: "Apollo Software gizlilik politikaları", contact_us: "Bizimle iletişime geçin", connect: "Bağlan", disconnect: "Kesmek", diff --git a/lang/zh-CN.js b/lang/zh-CN.js index 9e8db750b..60c3dd869 100644 --- a/lang/zh-CN.js +++ b/lang/zh-CN.js @@ -78,9 +78,9 @@ export default { enabled: "已启用", disabled: "已禁用", proxy: "代理", - postwoman_official_proxy_hosting: "Postwoman的官方代理由ApolloTV托管", + postwoman_official_proxy_hosting: "Postwoman的官方代理由Apollo Software托管", read_the: "阅读", - apollotv_privacy_policy: "ApolloTV隐私政策", + apollosw_privacy_policy: "Apollo Software隐私政策", contact_us: "联系我们", connect: "连接", disconnect: "断开", diff --git a/pages/graphql.vue b/pages/graphql.vue index fe21b2674..fee7f8a17 100644 --- a/pages/graphql.vue +++ b/pages/graphql.vue @@ -572,7 +572,7 @@ export default { method: "post", url: this.$store.state.postwoman.settings.PROXY_URL || - `https://postwoman.apollotv.xyz/`, + `https://postwoman.apollosoftware.xyz/`, data: reqOptions } : reqOptions; diff --git a/pages/settings.vue b/pages/settings.vue index eeb09d8a6..e3520db3b 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -224,11 +224,11 @@ {{ $t("read_the") }} - {{ $t("apollotv_privacy_policy") }} .

@@ -346,7 +346,7 @@ export default { ], settings: { - SCROLL_INTO_ENABLED: + SCROLL_INTO_ENABLED: typeof this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED !== "undefined" ? this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED @@ -362,9 +362,9 @@ export default { this.$store.state.postwoman.settings.PROXY_ENABLED || false, PROXY_URL: this.$store.state.postwoman.settings.PROXY_URL || - "https://postwoman.apollotv.xyz/", + "https://postwoman.apollosoftware.xyz/", PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "", - + EXTENSIONS_ENABLED: typeof this.$store.state.postwoman.settings.EXTENSIONS_ENABLED !== "undefined" @@ -508,7 +508,7 @@ export default { fb.writeSettings("syncEnvironments", true); }, resetProxy({ target }) { - this.settings.PROXY_URL = `https://postwoman.apollotv.xyz/`; + this.settings.PROXY_URL = `https://postwoman.apollosoftware.xyz/`; target.innerHTML = this.doneButton; this.$toast.info(this.$t("cleared"), { icon: "clear_all"