Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,491 Commits 64 Branches 1,256 Tags
2ed4df0b7c3af00653b71fcdb27fc2bcbee5c0b7
Commit Graph

309 Commits

Author SHA1 Message Date
Pizilden 67b396bf16 Added Lunasol Theme (#9635) 2018-01-12 16:22:57 -06:00
borisabramovich86 9e1a262f96 Fixes Purchase contributor equipment (fixes #9179) (#9306) 
* Able to see all non class related items in market

* Fix lint errors

* Able to see all non class related items in market

* Fix lint errors

* add test for showing contributor gear

* Added previously owned items to test with eslint exception
 2018-01-12 16:16:28 -06:00
MathWhiz 06dd9fe859 Add SpacePenguin's Theme (#9237) 
* Add SpacePenguin's Theme

* Fix files
 2018-01-12 16:15:55 -06:00
Sabe Jones b2c1c9d9dc Merge branch 'release' into develop 2018-01-12 21:54:20 +00:00
SabreCat 043a6cd4ba chore(shops): update Featured Items 2018-01-12 21:25:09 +00:00
Sabe Jones b53c03bca8 Merge branch 'release' into develop 2018-01-10 16:42:13 +00:00
SabreCat 3d5d5da933 feat(content): Pept quest 2018-01-10 16:31:56 +00:00
Pizilden daa796454c Added Farvoid Theme (new, clean branch) (#9634) 
* Added Farvoid Theme

* Updated generic.json and index.js

* fix(merge): address conflicts
 2018-01-05 14:34:19 -06:00
Julius Jung 4576353f26 inital commit to add confirmation to animalEars (#9666) 2018-01-05 13:26:45 -06:00
SabreCat 71cb4e8510 feat(content): enable Wintery Skins and Hair 2018-01-04 21:35:26 +00:00
SabreCat 88e6b2da7c feat(content): Armoire and BGs 2018-01 
Also ends New Year's hat fanciness
 2018-01-02 23:49:50 +00:00
SabreCat d57c525fab feat(event): New Year's 2017-18 2017-12-31 02:34:52 +00:00
SabreCat 5220cc1bf3 fix(market): add broken Armoire items 2017-12-22 21:56:39 +00:00
Sabe Jones a20c1ba751 Include seasonal gear in Market class lists (#9739) 
* fix(shops): include seasonal gear in Market class lists

* fix(market): display non-seasonal broken special items
Also fixes a bug where if a current seasonal item was broken, it would show up twice.
 2017-12-22 15:29:51 -06:00
SabreCat 4764f115b1 feat(content): Subscriber Items Dec 2017 2017-12-21 23:10:54 +00:00
SabreCat 9538c86d02 fix(seasonal): include current season gear in Shop 2017-12-20 18:31:10 +00:00
SabreCat 98bb6fd7ce feat(content): Winter Wonderland 2017-18 
and Starry Night Hatching Potions
 2017-12-20 02:23:11 +00:00
SabreCat e229bc5042 Merge branch 'release' into develop 2017-12-15 05:37:04 +00:00
Sabe Jones 4f0ce77205 Winter Quest Bundle (#9718) 
* feat(content): Winter Quest Bundle

* fix(sprites): revert spritesheet changes
 2017-12-14 22:40:42 -06:00
Keith Holliday 05640f513e Added test to recreate early cron issue (#9668) 
* Added test to recreate early cron issue

* Gave user extra time based on reverse timezone change
 2017-12-14 09:09:11 -06:00
Julius Jung ec179182e7 submit initial working solution to disallow selling of Saddle (#9663) 2017-12-05 14:22:59 -06:00
Pizilden b886d7bb33 Added MAFL Theme (#9633) 2017-12-05 14:20:58 -06:00
Pizilden a8f8f4f544 Added Pizilden's Theme (#9632) 2017-12-05 14:14:45 -06:00
negue c56c69d464 market fixes 28th nov (#9593) 
* list special gear by the `specialClass` - fixes #9485

* only disable the currencly label + value not the amount input - fixes #9492

* disable transformations on equipment previews - fixes #9497

* show boss strength - fixes #9522

* pin time travelers animals - closes #9382

* clean up + package-lock ?

* fix quest info
 2017-12-05 14:09:34 -06:00
Julius Jung d4bc7c77a9 Check previous gear owned before purchasing next level gear (fixes #9071) (#9466) 
* add another check if previous gear is owned

* respect gear purchase order

* catch error with miscalculation of equipment number floor

* add integration test for proper equipment purchasing order

* fix syntax

* add 'previousGearNotOwned' string

* rewrite logic for different starting levels for wep vs others

* separate and add tests for armor and weapon

* rename variable for clarification

* skip check if itemIndex is NaN

* change obscure NaN check for readability

* change conditional from checking NaN to Int
 2017-12-05 13:58:12 -06:00
Sabe Jones 9e8807c40d Armoire and Backgrounds December 2017 (#9659) 
* feat(content): Armoire and Backgrounds 2017/12

* chore(sprites): compile

* chore(news): Bailey
 2017-12-05 19:29:00 +00:00
Sabe Jones 9bfbeaf93e Armoire and Backgrounds December 2017 (#9659) 
* feat(content): Armoire and Backgrounds 2017/12

* chore(sprites): compile

* chore(news): Bailey
 2017-12-05 13:25:52 -06:00
Sabe Jones 56d09411d9 Merge branch 'release' into develop 2017-12-01 00:31:23 +00:00
Sabe Jones 5b06b28c97 chore(event): end Thunderstorm Potions 2017-12-01 00:30:06 +00:00
negue f1e200c0f5 autofix pinned seasonal gear - fixes #9448 (#9570) 
* auto-remove officialPinned item from userPinned-array on pinning

* hide event limited message if an item was already owned by the user
 2017-11-28 09:11:40 +01:00
Esben Sparre Andreasen b62f08d500 Misc. bug fixes from lgtm.com (2) (#9474) 
* Remove dead branch of ternary: `gift` is always truthy here

Problem found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/amazonPayments.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x5a22f31110a55091:1

* Remove superfluous argument, preenUserHistory only takes two args

Problem found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/cron.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf16a045ecabb07f6:1

* Cleanup: remove useless assignments

Problems found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/store/actions/shops.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf782ed2cf920441%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/app.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x172c1dda85e84dc8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/settings/site.vue#x9b3afee802a3a8f8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/selectMembersModal.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x1fbc2a3d62facd70:1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/common/script/libs/taskClasses.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x41ce0e121a4defee:1

* Fix online editor whitespace change.
 2017-11-27 19:51:25 -06:00
Keith Holliday 20a99e526d Should do diff week fix (#9551) 
* Fixed week difference when changing year

* Added year switchover test

* Fixed start date setting
 2017-11-20 12:22:01 -06:00
SabreCat 2a5e9c0780 feat(event): Turkey Day 2017 
and (content) November Subscriber Items
 2017-11-17 22:21:05 +00:00
MathWhiz 08ccd595f2 Add quantity information when purchasing items (#9481) 2017-11-16 10:08:11 +01:00
Joseti 229fd06ee3 Removed "Tag list in tasks starts collapsed" settings and strings (#9406) 2017-11-15 17:37:15 +01:00
SabreCat dbc5b9f850 feat(content): Yarn Pet Quest 2017-11-15 00:53:10 +00:00
Keith Holliday c43ca62bc4 Added check for balance with respect to quantity (#9469) 2017-11-14 16:55:08 -07:00
SabreCat 50d3226a86 feat(content): change to Thunderstorm Hatching Potions 2017-11-07 22:02:46 +00:00
SabreCat f8876fe055 feat(content): Backgrounds and Armoire 2017-11 
End Habitoween and Fall Festival
 2017-11-03 01:56:15 +00:00
Keith Holliday 3e37941e0a Bulk stats (#9260) 
* Reorganized stats

* Organized allocation common code

* Added bulk allocate to common

* Added allocate bulk route

* Fixed structure and lint

* Fixed import and apidoc
 2017-10-31 12:57:44 -06:00
SabreCat d5cedaa925 feat(event): Habitoween 2017-10-30 20:40:29 +00:00
Keith Holliday 6bc70ca471 Hotfix/oct 24 fixes (#9261) 
* Removed max height from text section

* Added items to mystery sets

* Group manager fixes

* Fixed promo code apply
 2017-10-24 17:41:36 -05:00
SabreCat dc3ee25e65 feat(content): subscriber items 
Also fix(sprites): resize and recanvas gift boxes
 2017-10-24 20:21:30 +00:00
Keith Holliday 7fe2504906 Bulk purchasing (#9196) 
* Moved buy tests

* Added mystery buy to buy.js

* Added quest purchasing to buy

* Added buy special

* Moved integration tests to buy folder

* Removed buyGear dependency

* Removed buyArmoire dependency

* Removed buyHealthPotion dependency

* Removed myster, quest and special dependency

* Replaced functions with factory

* Added bulk purchasing to common

* Added bulk purchasing to the api

* Added bulk purchasing to client

* Refactored purchasing function to reduce long method

* Added bulk purchase to gem purchases

* Added bulk purchasing to api

* Added bulk purchasing to gem items on client

* Removed bulk from equipment

* Removed recentlyPurchased

* Fixed style issues and prevented puchasing more gems than are left

* Fixed lint

* Fixed missing keys

* Fixed gem amount notice

* Added quest modal to pinned item

* Added bulk purchase to gem modal

* Fixed styles

* Fixed bulk purchase for spells

* Fixed modal size

* Hid autofill
 2017-10-23 16:05:35 -05:00
borisabramovich86 15626b8ae1 Prevent user from blocking himself - fixes #9097 (#9194) 
* Added check - user can't block himself

* removed exclusive test
 2017-10-18 15:26:01 -05:00
borisabramovich86 444f393f3a stops Orb of Rebirth being visible after rebirth - fixes #8593 (#9172) 
* remove link between rebirth and beastmaster, and fix tests

* add test checking rebirth is reset when beastmaster is enabled

* remove exclusive test
 2017-10-18 15:23:27 -05:00
Sabe Jones eb2a6095c2 Fixes 2017/10/16 (#9203) 
* fix(various): small issues
* Rename "Gold-Purchasable Quests" to "Masterclasser Quest Lines"
* Use "getting_organized" instead of "organization" as task category
* Use pixel gem instead of SVG gem for Market
* Recanvas shop sprites for Fall 2017 seasonal items

* chore(news): update Bailey
 2017-10-16 18:04:49 -05:00
Sabe Jones a69c0999d3 Fixes 2017/10/14 (#9191) 
* fix(shops): event date range for mobile

* fix(profile): clean up equipment grids

* fix(strings): remove unused string

* fix(sprites): recanvas Lost Masterclasser scrolls
 2017-10-14 19:59:28 -05:00
Sabe Jones 6d0496fbd0 Lost Masterclasser Quest Line (#9183) 
* fix(sprites): serve animated GIFs
Also add new GIF for upcoming quest line

* feat(content): Masterclasser capstone quest
Also fixes Quests page for clearer lock/unlock display

* chore(sprites): compile

* feat(achievements): award quest completionist cheevo

* feat(quests): Siphoning Void
fix Achievements page styling and text spacing
fix display of Rage bar on party page

* test(quests): Lost Masterclasser

* chore(news): Bailey

* fix(test): only use Masterclasser in relevant scenario
 2017-10-13 20:32:55 -05:00
Sabe Jones 5ced47f590 Content 2017/10/10 (#9177) 
* feat(content): bundle, customizations

* chore(sprites): update
 2017-10-10 17:30:44 -05:00