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

..

achievements.jade

fix space issues: contrib modal, challenge list

2014-02-20 20:33:10 -05:00

buy-gems.jade

refactor(payments): move payments into it's own service, out of rootCtrl

2014-12-03 14:17:08 -07:00

classes.jade

make it really obvious that you can choose a class later

2014-07-13 16:09:43 +10:00

death.jade

refactor(bs3): css

2014-02-09 16:16:43 +01:00

drops.jade

release pets feature

2014-09-29 13:35:38 -07:00

index.jade

refactor(tasks) improve UI consistency

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

invite-friends.jade

refactor(tasks) improve UI consistency

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

limited.jade

feat(valentine): valentine event

2014-02-13 18:40:33 -07:00

members.jade

Made reset flag count button red

2014-12-11 21:49:42 -06:00

new-stuff.jade

feat(news): move old news to /static/old-news, better use of content space

2014-12-03 13:49:24 -07:00

quest-rewards.jade

changed to style sheet

2014-12-12 10:26:55 -08:00

quests.jade

Quest completion screen floats to right on everything but xs

2014-12-14 08:32:05 -06:00

rebirth.jade

adding flag, allowing free rebirth purchase, adding modal

2014-05-11 08:01:15 -07:00

reroll.jade

feat(event-tracking): start adding some client-side GA event-tracking

2014-02-10 11:33:40 -07:00

settings.jade

feat(block-user): show "blocked" status in an alert, log the user out

2014-07-25 12:14:48 -06:00