Commit Graph

12082 Commits

Author SHA1 Message Date
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
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
Matteo Pagliazzi
9b09848655 revert change to static files testing 2016-01-30 19:42:09 +01:00
Matteo Pagliazzi
6851a39dec test no-cache instead of max-age=0 2016-01-30 19:24:56 +01:00
Alys
376e1b7491 Merge pull request #6617 from murraybd/develop
Add in missing word your to passMan phrase.
2016-01-30 08:49:08 +10:00
Brian Murray
4b5e3cd4fb Update front.json 2016-01-29 14:24:14 -08:00
Brian Murray
e48c47fbec Revert change to en_GB since the locales files don't get updated through
GitHub.
2016-01-29 14:20:06 -08:00
Sabe Jones
b7ee6f7da0 fix(event): award old Robes to new users, not 2016 2016-01-29 15:12:07 -05:00
Brian Murray
2799905169 Add in missing word your to passMan phrase. 2016-01-29 11:37:51 -08:00
Sabe Jones
5512be01cd fix(subscription): clarify credits wording 2016-01-29 13:09:40 -05:00
Sabe Jones
9c809ce2e3 Merge pull request #6612 from HabitRPG/sabrecat/birthday-2016
Habit Birthday 2016
2016-01-29 11:57:48 -06:00
Sabe Jones
91c6ce27c5 feat(event): Habit Birthday 2016
Also adds AWS Elastic Beanstalk local config file to .gitignore.
2016-01-28 17:16:01 -05:00
Sabe Jones
d7782584db chore(news): Bailey 20160126 2016-01-26 20:31:43 -05:00
Sabe Jones
f6468a1520 Merge pull request #6587 from HabitRPG/sabrecat/mystery-201601
January 2016 mystery items
2016-01-26 14:47:08 -06:00
Sabe Jones
e7ee38758f feat(subscription): update migration 2016-01-26 15:30:36 -05:00
Sabe Jones
953c504867 feat(subscription): mystery gear strings 2016-01-26 15:26:11 -05:00
Sabe Jones
c6d6e73ae6 feat(subscription): January 2016 mystery items 2016-01-26 15:20:55 -05:00
Alys
6c106ad644 fix name of Base Hatching Potion quest reward - https://github.com/HabitRPG/habitrpg/pull/6583 2016-01-26 18:42:22 +10:00
Phillip Thelen
8e8c28725a Add avatar customizations to content API 2016-01-25 21:59:13 -06:00
Alys
0d06d765f2 Merge pull request #6569 from shellbot/quest-accept-highlight
Color code quest accepted/rejected text
2016-01-25 08:13:59 +10:00
Shellbot
7d0ad86c43 Color code quest accepted/rejected text 2016-01-22 21:56:39 +00:00
Blade Barringer
71c4a0de32 Merge pull request #6564 from KristianTashkov/fix-vagrant
Return enable symlinks in vagrant and use npm@3
2016-01-22 09:06:43 -06:00
Kristian Tashkov
2fec986006 Return enable symlinks in vagrant and use npm@3 2016-01-21 23:28:28 +02:00
Sabe Jones
f872547264 chore(news): Bailey 2016-01-20 2016-01-20 16:32:12 -05:00
Sabe Jones
274157d21d Merge branch 'tylerxo/menu-error-fix' into develop 2016-01-20 14:34:55 -05:00
Sabe Jones
016b080836 Merge branch 'anowlcalledjosh/add-task-fix' into develop 2016-01-20 14:27:21 -05:00
Sabe Jones
af53285e01 Merge branch 'proarunas/fix-css-bugs' into develop 2016-01-20 14:17:39 -05:00
Tyler Smith
f3d6c62484 More closely matching coding style within the file 2016-01-19 19:57:11 -08:00