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

..

api.vue

Added explanatory webhook text to UI. (#10782)

2018-10-26 16:46:36 +02:00

dataExport.vue

New client settings (#8886)

2017-07-20 12:01:00 -06:00

deleteModal.vue

fix(deletion): show feedback for social accounts (#10467)

2018-06-27 19:12:18 +02:00

index.vue

New client settings (#8886)

2017-07-20 12:01:00 -06:00

notifications.vue

Email subs reminders release (#11216)

2019-06-10 22:37:30 +02:00

promoCode.vue

remove auth with url

2018-08-15 10:40:25 +02:00

resetModal.vue

Client: use api v4 (#10457)

2018-06-21 21:25:27 +02:00

restoreModal.vue

Added exp reset when changing level (#9611)

2017-11-30 15:45:26 -06:00

site.vue

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

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

subscription.vue

Better group plan and subscription cancellation (#11132)

2019-05-08 21:37:02 +02:00

usernameForm.vue

fix(modals): button styling

2018-11-02 16:48:35 -05:00

verifyUsername.vue

feat(usernames): invite by username

2018-11-07 15:00:22 -06:00