Commit graph

5117 commits

Author SHA1 Message Date
Thibault Cohen
a355d8856d Add docker file 2014-08-05 11:58:01 -04:00
deilann
0871dd074c Merge pull request #3837 from vIiRuS/patch-4
display avatar with closed eyes when sleeping
2014-08-04 16:41:25 -07:00
Alice Harris
34a2e4c07a Merge pull request #3841 from Alys/defaultAvatar
split hairstyles into Base (free) and Set 1 (gems) fixes https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-05 08:14:09 +10:00
benmanley
a6d101202c fix(avatar.jade): change .notBackground to .noBackgroundImage
avatar.jade was applying a class of .notBackground, but the css in
avatar.styl used .noBackgroundImage.

* Changed .notBackground to .noBackgroundImage in avatar.jade and
avatar.styl
* Consolidated css and added more comments
* Amended spacing as Stylus wasn’t compiling correctly
* Removed #profileStable and .pet css as couldn’t find reference to
them anywhere else.
* Commented out styles indicating who is party leader for now. Need a
solution that doesn’t involve background color.
2014-08-04 22:45:10 +01:00
Tyler Renelle
b8b76d6ce9 fix(bailey): tweak 2014-08-04 13:46:25 -06:00
Tyler Renelle
2b2dd97f80 bailey(mobile): update on mobile fix 2014-08-04 13:43:41 -06:00
benmanley
1ba80bd5ea refactor(filter.styl): move clearfix to global modules
Make clearfix css globally available as an @extend.
2014-08-04 14:06:53 +01:00
Matteo Pagliazzi
50d888e7f8 feat(backgrounds): move backgrounds to mixin 2014-08-04 14:41:59 +02:00
Phillip Thelen
49d056fe14 display avatar with closed eyes when sleeping
Display the sleeping version, when users are in the inn.

