Commit Graph

1364 Commits

Author SHA1 Message Date
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
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
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 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 2d6a8e4b6a renumber armoire Jester Set - fixes https://github.com/HabitRPG/habitrpg/issues/6658 2016-02-05 06:55:29 +10:00
Sabe Jones d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05: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 0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Matteo Pagliazzi 0a9391ea75 delete completed todos 30/90 days after completion 2016-01-31 19:45:30 +01: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
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 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 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 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
Josh Holland 7cc618b32c Add alt attributes for images on front page
Some images have an empty alt attribute (alt=""); this isn't a mistake,
it's part of the HTML spec for images that don't add any information.
Debatably, some images marked up as such with this commit do add
information, but that information (e.g. what the Habitica UI looks
like from the intro image) isn't likely to be useful to someone not
able to see.

It's also difficult to convey purely visual concepts like the arrows
with alt-text, especially as the arrows themselves are not images and
therefore cannot have an alt attribute.

Fixes #6560.
2016-01-26 17:35:35 +00: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
Sabe Jones f872547264 chore(news): Bailey 2016-01-20 2016-01-20 16:32:12 -05:00
David Barnett 7a29542815 Open links from task notes into new browser window/context (Fixes #5622) 2016-01-19 11:01:41 -08:00
Sabe Jones 95ee19b4ca Merge branch 'taldin/faq-wiki-links' into develop
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2016-01-19 13:50:35 -05:00
Blade Barringer 0b5a8bf76d chore(i18n): update locales 2016-01-18 18:24:44 -06:00
Sabe Jones c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
Alys fe58129cd3 remove Completion from Octopus quest text - ref https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-172600908 2016-01-19 06:18:49 +10:00
Alys fd62e39f20 fix spelling mistake: crystaline -> crystalline 2016-01-19 04:47:50 +10:00
Sabe Jones 23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Luveluen 5315cc9055 Update character.json to separate optOut into two translation strings
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
Georgi Gardev e761315c74 Remove tooltip for 'reverse chat messages' checkbox
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -06:00
Blade Barringer d02c3d321e refactor: Remove compiled spritesheet from source control 2016-01-14 18:03:14 -06:00
Sabe Jones b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00
Sabe Jones 14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Sabe Jones 81842bbee1 fix(subscription): visual and wording tweaks 2016-01-12 15:29:10 -05:00
Sabe Jones 2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
AnitaYCheng 2a8eb9f476 Added translation strings for conditional buy-gems modal 2016-01-12 14:58:39 -05:00
Sabe Jones dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option
Add option to reverse chat order
2016-01-11 12:55:28 -06:00
Sabe Jones 7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2016-01-11 13:48:01 -05:00