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

..

boss.jade

Revert #4291

2014-11-29 09:16:44 -07:00

challenge-box.jade

add pipes in front of plain text to prevent "Warning: missing space before text for line nn of jade file ..."

2014-10-09 15:56:06 +10:00

challenges.jade

Fixed padding on challenges filter box

2014-12-07 20:20:42 -06:00

chat-box.jade

Merge pull request #4205 from Alys/commGuide-accept-before-post-2014-11-01

2014-11-08 12:02:59 +10:00

chat-message.jade

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

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

create-group.jade

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

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

group.jade

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

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

hall.jade

remove admin checkbox from Hall - not needed now that level/tier 8 and 9 automatically turn on hero.contributor.admin

2014-09-05 21:17:57 +10:00

index.jade

Added last guild link, corrected hall links

2014-12-14 20:10:42 -06:00

tavern.jade

fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231

2014-12-16 14:17:38 -07:00