Merge branch 'develop' into release
This commit is contained in:
@@ -65,12 +65,6 @@
|
||||
<!-- eslint-enable vue/no-use-v-if-with-v-for -->
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="data && data.nextRewardAt"
|
||||
class="col-12 text-center"
|
||||
>
|
||||
<h4>{{ $t('countLeft', {count: data.nextRewardAt - user.loginIncentives}) }}</h4>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div
|
||||
|
||||
@@ -282,11 +282,15 @@ export default {
|
||||
mounted () {
|
||||
const links = this.$refs.markdownContainer.getElementsByTagName('a');
|
||||
for (let i = 0; i < links.length; i += 1) {
|
||||
const link = links[i];
|
||||
if (links[i].getAttribute('href').startsWith('/profile/')) {
|
||||
let link = links[i].pathname;
|
||||
|
||||
// Internet Explorer does not provide the leading slash character in the pathname
|
||||
link = link.charAt(0) === '/' ? link : `/${link}`;
|
||||
|
||||
if (link.startsWith('/profile/')) {
|
||||
links[i].onclick = ev => {
|
||||
ev.preventDefault();
|
||||
this.$router.push({ path: link.getAttribute('href') });
|
||||
this.$router.push({ path: link });
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -571,6 +571,8 @@ export default {
|
||||
async getMembers () {
|
||||
this.members = this.$store.state.memberModalOptions.viewingMembers;
|
||||
|
||||
await this.searchMembers('');
|
||||
|
||||
const { groupId } = this;
|
||||
if (groupId && groupId !== 'challenge') {
|
||||
const invites = await this.$store.dispatch('members:getGroupInvites', {
|
||||
|
||||
Reference in New Issue
Block a user