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

# Conflicts:
#	website/client/components/chat/chatCard.vue
#	website/client/components/chat/chatMessages.vue
#	website/common/locales/en/messages.json
#	website/server/libs/slack.js

2018-09-22 19:18:08 +02:00

..

auth.js

Logout Changes #9915 (#10022)

2018-07-12 15:07:08 -05:00

challenges.js

Added prize back after deleting challenge (#10631)

2018-08-25 11:15:00 -05:00

chat.js

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

2018-06-25 18:47:47 +02:00

common.js

Client: use api v4 (#10457)

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

guilds.js

Client: use api v4 (#10457)

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

hall.js

Client: use api v4 (#10457)

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

index.js

feat(world-boss): Rage Strike support

2018-02-16 21:18:51 +00:00

members.js

Client: use api v4 (#10457)

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

notifications.js

Client: use api v4 (#10457)

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

party.js

Client: use api v4 (#10457)

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

quests.js

Fix new party member cannot join pending quest (#10648)

2018-09-09 11:56:51 +02:00

shops.js

Added amoire food to user immediately (#10596)

2018-08-17 06:29:32 -05:00

snackbars.js

Oct 19 fixes (#9234)

2017-10-20 15:22:13 +02:00

tags.js

Client: use api v4 (#10457)

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

tasks.js

reload completed tasks after resync is finished - always reload completed tasks (#10614)

2018-08-24 15:04:59 -05:00

user.js

Client: use api v4 (#10457)

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

world-state.js

Client: use api v4 (#10457)

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