Commit Graph

12113 Commits

Author SHA1 Message Date
Matt Harrington f129df2e03 adding two deps required for karma 2016-02-24 05:22:31 +00:00
Matteo Pagliazzi d3e1a415a8 require newrelic as the first thing on startup 2016-02-21 22:39:55 +01:00
Matteo Pagliazzi f4d66c7384 config newrelic 2016-02-21 22:30:25 +01:00
Matteo Pagliazzi 4dfb24af6e enable newrelic 2016-02-21 22:02:37 +01:00
Alys c95950c679 recompile spritesheets 2016-02-18 20:07:35 +10:00
Alys 8d106d6d78 Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
2016-02-18 18:56:40 +10:00
Alys f631712a45 deemphasise the warning that spritesheets might be too large for mobile safari - ref https://github.com/HabitRPG/habitrpg/pull/6683#issuecomment-185462180 2016-02-18 18:52:09 +10:00
Alys 3563244cdc change number of users from 1,000,000 to 1,100,000 2016-02-18 12:42:47 +10:00
Sabe Jones bafdfc4ed5 chore(news): Bailey 20160217 2016-02-17 20:59:11 -05:00
Alys ffb5cfd46e Merge pull request #6582 from tylerxo/remove_modal_username
Adds user details to the removal modal
2016-02-18 06:39:31 +10:00
Matteo Pagliazzi 5ca45df602 Revert "tests for deleting old todos"
This reverts commit d9dd031e7f.
2016-02-15 22:12:21 +01:00
Matteo Pagliazzi e6b425d713 Revert "delete completed todos 30/90 days after completion"
This reverts commit 0a9391ea75.
2016-02-15 22:11:03 +01:00
Sabe Jones f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Blade Barringer d0ac43592f chore(i18n): update locales 2016-02-14 21:13:40 -06:00
Sabe Jones 00f98d90b6 Merge pull request #6705 from HabitRPG/sabrecat/chat-cutoff
No chat notifs from big Guilds
2016-02-12 13:22:10 -06:00
Sabe Jones b4b64dcf19 fix(performance): no chat notifs from big Guilds 2016-02-12 13:18:30 -05:00
Sabe Jones a74279f629 Merge pull request #6702 from HabitRPG/sabrecat/fix-newbie-guild
Don't send chat notifs for Newbies Guild
2016-02-11 20:48:17 -06:00
Sabe Jones 67929f3a96 fix(performance): don't send chat notifs for Newbies Guild 2016-02-11 21:29:32 -05:00
Sabe Jones fdd170c977 Merge pull request #6698 from HabitRPG/sabrecat/elastic-beanstalk
AWS Elastic Beanstalk
2016-02-11 11:38:12 -06:00
Sabe Jones 81098d5fe8 fix(static): update Android app image 2016-02-10 18:48:31 -05:00
Sabe Jones b228aa3f89 feat(elastic-beanstalk): deploy extensions 2016-02-10 16:24:24 -05:00
Alys e425e75b9d change Beast Master text from insanely to incredibly - partial fix for https://github.com/HabitRPG/habitrpg/issues/6685 2016-02-10 07:45:22 +10:00
Taldin b293d7acc2 Fixes #6356 (gryphon avatar clipping)
Updated gryphon mount graphics.
2016-02-09 10:27:10 -08:00
Alys e7c88d6e5d set purchased.plan.dateUpdated during cron if it hasn't been set - ref https://github.com/HabitRPG/habitrpg/issues/6682 2016-02-09 20:52:50 +10:00
Alys 13c06756e3 Merge pull request #6586 from anowlcalledjosh/front_page_image_alts
#6560: Add alt attributes for images on front page
2016-02-09 18:15:47 +10:00
Alys badebe8bcc adjust rebirth description to specify that you must change class to buy class-specific gear 2016-02-09 11:52:07 +10:00
Sabe Jones 884e3573a6 fix(deploy): junk commit for Heroku 2016-02-08 17:25:01 -05:00
Sabe Jones 75b95bfd67 Merge pull request #6681 from HabitRPG/sabrecat/pets-201602
Monkey Pet Quest
2016-02-08 15:30:55 -06:00
Sabe Jones e1b13db6e8 feat(quests): pets 201602
Also enables the Valentine's Day card for selection in the Market.
2016-02-08 16:20:05 -05:00
Alys 7aca788ce8 adjust subscription benefit task history information 2016-02-07 22:24:32 +10:00
Alys 2e79c5b5b8 create script to mark the Enchanted Arrmoire as not being empty for users who logged in recently and who do not have all gear 2016-02-07 16:07:33 +10:00
Sabe Jones a3251ac9a0 fix(groups): DRY profile name logic 2016-02-05 15:26:15 -05:00
Sabe Jones dd3918436f fix(groups): don't show HP in Guilds 2016-02-05 15:19:23 -05:00
Sabe Jones e0effcdf5f Merge pull request #6626 from taldin/party_health
Add HP to party page
2016-02-04 15:56:39 -06:00
Sabe Jones b5bb73347a Merge pull request #6631 from anowlcalledjosh/icon_zoom
Make task help icons consistent across browsers
2016-02-04 15:51:49 -06:00
Alys 2d6a8e4b6a renumber armoire Jester Set - fixes https://github.com/HabitRPG/habitrpg/issues/6658 2016-02-05 06:55:29 +10:00
Sabe Jones 963b4849d2 Merge pull request #6647 from HabitRPG/sabrecat/armoire-201602
BGs and Armoire 201602
2016-02-03 13:56:28 -06:00
Sabe Jones d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Tyler Smith 065238525c Removing extra class in favor of .lead 2016-02-02 10:22:17 -08:00
Taldin 51e579cb6a Update for cleaner code.
Per Alys and crookedneighbor's suggestion.
2016-02-02 10:01:08 -08:00
Alys a05f6c46d6 add name for mysterySet201601 (Champion of Resolution Set) - fixes https://github.com/HabitRPG/habitrpg/issues/6642 2016-02-02 15:48:28 +10:00
Sabe Jones 8ee535b4fa Merge pull request #6636 from HabitRPG/sabrecat/end-wonderland
End Winter Wonderland 2015-16
2016-02-01 16:14:32 -06:00
Sabe Jones 0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Taldin 12749ba497 fixed it so infinite decimals wouldn't print
Added .toFixed(1) call.
2016-02-01 10:14:42 -08:00
Matteo Pagliazzi d9dd031e7f tests for deleting old todos 2016-01-31 21:24:59 +01:00
Matteo Pagliazzi 0a9391ea75 delete completed todos 30/90 days after completion 2016-01-31 19:45:30 +01:00
Josh Holland f7163519c1 Make task help icons consistent across browsers
The zoom CSS property isn't supported by Firefox, and nor is
vertical-align: -webkit-baseline-middle. font-size: 1.5em has the same
effect, and vertical-align: middle ensures that the tooltip doesn't
overlap with the icon.
2016-01-31 15:41:00 +00:00
Alys ea57808176 remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed) 2016-01-31 18:25:37 +10:00
Alys 9b9072be45 removed mention of cookies from message about clearing local storage (cookies are not removed) 2016-01-31 18:16:26 +10:00
Taldin e08f77651b Add HP to party page
Party page now displays each party member's health next to their name
(healers don't have to click on each party member to see their health)
2016-01-30 16:32:10 -08:00