krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +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

10
website/client/components/header/menu.vue
View File

@@ -2,7 +2,7 @@
div
inbox-modal
creator-intro
profile
profileModal
report-flag-modal
b-navbar.topbar.navbar-inverse.static-top.navbar-expand-lg(type="dark", :class="navbarZIndexClass")
b-navbar-brand.brand
@@ -55,8 +55,8 @@ div
router-link.topbar-dropdown-item.dropdown-item(to="/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac") {{ $t('reportBug') }}
router-link.topbar-dropdown-item.dropdown-item(to="/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a") {{ $t('askAQuestion') }}
a.topbar-dropdown-item.dropdown-item(href="https://trello.com/c/odmhIqyW/440-read-first-table-of-contents", target='_blank') {{ $t('requestAF') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.wikia.com/wiki/Contributing_to_Habitica", target='_blank') {{ $t('contributing') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.wikia.com/wiki/Habitica_Wiki", target='_blank') {{ $t('wiki') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.fandom.com/wiki/Contributing_to_Habitica", target='_blank') {{ $t('contributing') }}
a.topbar-dropdown-item.dropdown-item(href="http://habitica.fandom.com/wiki/Habitica_Wiki", target='_blank') {{ $t('wiki') }}
a.topbar-dropdown-item.dropdown-item(@click='modForm()') {{ $t('contactForm') }}
.currency-tray.form-inline
.item-with-icon(v-if="userHourglasses > 0")
@@ -347,7 +347,7 @@ import logo from 'assets/svg/logo.svg';
import InboxModal from '../userMenu/inbox.vue';
import notificationMenu from './notificationsDropdown';
import creatorIntro from '../creatorIntro';
import profile from '../userMenu/profile';
import profileModal from '../userMenu/profileModal';
import userDropdown from './userDropdown';
import reportFlagModal from '../chat/reportFlagModal';
@@ -358,7 +358,7 @@ export default {
InboxModal,
notificationMenu,
creatorIntro,
profile,
profileModal,
reportFlagModal,
},
data () {