Merge branch 'master' into feature/env-manager

This commit is contained in:
Jacob Anavisca
2020-02-23 11:39:44 -05:00
committed by GitHub
18 changed files with 465 additions and 126 deletions

View File

@@ -247,7 +247,6 @@
<span>
<pw-toggle :on="rawInput" @change="rawInput = $event">
{{ $t("raw_input") }}
{{ rawInput ? $t("enabled") : $t("disabled") }}
</pw-toggle>
</span>
<div>
@@ -459,7 +458,8 @@
:disabled="!isValidURL"
v-tooltip.bottom="$t('copy_request_link')"
>
<i class="material-icons">file_copy</i>
<i v-if="navigatorShare" class="material-icons">share</i>
<i v-else class="material-icons">file_copy</i>
</button>
<button
class="icon"
@@ -1516,7 +1516,8 @@ export default {
fb,
customMethod: false,
files: [],
filenames: ""
filenames: "",
navigatorShare: navigator.share
};
},
watch: {

View File

@@ -155,6 +155,7 @@
</li>
</ul>
</pw-section>
<pw-section class="blue" :label="$t('proxy')" ref="proxy">
<ul>
<li>
@@ -206,7 +207,12 @@
{{ $t("postwoman_official_proxy_hosting") }}
<br />
{{ $t("read_the") }}
<a href="https://apollotv.xyz/legal" target="_blank" rel="noopener">
<a
class="link"
href="https://apollotv.xyz/legal"
target="_blank"
rel="noopener"
>
{{ $t("apollotv_privacy_policy") }} </a
>.
</p>
@@ -270,7 +276,7 @@ export default {
aceEditor: "vibrant_ink"
},
{
color: "var(--bg-color)",
color: "var(--ac-color)",
name: this.$t("auto_system"),
vibrant: window.matchMedia("(prefers-color-scheme: light)").matches,
class: "auto",