graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 10:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2018-11-11 12:43:52 +09:00
commit a59f53e6da
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
7 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/app/admin/views/instance.vue
View file

@ -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,

3
src/client/app/common/views/components/acct.vue
View file

@ -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)
}; };
} }
}); });

3
src/client/app/common/views/components/profile-editor.vue
View file

@ -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,

3
src/client/app/common/views/components/signin.vue
View file

@ -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: {

3
src/client/app/common/views/components/signup.vue
View file

@ -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: '',

3
src/client/app/desktop/views/pages/welcome.vue
View file

@ -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: [],

3
src/client/app/mobile/views/pages/welcome.vue
View file

@ -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: [],