Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
a59f53e6da
7 changed files with 14 additions and 7 deletions
|
@ -83,12 +83,13 @@
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import i18n from '../../i18n';
|
import i18n from '../../i18n';
|
||||||
import { host } from '../../config';
|
import { host } from '../../config';
|
||||||
|
import { toUnicode } from 'punycode';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('admin/views/instance.vue'),
|
i18n: i18n('admin/views/instance.vue'),
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
host,
|
host: toUnicode(host),
|
||||||
maintainerName: null,
|
maintainerName: null,
|
||||||
maintainerEmail: null,
|
maintainerEmail: null,
|
||||||
disableRegistration: false,
|
disableRegistration: false,
|
||||||
|
|
|
@ -8,11 +8,12 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import { host } from '../../../config';
|
import { host } from '../../../config';
|
||||||
|
import { toUnicode } from 'punycode';
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
props: ['user', 'detail'],
|
props: ['user', 'detail'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
host
|
host: toUnicode(host)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -73,12 +73,13 @@
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
import { apiUrl, host } from '../../../config';
|
import { apiUrl, host } from '../../../config';
|
||||||
|
import { toUnicode } from 'punycode';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('common/views/components/profile-editor.vue'),
|
i18n: i18n('common/views/components/profile-editor.vue'),
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
host,
|
host: toUnicode(host),
|
||||||
name: null,
|
name: null,
|
||||||
username: null,
|
username: null,
|
||||||
location: null,
|
location: null,
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
import { apiUrl, host } from '../../../config';
|
import { apiUrl, host } from '../../../config';
|
||||||
|
import { toUnicode } from 'punycode';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('common/views/components/signin.vue'),
|
i18n: i18n('common/views/components/signin.vue'),
|
||||||
|
@ -39,7 +40,7 @@ export default Vue.extend({
|
||||||
password: '',
|
password: '',
|
||||||
token: '',
|
token: '',
|
||||||
apiUrl,
|
apiUrl,
|
||||||
host
|
host: toUnicode(host)
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
@ -46,12 +46,13 @@ import Vue from 'vue';
|
||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
const getPasswordStrength = require('syuilo-password-strength');
|
const getPasswordStrength = require('syuilo-password-strength');
|
||||||
import { host, url } from '../../../config';
|
import { host, url } from '../../../config';
|
||||||
|
import { toUnicode } from 'punycode';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('common/views/components/signup.vue'),
|
i18n: i18n('common/views/components/signup.vue'),
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
host,
|
host: toUnicode(host),
|
||||||
username: '',
|
username: '',
|
||||||
password: '',
|
password: '',
|
||||||
retypedPassword: '',
|
retypedPassword: '',
|
||||||
|
|
|
@ -151,6 +151,7 @@ import Vue from 'vue';
|
||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
import { host, copyright } from '../../../config';
|
import { host, copyright } from '../../../config';
|
||||||
import { concat } from '../../../../../prelude/array';
|
import { concat } from '../../../../../prelude/array';
|
||||||
|
import { toUnicode } from 'punycode';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('desktop/views/pages/welcome.vue'),
|
i18n: i18n('desktop/views/pages/welcome.vue'),
|
||||||
|
@ -160,7 +161,7 @@ export default Vue.extend({
|
||||||
stats: null,
|
stats: null,
|
||||||
banner: null,
|
banner: null,
|
||||||
copyright,
|
copyright,
|
||||||
host,
|
host: toUnicode(host),
|
||||||
name: 'Misskey',
|
name: 'Misskey',
|
||||||
description: '',
|
description: '',
|
||||||
announcements: [],
|
announcements: [],
|
||||||
|
|
|
@ -76,6 +76,7 @@ import Vue from 'vue';
|
||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
import { copyright, host } from '../../../config';
|
import { copyright, host } from '../../../config';
|
||||||
import { concat } from '../../../../../prelude/array';
|
import { concat } from '../../../../../prelude/array';
|
||||||
|
import { toUnicode } from 'punycode';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('mobile/views/pages/welcome.vue'),
|
i18n: i18n('mobile/views/pages/welcome.vue'),
|
||||||
|
@ -85,7 +86,7 @@ export default Vue.extend({
|
||||||
copyright,
|
copyright,
|
||||||
stats: null,
|
stats: null,
|
||||||
banner: null,
|
banner: null,
|
||||||
host,
|
host: toUnicode(host),
|
||||||
name: 'Misskey',
|
name: 'Misskey',
|
||||||
description: '',
|
description: '',
|
||||||
photos: [],
|
photos: [],
|
||||||
|
|
Loading…
Reference in a new issue