krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

Browse Source 
# Conflicts:
#	website/client/components/chat/chatCard.vue
#	website/client/components/header/menu.vue
This commit is contained in:
negue
2019-02-07 19:16:10 +01:00
parent 0ca3c1f94d 2eab8b2c8b
commit 0cbd6fb4d7
636 changed files with 21576 additions and 20911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/components/chat/chatMessages.vue
View File

@@ -245,10 +245,7 @@ export default {
// Open the modal only if the data is available
if (profile && !profile.rejected) {
this.$root.$emit('habitica:show-profile', {
user: profile,
startingPage: 'profile',
});
this.$router.push({name: 'userProfile', params: {userId: profile._id}});
}
},
messageLiked (message) {