Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png

2015-07-24 16:11:51 -05:00

..

achievements.jade

feat(Armoire): WIP

2015-06-02 17:42:14 -05:00

amazon-payments.jade

fix(i18n): string for amazon payments

2015-07-17 15:28:55 +02:00

buy-gems.jade

amazon payments: switch to green button

2015-07-15 20:07:17 +02:00

classes.jade

Put popover in containing span

2015-06-10 08:18:08 -05:00

death.jade

WIP(death): Draft with decal

2015-07-21 14:39:08 -05:00

drops.jade

feat(Armoire): Improved counter

2015-06-04 15:45:55 -05:00

index.jade

feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP

2015-06-30 17:59:30 +02:00

invite-friends.jade

Introducing a class for buttons allowing wrapping

2015-07-10 02:33:09 +05:00

limited.jade

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-02-12 13:32:23 -06:00

members.jade

amazon payments: switch to green button

2015-07-15 20:07:17 +02:00

new-stuff.jade

Ensure Bailey always displays the most recent message.

2015-03-31 20:38:15 -04:00

quest-rewards.jade

Hide row if not part of reward; add one-time bindings

2015-06-17 18:57:15 -05:00

quests.jade

feat(quests): Invite party button

2015-07-21 15:25:34 -05:00

rebirth.jade

Removed 'freeRebirth' modal and its associated strings

2015-06-13 14:18:03 -04:00

reroll.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

settings.jade

add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it

2015-03-07 18:39:43 +10:00

welcome.jade

feat(tour): Revised intro tutorial

2015-05-29 14:03:42 -05:00