Sabe Jones 27e3797307 Merge branch 'develop' into sabrecat/more-modals ...

Conflicts:
	common/locales/en/challenge.json

2015-10-28 14:54:55 -04:00

..

settings

Change formatting of cds modal

2015-09-06 09:57:44 -05:00

achievements.jade

Update habitrpg.com to habitica.com where applicable

2015-08-19 08:00:34 -05:00

amazon-payments.jade

fix(i18n): string for amazon payments

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

buy-gems.jade

fix(amazon-payments): swap colors between paypal and amazon

2015-08-03 18:41:34 +02:00

classes.jade

Put popover in containing span

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

death.jade

refactor(avatar): DRY out paperdolls

2015-08-18 13:07:27 -04:00

drops.jade

Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed

2015-07-25 23:22:35 -05:00

hatch-pet.jade

feat(modals): Hatch Pet modal

2015-10-15 16:34:53 -04:00

index.jade

feat(modals): Won Challenge

2015-10-16 23:36:57 -04:00

invite-friends.jade

Add join existing party button

2015-08-23 14:59:06 -05:00

level-up.jade

fix(sharing): Better social button positioning

2015-10-22 16:00:55 -04:00

limited.jade

Fix issue where card strings required quotes

2015-08-14 08:13:05 -05:00

low-health.jade

fix(warnings): Show modal only once

2015-09-03 11:12:54 -04:00

members.jade

Merge branch 'TheHollidayInn-directives-test-task-focus' into develop

2015-08-31 20:36:07 -05: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(sharing): Pretty Tweet button for level up

2015-10-21 15:23:31 -04:00

raise-pet.jade

feat(modals): Grew Mount

2015-10-15 17:33:20 -04:00

rebirth.jade

Removed 'freeRebirth' modal and its associated strings

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

reroll.jade

fix a minor syntax error when opening reroll modal.

2015-10-22 09:24:04 +02: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(tutorial): Splash screen overhaul complete

2015-08-28 13:58:30 -04:00

won-challenge.jade

feat(modals): Won Challenge

2015-10-16 23:36:57 -04:00