CAUTION: For this to work, this pull request will have to be merged first: https://github.com/HabitRPG/habitrpg-shared/pull/269
Otherwise the _sleep images are missing. ;)
2014-08-03 20:39:09 +02:00
Matteo Pagliazzi
40fb17fdaf fix(console): remove console.log 2014-08-03 18:32:25 +02:00
Matteo Pagliazzi
1d92ddd645 feat(i18n): add change language button on front page, fix #3530 2014-08-03 18:23:13 +02:00
Matteo Pagliazzi
176b39a1a0 fix(typo) 2014-08-03 12:55:17 +02:00
Matteo Pagliazzi
a30ee4368a fix(notifications): fix drop notifications 2014-08-03 12:28:29 +02:00
Matteo Pagliazzi
9d2723b418 fix(newMessages): ad migration 2014-08-03 10:53:48 +02:00
Alice Harris
e340d584cd split hairstyles into Base (free) and Set 1 (gems) https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 15:56:44 +10:00
Alice Harris
24833de3a7 Merge pull request #3834 from Alys/develop
de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-03 14:19:05 +10:00
Alice Harris
2c013ca73a de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 13:20:51 +10:00
Alice Harris
46dbb0b78a Merge pull request #3799 from Alys/avatarNameContribColour
apply contributor tier color to avatar name - fixes https://github.com/HabitRPG/habitrpg/issues/3735
2014-08-02 13:08:20 +10:00
Alice Harris
2c70c25028 Merge pull request #3792 from Alys/showMoreBackground
show more avatar background (remove Lvl, hide avatar name)
2014-08-02 13:06:07 +10:00
Alice Harris
140c75760a Merge pull request #3825 from Alys/modsColours
add correct styling to moderator names in message above Tavern chat
2014-08-02 12:56:08 +10:00
Alice Harris
d574e99ef4 Merge pull request #3826 from Alys/playerTiers
split Player Tiers table into entries for individual tiers
2014-08-02 12:55:03 +10:00
Jeremy Lee
26741773c9 split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users) 2014-08-02 10:46:16 +10:00
Jeremy Lee
79bd088589 add correct styling to moderator names in message above Tavern chat 2014-08-02 07:28:29 +10:00
Tyler Renelle
04f1459cca bailey(dilatory): forgot announcement on drag'on defeat 2014-08-01 13:44:43 -06:00
Tyler Renelle
38f64c71c2 bailey(august): 2014-07-31 17:37:18 -06:00
Tyler Renelle
745d330ce7 fix(bower): pin angular @beta-11, that ~ was upgrading to beta-17 which
doesn't play well with jQuery right now
2014-07-31 16:28:40 -06:00
Tyler Renelle
e10c04c9bc feat(contribs): start for #3801, update to new badge colors 2014-07-31 12:10:24 -06:00
Tyler Renelle
072881f986 Merge pull request #3793 from Alys/backgroundOrder
display backgrounds in reverse chronological order (most recent at top)
2014-07-30 23:08:12 -06:00
Tyler Renelle
0811f3ddc8 Merge branch 'lemoness-develop' into develop 2014-07-30 17:18:03 -06:00
Tyler Renelle
9efda1d955 fix(bailey): small tweaks to 7/31 (spacing, remove project files) 2014-07-30 17:17:51 -06:00
Lemoness
983aaf9682 7/31 Bailey Announcement 2014-07-30 16:08:55 -07:00
Lemoness
4f5b450b38 Bailey reminder - 7/31 2014-07-30 15:55:17 -07:00
Tyler Renelle
a2df27d7f2 fix(forgot-password): allow aliases (x+y@z.com) in email lookup, fixes #3805 2014-07-29 12:58:31 -06:00
Alice Harris
a87b651caf apply contributor tier color to avatar name 2014-07-29 08:53:23 +10:00
Tyler Renelle
fc910d70a8 Merge pull request #3752 from crookedneighbor/develop
Fixed issue with filters div that is bigger than containing div
2014-07-28 13:12:56 -06:00
James Hsiao
6b8f2b10e1 Merge pull request #3789 from Alys/vagrantChanges
add vagrant installation steps to prevent warnings and errors
2014-07-28 09:54:53 -04:00
Blade Barringer
d7351932aa Merge branch 'develop' of git://github.com/HabitRPG/habitrpg into develop 2014-07-27 19:56:09 -05:00
Alice Harris
a7502e10ea display backgrounds in reverse chronological order (most recent at top) 2014-07-27 14:54:17 +10:00
Alice Harris
1e797a0b05 show more avatar background (remove Lvl, hide avatar name) 2014-07-27 08:41:33 +10:00
vagrant
12a9adcfcd make experimental changes to try to make vagrant install work better 2014-07-26 14:20:14 +10:00
Tyler Renelle
a4ae9332bb feat(block-user): show "blocked" status in an alert, log the user out 2014-07-25 12:14:48 -06:00
Tyler Renelle
6e29facb98 feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness 2014-07-25 12:14:48 -06:00
Tyler Renelle
1808dea9ec bailey(mystery): july mystery item 2014-07-24 19:33:11 -06:00
Tyler Renelle
5c309444e0 fix(coupons): fix to limit 2014-07-22 18:35:55 -06:00
Tyler Renelle
ca31d46e0e tmp(coupons): just export c._id to csv 2014-07-21 22:39:36 -06:00
Tyler Renelle
439828d2b1 feat(coupons): update wording @veeeeeee 2014-07-21 22:27:25 -06:00
Tyler Renelle
bf29a19d33 chore(errors): allow disabling error emails (getting too many
VersionError, which maxes our limit and people can't use "Forgot
Password" feature)
2014-07-21 19:09:05 -06:00
Tyler Renelle
dbd8fddf9d Merge pull request #3769 from thedavemarshall/fix_ci_karma_deps
Pin karma-mocha to 0.1.3, fixes CI
2014-07-21 14:57:48 -06:00
Tyler Renelle
a1f2375b9d feat(subscription): disable "update card" for paypal subscribers 2014-07-21 14:55:36 -06:00
David Marshall
3bbb4e6966 Exactly request karma-mocha 0.1.3, cause tilda was loading 0.1.6 on CI 2014-07-21 13:52:03 -07:00