negue 76860fe3f8 Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/modal-notifications ...

# Conflicts:
#	website/client/components/notifications.vue

2018-07-29 20:21:51 +02:00

..

buy.js

check genericPurchase rejections and show error (#10526)

2018-07-20 15:33:23 -05:00

challengeMemberSearch.js

Challenge fixes (#9528)

2017-11-17 17:13:07 -06:00

challengeUtilities.js

Oct 9 fixes (#9174)

2017-10-09 14:40:45 -05:00

groupsUtilities.js

fix(groups): Guild badge fencepost errors

2018-03-12 14:43:39 -05:00

guide.js

Sept 13 fixes (#9035)

2017-09-13 13:31:23 -05:00

notifications.js

move modals to notifications (to open the modals)

2018-07-20 23:56:36 +02:00

openedItemRows.js

[WIP] bootstrap-vue upgrade (#9178)

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

payments.js

Client: use api v4 (#10457)

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

spells.js

Remove Ethereal Surge notification (#10368)

2018-05-18 17:09:00 +02:00

stats.js

Attributes UI Refactoring (#9887)

2018-02-09 16:47:38 -06:00

styleHelper.js

Miscing groups (#9004)

2017-08-29 14:23:09 -06:00