Phillip Thelen
22def5111f
fix purchasing wacky potions ( #15276 )
2024-07-24 10:35:26 -05:00
Sabe Jones
287014518d
Squashed commit of the following:
...
commit 28193f86fb877fe48225e0f6f79c5bf62254d68ed054e6fc167231f699c11dae0793fdf18fbe86b661a61724ca93cf30eb18cff08adcd04da2ed4a1f11c5b26c59ac85bb2e2d74dfb2710f8dbd3c3db174b3b348ff3386d61fde19da14531c254dd80f240bc3f16b4b5184973bd5b6accca5cafec68e6211fc63c906dd3333f8f0f589a3ac3dde16551ec83ff5f4974a732645bf60232645bf6023f5f4974a73162e337d14f2506c323121a7d36b7b21a7d36b7bf2506c3231d47641e25afb8479ad1e3810cf3ef3d05da3722cb8a3440ef244d63032d89d7da91ec6
2024-06-28 09:49:08 -05:00
Phillip Thelen
eb3220c96b
fix lint
2024-06-10 14:46:32 +02:00
Phillip Thelen
c2b370f4d3
handle error from invalid input
2024-06-10 11:23:46 +02:00
Phillip Thelen
57deadaa5c
Fix purchasing some hatching potions
2024-05-17 15:44:08 +02:00
Phillip Thelen
756e99c089
add more purchase related tests
2024-05-17 11:35:22 +02:00
Phillip Thelen
33181c0ac4
Add purchase related test cases
2024-05-17 10:57:33 +02:00
Phillip Thelen
ee974dfa19
fix seasonal quest purchasing
2024-05-17 10:30:15 +02:00
Phillip Thelen
c56c07a0f8
fix buying transformation items
2024-05-16 20:19:26 +02:00
Phillip Thelen
929778bdad
fix code coverage
2024-05-16 20:19:26 +02:00
Phillip Thelen
4d38880249
Refactor armoire content to be cached by day
2024-05-15 16:51:09 +02:00
Phillip Thelen
592c320d1d
remove only
2024-05-14 11:07:05 +02:00
Phillip Thelen
6afdffae92
fixes
2024-05-13 14:00:44 +02:00
Phillip Thelen
d6cabeedb4
fix tests
2024-04-26 13:44:51 +02:00
Phillip Thelen
c18e06f071
changes
2024-04-01 18:38:04 -05:00
Phillip Thelen
fb56f7df20
Fix various tests
2024-04-01 18:37:46 -05:00
Sabe Jones
8fa91a3805
chore(node): upgrade to Node 20
2024-03-11 09:59:57 -05:00
Natalie
caa73057d8
update(content): March 2024 content ( #15161 )
...
* feat(content): add February subscriber item, backgrounds, and enchanted armoire gear
* feat(content): add spritesheet
* feat(content): bug smashing
* fix(file): revert package.json to release
* feat(content): add quest bundles
* feat(content): add new achievement
* feat(content): add achievement script
* fix(curlies): remove stray curly boi
* fix(date): add canonical date
* fix(dates): updated background & armoire to canonical dates
* feat(content): add armoire strings & stats
* fix(migration): Golden Squirrel
* fix(backgrounds): trim extra whitespace
* fix(test): cuddle timing
---------
Co-authored-by: Sabe Jones <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2024-02-27 17:25:57 -06:00
Natalie
8db8a8267b
feat(content): December 2023 Content ( #15023 )
...
* feat(content): add December subscriber items, backgrounds, and enchanted armoire
* feat(content): correct item slot for armoire, change release dates for testing
* fix(backgrounds): correct start date
* fix(armoire): Add canonical start date
* fix(test): only count released items
---------
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2023-11-28 15:01:27 -06:00
SabreCat
fbb9b2c65a
fix(tests): post merge cleanup
2023-10-03 15:58:31 -05:00
SabreCat
a0941ffa84
Squashed commit of the following:
...
commit 16d8b87e90655c5444d0138e3c9df432b6dab8d9
Merge: 07387faf48 6bea232d476bea232d47#14867 )
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.32.1 to 3.32.2.
- [Release notes](https://github.com/zloirock/core-js/releases )
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zloirock/core-js/commits/v3.32.2/packages/core-js )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
commit cebb3f0f25#14868 )
Bumps [webpack](https://github.com/webpack/webpack ) from 4.46.0 to 4.47.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.46.0...v4.47.0 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
commit ea8563cd17bb2a60c74eb518bbce105b66a8ecd5
Merge: 3e16584dcf 6259955891
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 21:23:02 2023 +0200
Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting
commit 3e16584dcf70dc844d806f5f487bf94c171f91ad
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 21:22:06 2023 +0200
fix PR comments
commit 84ba44fb192c1e6ccd895beae067468285f438a3
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 20:38:54 2023 +0200
fix PR comments
commit 6259955891a6469760768dcc5e6ae204fa3b44bd
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Aug 25 11:20:26 2023 -0400
update form.scss
commit da82bd8e68fb1d6567b987a61c2d15176ffa81c2
Author: negue <eugen.bolz@gmail.com>
Date: Thu Aug 24 21:40:02 2023 +0200
remove ending
commit 82e5fd2a83e9df85e0268e0937dd83be62bcc73d
Author: negue <eugen.bolz@gmail.com>
Date: Mon Aug 21 22:25:41 2023 +0200
fix spacing
commit 9ad06ea88bbb6b806823184a370366392ff7ad01
Author: negue <eugen.bolz@gmail.com>
Date: Mon Aug 21 22:09:22 2023 +0200
clean up debug row for login methods
commit 41cde37675d6132425b3bb4bb0ac5badb9ba0447
Merge: 8c568060f9 82ebe71eb4647b27c55f8558dcc3a8e49d26eacdd4a58239166e3a36783249f45d27e371e165433ab159182188c8b98678d0377b152ffd9f64633a57c7aadede4d580139ff6990b34c4dac04e2a39a9f4dca69f14b53fb28cc4862b4315b3d137f7d53dc
2023-10-03 13:30:44 -05:00
Natalie
f72eef6bff
feat(content): prebuild Fall Festival ( #14869 )
...
* feat(content): prebuild Fall Festival
* fix(typos): because 2023 is not the same as 2024
* feat(css): having stylesheets is important
* feat(content): ready for review & testing
* fix(tests): account for Sept 09 bundle
* fix(gala): use multi event list more
fix a couple of strings too
* feat(content): Warrior and Rogue text
also fix timing of quest bundle feature
* fix(strings): correct stat boosts
* fix(content): missing mage
also adds missing margin to purchase gems button in buy modal
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-09-20 19:46:34 -05:00
SabreCat
ce70c73d49
fix(test): temporarily use real timer
2023-09-12 09:45:40 -05:00
SabreCat
f063b9e81c
fix(tests): sanity and common
2022-08-19 16:10:18 -05:00
Vi Mio
3b1407f529
feat: prevent user from purchasing a quest if prerequisites are not met ( #14073 )
...
* feat: prevent user from purchasing a quest if prerequisites are not met
* test: fail to buy quest if not all prerequisites are met
* test: modify to check all quest prerequisites
2022-07-14 15:24:52 -05:00
Phillip Thelen
6e43d4dc79
Add Transaction log for gem and hourglass changes ( #13589 )
...
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* fix failing test
* Fix minor inconsistencies
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* Fix minor inconsistencies
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-01-31 15:36:15 -06:00
Sabe Jones
e475ebf65c
fix(home): remove FB signup, fix app footer outside of user context
2021-11-01 13:58:46 -05:00
Sabe Jones
353b5a6dcb
fix(test): underscore >.<
2021-10-28 15:26:13 -05:00
Sabe Jones
4bae27c328
fix(test): temporary candy test
2021-10-28 14:17:04 -05:00
Sabe Jones
40bf664f20
chore(analytics): various updates to analytics tracking
2021-08-30 16:21:05 -05:00
Sabe Jones
7cc705ffcd
fix(test): should hatch Desert pet to get Desert achievement
2021-02-16 17:08:59 -06:00
negue
bad3f82dfb
Inventory: fixes / layout ( #11948 )
...
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-10-19 23:54:51 +02:00
Jalansh
c0bf2cffea
Casting Chilling Frost and Stealth skill again will not be processed and return an error instead. Fixes #12361 . ( #12404 )
...
* Added logic for a repeating Chilling Frost skill. Added test case for redundant chilling frost skill cast. Added comments for the logic of repeating Stealth skill because of an error.
* Added logic for a repeating Stealth skill. Avoiding MP reduction still pending because of console error. Test cases pending.
* Completed the logic for a repeated Stealth skill. Added repeated frost skill cast check in common. Removed exclusive test. Test cases are pending.
* Added test case for Stealth skill recast. Fixed lint errors. Fixed a flaw in if statement which led to test case failure.
* Fixed lint errors in test case.
* Added a common JSON entry for skil recasts in three files. Other files remaining. Added Chilling Frost recast check in common code. Modified test cases.
* Added spellDisabled condition in client code.
* Reverted JSON messages for three languages. Added spellAlreadyCast attribute to JSON file in locales/en. Made changes for showing appropriate message in client code.
* Added an import for throwing BadRequest in common code. Modified test case accordingly.
* Update website/common/script/content/spells.js
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
* Added target and req attributes in cast() method arguments.
* Changed common code test case because of increased function parameters. Moved chilling frost test casse to common tests instead of server tests.
* Changed the test case format in common tests.
* Added a missing done statement.
* Fixed a minor error which led to failing test case. Removed the exclusive test which led to lint error.
* Fixed lint errors.
* Added a class named 'disabled' for the frontend change.
* fix(skills): style cleanup
* fix(skills): unfix
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-08-09 18:25:59 +02:00
PitiTheGrey
e89ff95a21
Add Bulk Feed via query parameter ( #12384 )
...
* Update feed.js
New Tests for bulk feeding
* Update POST-user_feed_pet_food.test.js
Added test for bulk-feeding
* Update user.js
Added 'query paramter' for bulk feeding
* Update pets.json
Added "tooMuchFood" for bulk feeding pets
* Update feed.js
Added query parameter option for bulk feeding pets.
* Update feed.js
fixing lint
(bulk feeding)
* Update POST-user_feed_pet_food.test.js
adjustments for testing bulk feeding
* Update feed.js
Bulk feeding
amount as integer
* Update pets.json
added invalidAmount for bulk feeding
* Update feed.js
Bulk feeding
Error handling
* Update feed.js
Bulk - feed
no hardcoded values
* Update pets.json
Get rid of my german accent.
2020-07-13 16:04:03 +02:00
Matteo Pagliazzi
3d5630d5a2
chore: update sub-deps and fix lint
2020-07-01 18:20:18 +02:00
Matteo Pagliazzi
692d02984b
unlock: fix unlocking hair items
2020-06-09 22:13:22 +02:00
Matteo Pagliazzi
d63aafc7f1
fix lint
2020-06-03 18:03:25 +02:00
Matteo Pagliazzi
4c653aa511
unlock: minor fixes and increase tests coverage
2020-06-03 17:56:06 +02:00
Matteo Pagliazzi
0896837528
working code and original tests pass
2020-06-02 23:58:48 +02:00
Matteo Pagliazzi
44ded945dd
Merge branch 'develop' into unlock-fixes
2020-05-25 19:00:56 +02:00
Frank Maximus
ea44af0929
buyMysterySet records every item in Amplitude. ( #12197 )
...
* buyMysterySet records every item in Amplitude.
Record only the mysterySet
Fixes : #11705
* buyMysterySet records every item in Amplitude.
Extend unit test
Fixes : #11705
2020-05-19 16:39:48 +02:00
Matteo Pagliazzi
613895e294
Merge branch 'develop' into unlock-fixes
2020-05-06 11:49:28 +02:00
Matteo Pagliazzi
ca4efa21cf
Reset should unassign Stat Points
...
Squashed commit of the following:
commit c3c2c364118a90f893ea7fca0a943ea64299234a
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sun May 3 22:36:57 2020 +0200
increase timeout to 100ms to allow a correct route change before reload
commit 5fd85345ce4a1d3684ca991db7f666803c899e63
Merge: a73b5c942b 33331554d3
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sun May 3 22:35:33 2020 +0200
Merge branch 'develop' of https://github.com/PitiTheGrey/habitica into PitiTheGrey-develop
commit 33331554d3da85134fd8b2a625a00d150da9e2e1
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Sun May 3 22:14:33 2020 +0200
Order fixed.
Rekord after reset
commit 3374ed29dbe37cd7416a3ef3eb9b9519f1488078
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Sun May 3 22:01:07 2020 +0200
Return to page then reset
commit a73b5c942b577dd357ce76380a0102c6823f66c1
Merge: 888f2c8217 0887141ec4
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sun May 3 21:44:16 2020 +0200
Merge branch 'develop' of https://github.com/PitiTheGrey/habitica into PitiTheGrey-develop
commit 0887141ec47fa8c7fb912f459416f6fa20d271b5
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Sun May 3 20:42:50 2020 +0200
Remove 2nd try (sorry)
commit e5534a7cba989ef8197a06ee6e5a4adb80992dba
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Sun May 3 20:14:49 2020 +0200
removed unnecessary lines of code
commit 888f2c8217611d367bee912b63d4cc3f4def59bb
Merge: aeba14f2e9https://github.com/PitiTheGrey/habitica into PitiTheGrey-develop
commit e5c5f7f1d005e38a54341ca104a1d6632323bd75
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Sat May 2 14:54:14 2020 +0200
Page reload after reset button pressed
commit 1c7385f774f12f4d02adf0370bc692622e81f22c
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Tue Apr 28 22:23:59 2020 +0200
Update reset.js
commit 6a8ad34aa6eace9c621d52dded8d6e4200352e33
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Tue Apr 28 22:15:08 2020 +0200
Update reset.js
Resets int, con, per, str to 0
and Points to 1
commit ba6de48ee367aabf4a87f86eac03aeb8d3f1c2e0
Author: PitiTheGrey <35431804+PitiTheGrey@users.noreply.github.com>
Date: Tue Apr 28 22:10:16 2020 +0200
Update reset.js
Test if habitica/Website/common/script/ops/reset.js resets
int, con, per, str to 0
and Points to 1.
2020-05-03 22:37:34 +02:00
Alys
aeba14f2e9
update API's monthly Gem cap messages to use the friendly website version ( #12150 )
...
* allow subscribers to buy their final monthly gem
* replace old montly Gem cap messages with friendlier new ones
2020-05-02 21:49:38 +02:00
Matteo Pagliazzi
26437e7e2e
wip: valid unlocked sets
2020-04-24 19:01:03 +02:00
Bart Enkelaar
dc9800d88a
Don't bill (subtract gems) multiple times for multiple unlock item set calls ( #12116 )
...
* Issue 11050 - Small tuneups to unlock.js
- Use includes i.o. indexOf
- Extract small function for object setting duplication
- Use every instead of custom counter
* Issue 11050 - Properly store purchased items when purchasing them
* Issue 11050 - Couple more tuneups in unlock.js and implemented partial failure scenario
* Issue 11050 - Fix last lint issue
* Issue 11050 - Check path for gear i.o. failing to write it to purchased
* Issue 11050 - Guarantee variation coverage in tests
* Issue 11050 - Use startsWith instead of includes for background check
* Issue 11050 - Don't unlock lost items
2020-04-24 16:16:34 +02:00
Jack Somers
6d6adfd919
Fixes #11119 : Added check for wacky pet before feeding ( #12106 )
...
* Added check for wacky pet before feeding
* added test for feeding wacky pets
* Fixed typo in test for feeding wacky pets
Co-authored-by: Jack Somers <somersjw9@gmail.com>
2020-04-20 22:17:42 +02:00
Sabe Jones
92c3a640ee
feat(content): Bug Bonanza achievement
2020-03-17 09:11:41 -05:00
Sabe Jones
e94631a002
fix(test): food expectation, sigh
2020-03-13 11:10:28 -05:00
Sabe Jones
bd8e67a2ea
Adventure Guide Prep ( #11883 )
...
* WIP(adventure): prereqs
* WIP(drops): new modal
* WIP(adventure): analytics fixes etc
* feat(adventure): random egg+potion on 2nd task
* fix(lint): noworkies
* fix(modal): correctly construct classes
* fix(tests): expectations and escape
* fix(first-drops): address comments
* fix(first-drops): don't give random drops until first drops
* fix(drops): remove more Level 3 references
* refactor(drops): no need for cloning
* refactor(drops): unnecessary export
* fix(first-drops): force sync
* fix(first-drops): move to server
* fix(first-drops): escape in case we get here with >0 items
* fix(lint): line length
* fix(pet-food): remove unused string
2020-03-07 13:03:13 -06:00
