merge: all upstream changes
This commit is contained in:
commit
f8f128b347
170 changed files with 4490 additions and 2218 deletions
|
|
@ -126,18 +126,10 @@ export const routes = [{
|
|||
path: '/import-export',
|
||||
name: 'import-export',
|
||||
component: page(() => import('./pages/settings/import-export.vue')),
|
||||
}, {
|
||||
path: '/instance-mute',
|
||||
name: 'instance-mute',
|
||||
component: page(() => import('./pages/settings/instance-mute.vue')),
|
||||
}, {
|
||||
path: '/mute-block',
|
||||
name: 'mute-block',
|
||||
component: page(() => import('./pages/settings/mute-block.vue')),
|
||||
}, {
|
||||
path: '/word-mute',
|
||||
name: 'word-mute',
|
||||
component: page(() => import('./pages/settings/word-mute.vue')),
|
||||
}, {
|
||||
path: '/api',
|
||||
name: 'api',
|
||||
|
|
@ -435,6 +427,10 @@ export const routes = [{
|
|||
path: '/proxy-account',
|
||||
name: 'proxy-account',
|
||||
component: page(() => import('./pages/admin/proxy-account.vue')),
|
||||
}, {
|
||||
path: '/external-services',
|
||||
name: 'external-services',
|
||||
component: page(() => import('./pages/admin/external-services.vue')),
|
||||
}, {
|
||||
path: '/other-settings',
|
||||
name: 'other-settings',
|
||||
|
|
@ -471,6 +467,10 @@ export const routes = [{
|
|||
path: '/my/drive',
|
||||
component: page(() => import('./pages/drive.vue')),
|
||||
loginRequired: true,
|
||||
}, {
|
||||
path: '/my/drive/file/:fileId',
|
||||
component: page(() => import('./pages/drive.file.vue')),
|
||||
loginRequired: true,
|
||||
}, {
|
||||
path: '/my/follow-requests',
|
||||
component: page(() => import('./pages/follow-requests.vue')),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue