Commit Graph

1879 Commits

Author SHA1 Message Date
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
Phillip Thelen 8e8c28725a Add avatar customizations to content API 2016-01-25 21:59:13 -06: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 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
Tyler Smith b5b3a1545b Adding conditional to prevent undefined object error 2016-01-19 19:53:20 -08: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
Matteo Pagliazzi 3a300cb93e add new emails images 2016-01-19 18:30:57 +01: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
Sabe Jones 9b008f71a0 fix(CSS): remove redundant style 2016-01-18 16:13:24 -05:00
Phillip Thelen d0de12abac Add viirus to Community Guidelines page. Fixes #6546 2016-01-18 20:52:27 +01:00
Blade Barringer af19d0d77b fix: Correct stylus comment about modal height 2016-01-17 16:11:42 -06:00
Blade Barringer 0a2c833f9b Merge branch 'tylerxo-develop' into develop 2016-01-17 16:10:59 -06:00
Tyler Smith 1d7c30a06d Fixes for the profile modal
This commit fixes the following:

1. Unintented scrollbar was being created on the .modal container element
2. 15px gap between the footer and scrollable content, creating an odd visual lapse
3. Modal was too wide between 768px and 900px, bleeding off the page.
2016-01-16 16:14:20 -08: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
Joshua Holland c85f994f4c Make .img-rendering-auto apply to descendants 2016-01-16 22:39:40 +00:00
Sighne 4d1daf1c41 Uses a const instead of a variable 2016-01-16 11:11:48 +01:00
Sighne a716ce3fa7 Adds a variable to manage user count 2016-01-16 11:11:48 +01:00
Sighne 5931ddf2ba Decrease margin for the new logo to fit in social pages 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
Sabe Jones 14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Alys fc01104a0d change habitrpg to habitica for PayPal subscription config 2016-01-14 03:08:16 +10:00
Matteo Pagliazzi f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Sabe Jones 9887fe58c4 fix(Stripe): zoom out so gryphon is visible 2016-01-12 16:12:44 -05: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 8bc78af5ae Added specificity to CSS, removed exxtra line 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 6a72027d8b Add subscription conditionals for buying or purchasing gems 2016-01-12 14:58:39 -05:00
AnitaYCheng 5f88aef3ca Add new mixin for purchasing gems. Add new areas that will be conditionally set by user subscription status. 2016-01-12 14:58:39 -05:00
AnitaYCheng 313a18971e Add CSS changes for conditional buy-gem 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