Merge branch 'develop' into feat/media-modal

This commit is contained in:
shpuld 2019-01-28 19:02:46 +02:00
commit 51024a2c8a
16 changed files with 501 additions and 36 deletions

View file

@ -66,6 +66,22 @@ const externalProfileStore = new Vuex.Store({
viewing: 'statuses',
userId: 100,
flushMarker: 0
},
media: {
statuses: [],
statusesObject: {},
faves: [],
visibleStatuses: [],
visibleStatusesObject: {},
newStatusCount: 0,
maxId: 0,
minVisibleId: 0,
loading: false,
followers: [],
friends: [],
viewing: 'statuses',
userId: 100,
flushMarker: 0
}
}
},
@ -116,6 +132,22 @@ const localProfileStore = new Vuex.Store({
viewing: 'statuses',
userId: 100,
flushMarker: 0
},
media: {
statuses: [],
statusesObject: {},
faves: [],
visibleStatuses: [],
visibleStatusesObject: {},
newStatusCount: 0,
maxId: 0,
minVisibleId: 0,
loading: false,
followers: [],
friends: [],
viewing: 'statuses',
userId: 100,
flushMarker: 0
}
}
},