Blade Barringer 7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat ...

Conflicts:
	views/options/social/chat-message.jade

2014-12-18 21:55:50 -06:00

..

payments

Revert "refactor(iap): use env var for google IAP". orders are being

2014-12-16 13:07:01 -07:00

auth.js

refactor(facebook): use async.auto to collect multiple vars, cleaner

2014-12-16 16:30:51 -07:00

challenges.js

feat(challenges): optional checkbox on group create/edit:

2014-12-12 11:37:00 -07:00

coupon.js

fix(memleak): possible improvements to leaked vars #4079

2014-10-06 17:59:07 -06:00

dataexport.js

refactor(tasks) improve UI consistency

2014-11-27 10:32:57 +00:00

groups.js

Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat

2014-12-18 21:55:50 -06:00

hall.js

refactor(tasks) improve UI consistency

2014-11-27 10:32:57 +00:00

members.js

fix(gifts): allow gifting 0<gift<1 (cc @Alys @crookedneighbor)

2014-12-03 19:00:49 -07:00

user.js

fix(loggly): typo

2014-12-13 14:57:05 +01:00