Merge pull request #2442 from syuilo/develop

8.5.0
This commit is contained in:
syuilo 2018-08-24 07:24:08 +09:00 committed by GitHub
commit a827b6028d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 16 deletions

View File

@ -5,6 +5,16 @@ ChangeLog
This document describes breaking changes only. This document describes breaking changes only.
8.0.0
-----
### Migration
起動する前に、`node cli/migration/8.0.0`してください。
Please run `node cli/migration/8.0.0` before launch.
7.0.0 7.0.0
----- -----

View File

@ -1,8 +1,8 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "8.4.0", "version": "8.5.0",
"clientVersion": "1.0.8831", "clientVersion": "1.0.8834",
"codename": "nighthike", "codename": "nighthike",
"main": "./built/index.js", "main": "./built/index.js",
"private": true, "private": true,

View File

@ -44,13 +44,9 @@ export default Vue.extend({
components: { components: {
XChart XChart
}, },
props: {
chart: {
required: true
}
},
data() { data() {
return { return {
chart: null,
chartType: 'local-notes', chartType: 'local-notes',
span: 'hour' span: 'hour'
}; };
@ -85,6 +81,11 @@ export default Vue.extend({
); );
} }
}, },
created() {
(this as any).api('chart').then(chart => {
this.chart = chart;
});
},
methods: { methods: {
notesChart(local: boolean): any { notesChart(local: boolean): any {
const data = this.stats.slice().reverse().map(x => ({ const data = this.stats.slice().reverse().map(x => ({

View File

@ -11,7 +11,7 @@
<main> <main>
<div v-show="page == 'dashboard'"> <div v-show="page == 'dashboard'">
<x-dashboard/> <x-dashboard/>
<x-chart :chart="chart"/> <x-chart/>
</div> </div>
<div v-if="page == 'users'"> <div v-if="page == 'users'">
<x-suspend-user/> <x-suspend-user/>
@ -49,11 +49,6 @@ export default Vue.extend({
chart: null chart: null
}; };
}, },
created() {
(this as any).api('admin/chart').then(chart => {
this.chart = chart;
});
},
methods: { methods: {
nav(page: string) { nav(page: string) {
this.page = page; this.page = page;

View File

@ -1,10 +1,8 @@
import Stats, { IStats } from '../../../../models/stats'; import Stats, { IStats } from '../../../models/stats';
type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
export const meta = { export const meta = {
requireCredential: true,
requireAdmin: true
}; };
export default (params: any) => new Promise(async (res, rej) => { export default (params: any) => new Promise(async (res, rej) => {