Commit Graph

9193 Commits

Author SHA1 Message Date
Alice Harris 1ac7db7407 in Hall, change admin's description of levels 2014-08-09 21:13:56 +10:00
Adrien Lemaire 46809f1f3e remove migration script 2014-08-09 20:01:24 +09:00
Adrien Lemaire e00ea4c248 add missing sound actions 2014-08-09 19:09:58 +09:00
Adrien Lemaire 0d18bc8a8f add 2 more translatable strings 2014-08-09 18:58:08 +09:00
Adrien Lemaire d7aaec2262 fix bug switch audio wasn't working 2014-08-09 18:57:17 +09:00
Adrien Lemaire 31946ceb6a add music translatable strings 2014-08-09 18:07:35 +09:00
Adrien Lemaire a5f1e30880 fix bug music not playing if music menu not open + integrate daily/todo/reward sounds 2014-08-09 17:29:56 +09:00
Adrien Lemaire dcbd460331 fix audio menu style 2014-08-09 16:58:49 +09:00
Sam Pizzey da6f7a4418 Fix gem text alignment on the menubar.
I'm not much of a frontend guy so I'm not sure if there was some reason
for this one being different, but it throws the alignment off so I
assume it was a mistake.

Fixes #3855
2014-08-08 18:00:12 +01:00
Adrien Lemaire 2cf8083693 improving music menu 2014-08-08 23:37:04 +09:00
Tyler Renelle 431b1da73e Merge pull request #273 from efim/develop
Added notification to challenge prize pop,
2014-08-08 08:04:22 -06:00
Adrien Lemaire 3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
efim 4deb824901 Added notification to challenge prize pop, for issue #2094, until gems get refunded on challenge cancelation. 2014-08-08 02:47:25 +04:00
Tyler Renelle b19649ce37 Merge pull request #3832 from jobywalker/fix-hurts-the-boss
Fix hurts the boss
2014-08-07 10:52:09 -06:00
Tyler Renelle abdc16798d Revert "Change newPassSent to reflect 'Reset Password' not failing on non-existent email"
This reverts commit 2d2c2d27a1.
2014-08-07 08:32:25 -06:00
Alice Harris d3a308bdb6 remove redundant message about moderators (all info now comes from colours and icons) 2014-08-07 19:13:54 +10:00
Thibault Cohen cd40470f28 Update docker file 2014-08-07 00:39:57 -04:00
Joby Walker 8d1b17320a Update to wrap async calls with async.parallel 2014-08-06 21:10:54 -07:00
Alice Harris a8ad9f89e8 reinsert default blue flower https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-07 13:50:29 +10:00
Tyler Renelle b8fe6903b3 Merge pull request #259 from 3onyc/security/prevent-email-disclosure
Change newPassSent to reflect 'Reset Password' not failing on non-existent email.
2014-08-06 18:38:46 -06:00
Tyler Renelle 2d34c1cb9b Merge pull request #3818 from cstyles/null-history
Don't display chart if history is empty (#3691)
2014-08-06 18:38:30 -06:00
Alice Harris 38a49b577f Merge pull request #3849 from Alys/requestAF
change Request Feature link in footer, Tavern link box, CONTRIBUTING.md fixes https://github.com/HabitRPG/habitrpg/issues/3848
2014-08-07 10:13:46 +10:00
Alice Harris e500407466 change Request Feature link in footer, Tavern link box, CONTRIBUTING.md 2014-08-07 09:59:31 +10:00
Tyler Renelle 33b3448e1f fix(backgrounds): borders 2014-08-05 20:53:20 -06:00
Tyler Renelle a083d4cb60 Merge pull request #271 from lemoness/develop
Background Borders
2014-08-05 19:24:39 -06:00
Lemoness 7fe4628f1d Background Borders 2014-08-05 18:08:44 -07:00
Tyler Renelle f3707dfe15 bailey(backgrounds): august backgrounds 2014-08-05 15:16:49 -06:00
Tyler Renelle b73cc259b2 feat(backgrounds): add august bgs set 2014-08-05 15:16:31 -06:00
Tyler Renelle 33b2e8c4fe fix(flower): remove default on flower for now, #1529 @Alys 2014-08-05 13:08:40 -06:00
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
deilann d351f85264 Merge pull request #269 from vIiRuS/develop
Make sleeping in Inn more obvious
2014-08-04 16:40:08 -07:00
Phillip Thelen 4af860ea24 allow partymember sorting to be ascending or descending 2014-08-05 00:31:22 +02:00
Phillip Thelen a5aedf850f Add sorting by username and date joined for partymembers 2014-08-05 00:30:53 +02: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
Matteo Pagliazzi 30dabb319c chore(i18n): update locales 2014-08-04 21:51:39 +02: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
Phillip Thelen 766f663b02 Add skin images with sleeping eyes and make ZZZ more visible 2014-08-03 20:33:21 +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 3356f45f50 chore(i18n): update locales 2014-08-03 15:30:06 +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