Commit Graph

1165 Commits

Author SHA1 Message Date
Matteo Pagliazzi 9ef4b6409e Merge branch 'develop' into api-v3 and move new relic to new location 2016-02-22 11:43:35 +01:00
Matteo Pagliazzi cc31d266e4 port locals middleware, add some tests and a lot of fixes 2016-02-19 18:42:03 +01: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
Sabe Jones f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Sabe Jones 81098d5fe8 fix(static): update Android app image 2016-02-10 18:48:31 -05: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
Sabe Jones 884e3573a6 fix(deploy): junk commit for Heroku 2016-02-08 17:25:01 -05: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
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 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
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
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
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
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
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
Tyler Smith ff2ebe46b8 Fixing jade and angular syntax miscues 2016-01-26 07:59:31 -08:00
Tyler Smith 588fdc6cad Properly chaining classes in jade 2016-01-26 07:52:35 -08:00
Tyler Smith fd157785f4 Adding text-center to container rather than individual elements 2016-01-25 17:42:50 -08:00
Tyler Smith 77cfc99b59 Adding user details to the removal modal 2016-01-25 17:37:18 -08:00
Shellbot 7d0ad86c43 Color code quest accepted/rejected text 2016-01-22 21:56:39 +00:00
Sabe Jones f872547264 chore(news): Bailey 2016-01-20 2016-01-20 16:32:12 -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
Josh Holland 77342e5790 Fix 'add task' button jumping around 2016-01-19 20:56:06 +00:00
Sabe Jones c4acd262eb Merge pull request #6476 from Sighne/sighne/upgrade-amount-users
#6460: upgrade amount of users
2016-01-19 13:41:03 -06:00
Sabe Jones 2848f5d709 Merge branch 'NathanMaton/fix-homepage-text' into develop
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2016-01-19 13:59:49 -05: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
Jason Vinson 2989057dd3 Fix for issue #5182: Allow cancel editing group infobox 2016-01-18 22:39:06 -06:00
Sabe Jones d44ff94acb Merge pull request #6547 from vIiRuS/guidelinespage
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 15:37:58 -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
Phillip Thelen d0de12abac Add viirus to Community Guidelines page. Fixes #6546 2016-01-18 20:52:27 +01:00
Joshua Holland e98dc1405b Fix rendering of front page news icons
Rendering was 'pixelated', is now 'auto'.
2016-01-16 22:43:29 +00:00
Sighne a716ce3fa7 Adds a variable to manage user count 2016-01-16 11:11:48 +01:00
Sighne ffe1dd6c6a Upgrade amount of users where I missed and add Discover logo on social pages 2016-01-16 11:11:48 +01:00
Sighne a9f10380b9 Upgrades amount of users on static page 2016-01-16 11:11:48 +01:00
Sighne de3d4ae8e7 Adds Discover magazine logo 2016-01-16 11:11:48 +01:00
Sabe Jones 23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Taldin 3b3c1fead7 Moved the Habitica Wiki link down to the bottom
Per Lemoness' request.
2016-01-15 09:48:16 -08: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 24e08676db Add icon for pinned Safari tabs
Fixes #6451
Closes #6522
2016-01-14 20:32:51 -06:00
Georgi Gardev e761315c74 Remove tooltip for 'reverse chat messages' checkbox
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -06:00
Josh Holland a0b264f686 Align progress and help icons on to-dos column
Fixes #6474

As per #6474, progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.

Move inline styles on task column icons to a class

This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.

In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
2016-01-14 20:24:09 -06:00
Sabe Jones b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00