Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: #486 - remove expand button on conversation page fix small bug Add await to login befor redirect to friends timeline Prevent repeated fetching Add space Separate timeline and notification Remove useless codes Fix notification bugs
This commit is contained in:
commit
66680e5471
12 changed files with 62 additions and 53 deletions
|
|
@ -10,13 +10,6 @@ const Notifications = {
|
|||
props: [
|
||||
'noHeading'
|
||||
],
|
||||
created () {
|
||||
const store = this.$store
|
||||
const credentials = store.state.users.currentUser.credentials
|
||||
|
||||
const fetcherId = notificationsFetcher.startFetching({ store, credentials })
|
||||
this.$store.commit('setNotificationFetcher', { fetcherId })
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
bottomedOut: false
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue