Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,309 Commits 64 Branches 1,256 Tags
93e922e7741aae427fe815afb7cc5dbf5eea94de
Commit Graph

117 Commits

Author SHA1 Message Date
Natalie L a73e4d399e chore(content): add Pink Marble Magic Hatching Potion (#14497) 
* chore(content): add quest text

* chore(content): add rest of potion quest content

* fix(image): pad quest scroll image

* feat(quest): add Rage action

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-02-12 23:17:56 -06:00
Natalie L cfa85850bf chore(typos): miscellaneous string fixes (#14414) 
* fix(string): questVice1Notes html changed to a mobile-device friendly format

* fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order

* fix(string): remove extra word from headSpecialSummer2022WarriorNotes

* fix(string): corrected armorSpecialSummer2022MageNotes

* fix: remove duplicated string and adjust upgrade button style

* fix(style): set border radii to 8px on upgrading-group id

* fix(payments): remove duplicate entry from another modal

* chore(fix): restore string inadvertently removed during a refactor

* chore(fix): comma dangle

* chore(typo): who knew, that Y was actually important...

* chore(typo): fix text in questBewilderNotes

* chore(string): clarify polar pets requirements

* couple small changes to the footer as pointed out by users

* chore(fix): correct name of Fabulous Party Hat

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-01-31 10:03:06 -06:00
SabreCat 9f52e47011 feat(content): November Quests and Hatching Potions 
by @CuriousMagpie
 2022-11-14 14:13:08 -06:00
Natalie L 0f4711c358 chore(content): add 2022-09 Pet Quest bundle (#14218) 
* chore(content): farmFriends quest bundle

* chore(content): 2022-09 Pet Quest Bundle

* fix(date): fix start date
 2022-09-13 09:12:24 -05:00
Natalie L 517fbc3c8e fix(strings): error and omissions corrected (#14085) 
* build(deps): bump @storybook/addons in /website/client (#14066)

Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons) from 6.5.8 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/lib/addons)

---
updated-dependencies:
- dependency-name: "@storybook/addons"
  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>

* build(deps): bump jpeg-js from 0.4.3 to 0.4.4 (#14071)

Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.3...v0.4.4)

---
updated-dependencies:
- dependency-name: jpeg-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(string): questVice1Notes html changed to a mobile-device friendly format

* fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-21 13:48:26 -05:00
CuriousMagpie 36d82a1d39 June 2022 Pet Quest Bundle 2022-06-14 14:33:53 -05:00
Natalie L 4e78d72cee May 2022 Magic Hatching Potions and Quest Bundle (#13979) 
* May 2022 magic hatching potions and quest bundle

* fix(string): typo

* fix(content): add and use event

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-17 09:32:50 -05:00
Natalie L deee147928 Corrected spelling of Wotchimon and description of rage effect. (#13943) 2022-04-21 16:39:54 -05:00
CuriousMagpie 4e107d233b fix(quest): update html in questsContent.json 2022-04-06 13:26:15 -04:00
SabreCat fb017e1f08 fix(pets): various quest and animation corrections 2022-04-05 16:03:46 -05:00
CuriousMagpie 3498b9ccdf Virtual Pet Hatching Potion Quest Content 2022-04-04 17:29:51 -04:00
CuriousMagpie df3b871dba questContent.json placeholders 2022-04-04 14:50:22 -04:00
SabreCat a24651e395 fix(content): bundle ends March not May 2022-03-15 16:08:53 -05:00
Alys 28197837cc removes "Mossy" from questOnyxUnlockText string 2021-11-28 18:30:06 +10:00
SabreCat 2704694214 feat(content): Onyx Hatching Potion quest 2021-11-23 15:33:47 -06:00
Sabe Jones 5bfef56dfa fix(analytics): correct formatting for client events 
Also corrects end date in Bird Buddies string
 2021-09-15 11:21:16 -05:00
Sabe Jones 48f1bec83a feat(content): Time Traveler quest, achievement 2021-08-24 15:42:40 -05:00
Sabe Jones 68a23fb3aa fix(text): small syntax issues in EN locale 2021-08-16 16:15:20 -05:00
Sabe Jones faa37bb3e8 feat(content): subscriber items July 2021 2021-06-29 14:51:04 -05:00
Sabe Jones 058cc538e0 feat(content): Mossy Stone Hatching Potions and quest 2021-05-18 15:20:23 -05:00
Sabe Jones ba18f6211d feat(content): new hatching potion + rereleases 2021-03-25 15:21:24 -05:00
Sabe Jones 5327827ef7 feat(content): Black Pearl Hatching Potions + quest 2020-11-16 15:52:06 -06:00
Sabe Jones b7956a82ee feat(content): Pet Quest Bundle 2020-10-13 14:36:38 -05:00
Sabe Jones 34e87c4b3f feat(content): Turquoise Potion Quest 2020-09-14 16:05:54 -05:00
Sabe Jones f4c453675b feat(content): Wind-Up Potions quest 2020-08-25 16:04:28 -05:00
Matteo Pagliazzi 9a07ba7417 Better XSS Fix (#12483) 
* Revert "fix(test): adjust expectations"

This reverts commit 205436d5b1.

* Revert "fix(escaping): global inoffensive apostrophe"

This reverts commit 2b8f94b244.

* change <%- to <%=

* fix interpolation only where necessary

* remove unused variable
 2020-08-20 13:41:46 -05:00
Matteo Pagliazzi b7964a411c fix(i18n): html-escape all interpolated strings where html is not necessary 2020-08-11 21:33:24 +02:00
Sabe Jones 15753de3a1 feat(content): Seafoam and Amigos 2020-07-14 16:11:34 -05:00
Matteo Pagliazzi 39427a75db To-Dos -> To Do's (#12290) 
* To-Dos -> To Do's

* To-Do -> To Do
 2020-06-17 17:33:30 +02:00
Sabe Jones 873ac53e27 Squashed commit of the following: 
commit f461c07ca7997362512a366eebc7d3a8fba854ee
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 11 16:37:14 2020 -0500

    fix(sprites): wolf alignment

commit 6ceb4ba6d1ea62892e9b335307043d78971328d0
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 11 14:53:07 2020 -0500

    chore(sprites): compile

commit 8b517309f531c7f151c5c18a5ca9847ab7aa5dbb
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 11 14:52:49 2020 -0500

    feat(content): Fluorite Magic Hatching Potion and quest
 2020-06-11 16:38:05 -05:00
Sabe Jones 80a2e31c8e feat(content): new achievement and bundle 2020-05-19 14:00:25 -05:00
Matteo Pagliazzi 01123367b1 Merge pull request #12045 from JohnJSal/patch-1 
Removed an unnecessary word in quest completion text
 2020-04-07 22:20:10 +02:00
JohnJSal 776f3d288b Removed an unnecessary word in quest completion text 
Changed "Great job catching the that would-be arsonist..." to "Great job catching that would-be arsonist..." in the quest completion text for "Bye, Bye, Butterfry."
 2020-04-05 12:09:17 -05:00
Sabe Jones c6839c4478 fix(content): stray comma 2020-04-03 19:31:58 -05:00
Sabe Jones 167f4f07b8 feat(content): Confection Pets 2020-04-03 19:25:43 -05:00
Alys 33e8b64df6 remove excess 'the' from two locales strings 2020-03-14 20:47:50 +10:00
Sabe Jones 588fd43e65 fix(content): correct Ruby title 2020-02-13 16:43:47 -06:00
Sabe Jones 6324ef72df feat(content): Magic Hatching Quest 2020-02-11 16:09:51 -06:00
Sabe Jones 2007f7fc89 fix(event): bundle end date 2019-12-27 14:21:06 -06:00
Sabe Jones a50c5aa28d fix(event): more Santa warning 2019-12-23 13:46:26 -06:00
Sabe Jones 730aefa2fa fix(event): Santa Warning and Wolf 2019-12-23 13:09:40 -06:00
Sabe Jones 194f2d512a feat(content): Amber Hatching Potion Quest 2019-11-26 15:58:18 -06:00
Sabe Jones 645f40f7e0 feat(content): Delightful Dinos Bundle 2019-11-14 15:08:45 -06:00
Sabe Jones acb409245a Merge branch 'release' into develop 2019-09-10 17:20:54 -05:00
Sabe Jones 3f2b3da449 feat(content): Rocking Reptiles Bundle 2019-09-10 17:20:06 -05:00
Matteo Pagliazzi 73d1acd8ec fix conflict 2019-09-09 17:15:45 +02:00
Sabe Jones fc841d0ad4 Hourglass Quest (#11325) 
* feat(content): Hourglass Quest

* fix(hourglasses): NaN from undefined

* fix(quests): sanity check for negative scrolls

* fix(hourglasses): don't show quantity selection for binary items

* fix(route): validate number, use body not params

* test(timetrav): add quest tests
 2019-08-29 15:22:12 -04:00
Sabe Jones 2c8614ea5c fix(quests): add missing display of pet item unlocks 
Also rewords some awkward text in said unlocks
 2019-08-15 16:29:58 -05:00
Sabe Jones 1aef294646 feat(content): Silver Hatching Potion quest 2019-08-13 19:16:19 -05:00
Sabe Jones 41782b2157 feat(content): re-enable Farm Friends bundle 2019-08-08 15:47:33 -05:00