Phillip Thelen 6523b6b342 Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username ...

# Conflicts:
#	package.json
#	website/client/components/chat/autoComplete.vue
#	website/client/components/chat/chatCard.vue
#	website/client/components/groups/chat.vue
#	website/server/controllers/api-v3/chat.js
#	website/server/controllers/api-v3/members.js
#	website/server/controllers/api-v4/members.js

2019-09-19 16:08:13 +02:00

..

chat.vue

Enable keyboard shortcuts for autocomplete @username selection in chat (#11235)

2019-07-14 17:55:50 +02:00

communityGuidelines.vue

add markdown-formatting link - hide textarea if guidelines not accepting - chat ui

2019-03-09 21:10:20 +01:00

createPartyModal.vue

Usernames Misc: Bulk Email and New Party Modal (#10898)

2018-12-11 14:47:50 -06:00

discovery.vue

No matching Guilds/Challenges message (#10744)

2018-10-13 20:19:03 +02:00

group.vue

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

2019-09-19 16:08:13 +02:00

groupFormModal.vue

fix(groups): display correct messages in two places

2018-07-06 13:21:28 -05:00

groupGemsModal.vue

[WIP] bootstrap-vue upgrade (#9178)

2017-11-08 18:40:37 +01:00

groupPlan.vue

New Payments Buttons (#11045)

2019-03-11 18:23:47 +01:00

index.vue

Oct 11 fxes (#9181)

2017-10-13 06:40:53 +02:00

inviteModal.vue

fix(tests): linting & more expects

2018-11-27 15:40:40 +01:00

membersModal.vue

fix(challenges): check if subscribed only when in group

2019-04-07 15:57:11 +02:00

myGuilds.vue

No matching Guilds/Challenges message (#10744)

2018-10-13 20:19:03 +02:00

newPartyModal.pug

remove jade, upgrade pug (#9940)

2018-02-04 14:39:46 +01:00

participantListModal.vue

View participant list of active quest (#10531)

2018-07-30 16:04:04 +02:00

publicGuildItem.vue

FIX Guild suggestion incorrectly identifies account as new #11159 (#11197)

2019-05-31 12:26:15 +02:00

questDetailsModal.vue

Staging fixes (#9804)

2018-01-15 10:21:08 -07:00

questSidebarSection.vue

hides item count in quest sidebar section for non-participants (#11183)

2019-05-20 11:33:47 +02:00

sidebar.vue

No matching Guilds/Challenges message (#10744)

2018-10-13 20:19:03 +02:00

startQuestModal.vue

Re-enable start quest button (#10532)

2018-07-30 16:02:17 +02:00

tavern.vue

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

2019-09-19 16:08:13 +02:00