Show favoriting and repeating users in hilighted status
Merged
requested to merge brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users into develop
1 unresolved thread
Fixed some issues in brenden's branch, including i18n and overflowing and cleaning up some code.
Merge request reports
Activity
257 262 return this.status.statusnet_html 258 263 } 259 264 return this.status.summary_html + '<br />' + this.status.statusnet_html 265 }, 266 combinedFavsAndRepeatsAvatars () { 267 // Use the status from the global status repository since favs and repeats are saved in it 268 const combinedAvatars = [].concat(this.statusFromGlobalRepository.favoritedBy, this.statusFromGlobalRepository.rebloggedBy).filter(_ => _) changed this line in version 2 of the diff
added 31 commits
-
da08388d...0f7f685c - 30 commits from branch
develop
- b1bd5bd0 - Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
-
da08388d...0f7f685c - 30 commits from branch
mentioned in commit a954f56e
Please register or sign in to reply