SabreCat
5dc4fccddc
Merge branch 'release' into develop
2023-01-26 15:09:09 -06:00
SabreCat
efae9429c0
feat(event): adjust dates, add NPC variations
2023-01-24 16:11:16 -06:00
SabreCat
1988ef957d
fix(strings): dedupe jubilantGryphatrice
2023-01-20 16:15:33 -06:00
SabreCat
e5bbde7e97
feat(event): 10th Birthday Bash
...
with @CuriousMagpie and @phillipthelen
2023-01-20 16:14:33 -06:00
dependabot[bot]
b87cfb71f1
build(deps): bump core-js from 3.27.1 to 3.27.2 in /website/client ( #14454 )
...
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.27.1 to 3.27.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.27.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 >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-20 15:22:43 -05:00
dependabot[bot]
352b1170c4
build(deps): bump @vue/cli-plugin-babel in /website/client ( #14116 )
...
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel ) from 4.5.15 to 5.0.8.
- [Release notes](https://github.com/vuejs/vue-cli/releases )
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-plugin-babel )
---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-babel"
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-20 15:21:44 -05:00
dependabot[bot]
9d0e2217d5
build(deps): bump core-js from 3.26.1 to 3.27.1 in /website/client ( #14437 )
...
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.26.1 to 3.27.1.
- [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.27.1/packages/core-js )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-20 14:57:27 -05:00
dependabot[bot]
076c090197
build(deps): bump flat and @vue/cli-plugin-unit-mocha in /website/client ( #14436 )
...
Bumps [flat](https://github.com/hughsk/flat ) to 5.0.2 and updates ancestor dependency [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha ). These dependencies need to be updated together.
Updates `flat` from 4.1.1 to 5.0.2
- [Release notes](https://github.com/hughsk/flat/releases )
- [Commits](https://github.com/hughsk/flat/compare/4.1.1...5.0.2 )
Updates `@vue/cli-plugin-unit-mocha` from 4.5.15 to 5.0.8
- [Release notes](https://github.com/vuejs/vue-cli/releases )
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-plugin-unit-mocha )
---
updated-dependencies:
- dependency-name: flat
dependency-type: indirect
- dependency-name: "@vue/cli-plugin-unit-mocha"
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-20 14:57:00 -05:00
dependabot[bot]
b9994f5c49
build(deps-dev): bump @babel/plugin-proposal-optional-chaining ( #14426 )
...
Bumps [@babel/plugin-proposal-optional-chaining](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-optional-chaining ) from 7.18.9 to 7.20.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.20.7/packages/babel-plugin-proposal-optional-chaining )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-optional-chaining"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-20 14:48:33 -05:00
dependabot[bot]
c164209c47
build(deps): bump jquery from 3.6.1 to 3.6.3 in /website/client ( #14425 )
...
Bumps [jquery](https://github.com/jquery/jquery ) from 3.6.1 to 3.6.3.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.6.1...3.6.3 )
---
updated-dependencies:
- dependency-name: jquery
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-20 14:48:09 -05:00
Natalie L
a80ac76015
chore(content): add January 2023 Backgrounds and Enchanted Armoire Item ( #14440 )
...
* chore: images & spritesheet
* chore: add january backgrounds and armoire item
* fix(backgrounds): typos and 2023 updates
Co-authored-by: SabreCat <sabe@habitica.com >
2023-01-09 15:39:04 -06:00
SabreCat
5dc372d143
fix(subs): better margins when subbed
2023-01-04 12:04:16 -06:00
SabreCat
e251fad12c
fix(subs): clarity and layout improvements
2023-01-03 17:05:48 -06:00
Natalie L
b1dab729b6
chore(content): january subscriber items ( #14433 )
...
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-29 10:46:17 -06:00
SabreCat
98c4910051
Merge branch 'release' into develop
2022-12-23 15:35:20 -06:00
Natalie L
55e7ef138e
chore(content): add NYE party hat and migration script ( #14419 )
...
* chore(content): add NYE party hat and migration script
* chore(subproj): update habitica-images
* chore(sprites): corrected sprite CSS run
* fix(event): unbork migration, add latecomer hook
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-23 15:35:23 -06:00
SabreCat
6d33ec02a8
Merge branch 'release' into develop
2022-12-19 16:24:48 -06:00
Natalie L
fd9d738cc6
chore(content): add winter wonderland items ( #14407 )
...
* chore(content): add winter wonderland items
* chore(typos): dates are hard
* fix(tz): how far back we have fallen
* fix(event): four extra hours for stragglers
* fix(typo): singular snowball spell
* fix(gear): remove stray incorrect event prop
* merge release
* Revert "merge release"
This reverts commit 83e29d0288 .
* feat(content): add EN text
* fix(dates): 2022-2023 Winter
* chore(content): add featured quest bundle
* fix(event): delay Snowballs, add quests to Seasonal Shop
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-19 15:53:52 -06:00
dependabot[bot]
0d6dbfdc95
build(deps): bump bootstrap-vue from 2.22.0 to 2.23.1 in /website/client ( #14323 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.22.0 to 2.23.1.
- [Release notes](https://github.com/bootstrap-vue/bootstrap-vue/releases )
- [Changelog](https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.22.0...v2.23.1 )
---
updated-dependencies:
- dependency-name: bootstrap-vue
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-16 13:27:36 -05:00
dependabot[bot]
349a0eba44
build(deps): bump shell-quote and @storybook/vue in /website/client ( #14398 )
...
Bumps [shell-quote](https://github.com/ljharb/shell-quote ) to 1.7.4 and updates ancestor dependency [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ). These dependencies need to be updated together.
Updates `shell-quote` from 1.7.2 to 1.7.4
- [Release notes](https://github.com/ljharb/shell-quote/releases )
- [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ljharb/shell-quote/compare/v1.7.2...v1.7.4 )
Updates `@storybook/vue` from 6.3.13 to 6.5.14
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.14/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.14/app/vue )
---
updated-dependencies:
- dependency-name: shell-quote
dependency-type: indirect
- dependency-name: "@storybook/vue"
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-16 13:03:24 -05:00
dependabot[bot]
4f7ed6e7cc
build(deps): bump core-js from 3.26.0 to 3.26.1 in /website/client ( #14356 )
...
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.26.0 to 3.26.1.
- [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.26.1/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 >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-12-15 15:28:46 -06:00
Megan Searles
2eb7bab1dd
WIP remove challenge tag from list if not in use ( #14147 )
...
* if tag not in use after leaving challenge, delete
* fix(tags): correct routing in store actions
Co-authored-by: Megan Shepherd <meg.d.shep@gmail.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-15 15:17:00 -06:00
dependabot[bot]
0224ce7e3e
build(deps): bump chai from 4.3.6 to 4.3.7 in /website/client ( #14363 )
...
Bumps [chai](https://github.com/chaijs/chai ) from 4.3.6 to 4.3.7.
- [Release notes](https://github.com/chaijs/chai/releases )
- [Changelog](https://github.com/chaijs/chai/blob/4.x.x/History.md )
- [Commits](https://github.com/chaijs/chai/compare/v4.3.6...v4.3.7 )
---
updated-dependencies:
- dependency-name: chai
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-15 15:13:25 -06:00
Patrick Delaney
7309ab4fd4
Update title in beforeDestroy() ( #14408 )
2022-12-15 14:48:08 -06:00
dependabot[bot]
0902c63a79
build(deps): bump decode-uri-component in /website/client ( #14384 )
...
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component ) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases )
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2 )
---
updated-dependencies:
- dependency-name: decode-uri-component
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-15 14:39:01 -06:00
dependabot[bot]
d345e0d4a4
build(deps): bump amplitude-js from 8.21.1 to 8.21.3 in /website/client ( #14402 )
...
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript ) from 8.21.1 to 8.21.3.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases )
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md )
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.21.1...v8.21.3 )
---
updated-dependencies:
- dependency-name: amplitude-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-15 14:37:11 -06:00
SabreCat
1587827b22
Merge branch 'develop' into release
2022-12-15 14:04:11 -06:00
Sabe Jones
eb2cb9e921
Refactor FAQ ( #14372 )
...
* refactor(faq): fetch from API on web
Also make question list more maintainable, allowing different questions across platforms
* fix(tests): don't return null when function is expected
Also removes the unnecessary default to web in controller
* fix(tests): add new fields to expectation, add placeholders
* refactor(faq): allow reordering
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-15 11:34:07 -06:00
Natalie L
573c932565
chore(content): add Polar Pro achievement ( #14399 )
...
* chore(content): add Polar Pro achievement
* chore(script): add migration script
* fix(typo): rogue backticks
* fix(capitalization): revert css blurp
* fix(migration): no babby wuff
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-13 14:50:53 -06:00
dependabot[bot]
580139ff69
build(deps): bump express from 4.17.1 to 4.18.2 in /website/client ( #14396 )
...
Bumps [express](https://github.com/expressjs/express ) from 4.17.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2 )
---
updated-dependencies:
- dependency-name: express
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-08 10:10:07 -05:00
dependabot[bot]
9fc69456bb
build(deps): bump qs from 6.5.2 to 6.5.3 in /website/client ( #14394 )
...
Bumps [qs](https://github.com/ljharb/qs ) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases )
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3 )
---
updated-dependencies:
- dependency-name: qs
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-08 10:08:58 -05:00
Natalie L
1ce060eac6
chore(content): add December 2022 Backgrounds and Enchanted Armoire Items ( #14382 )
...
* chore(content): css and images
* chore(content): add December 2022 Backgrounds and Enchanted Armoire Items
* fix(typos): dots no dip
* fix(typo): capitalize game terms
* fix(typos): GitHub regex find, why
* fix(typo): last one maybe?
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-12-06 13:21:24 -06:00
Natalie L
b5c64185f0
chore(tavern): update to remove moderators from tavern ( #14393 )
...
* chore(tavern): update to remove moderators from tavern
* fix(tavern): additional cleanup, change string in Vue instead of Weblate
* fix(git): correct target branch
Co-authored-by: SabreCat <sabe@habitica.com >
2022-12-05 14:46:25 -06:00
Natalie L
9bd039b17b
chore(content): add December 2022 Mystery Items ( #14379 )
...
* chore(submodule): images
* chore(content): December Mystery Items
* chore(content): sprites
* fix(typo): whitespace
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-11-28 15:34:18 -06:00
SabreCat
90b34c4dac
fix(shops): correct imports
2022-11-23 13:23:43 -06:00
SabreCat
96a919ed4b
fix(shops): quest countdowns too
2022-11-23 13:13:06 -06:00
SabreCat
91cbf7a2a9
fix(shops): show correct countdown outside of Gala
2022-11-23 13:08:23 -06:00
Natalie L
f24d81d895
fix(content): quality of life change for staff and moderators ( #14245 )
...
* fix(content): quality of life change for staff and moderators
* fix(content): quality of life change for staff and moderators, I really mean it this time
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-11-18 16:52:09 -06:00
Adam Fitzgibbon
6b27e18699
add prop to task-wrapper so that the cursor remains consistant ( #14302 )
2022-11-18 16:48:34 -06:00
Adam Fitzgibbon
4f70a6fbf4
now grouping the stable A-Z sortBy option by first letter so that Show More functionality works like the other sort types ( #14304 )
2022-11-18 16:44:58 -06:00
Sky Chrastina
4b4f073089
Fix az sort ( #14347 )
...
* add stopword package
* sort pet and potion quests by stopword-ized text
* chore(package): revert package lock
Will update after merge
* fix(package): Friday brain
Co-authored-by: SabreCat <sabe@habitica.com >
2022-11-18 16:38:28 -06:00
Sky Chrastina
1d8e3d45a1
new check asset + css in shop, task, and buy gems ( #14340 )
2022-11-18 16:29:43 -06:00
dependabot[bot]
02b11a61bc
build(deps): bump dompurify from 2.4.0 to 2.4.1 in /website/client ( #14352 )
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.0...2.4.1 )
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-18 12:00:51 -05:00
SabreCat
259131ee3f
feat(transactions): UI updates
...
by @negue
2022-11-15 19:28:36 -06:00
SabreCat
6ee06f76e4
chore(i18n): update locale files
...
Also includes two fixes: empty Hourglass transaction logging and missing Recovery + Support guild category
2022-11-08 10:17:40 -06:00
Sabe Jones
5c7d537c61
Armoire and Backgrounds 2022/11 ( #14329 )
...
* chore(content): Add November Backgrounds and Enchanted Armoire Items
* fix(strings): typos and fullstops
* fix(style): de-whitespace
Co-authored-by: CuriousMagpie <eilatan@gmail.com >
2022-11-08 10:03:25 -06:00
SabreCat
eee8ad2029
fix(css): correct broken task creation dropdown on groups
2022-11-02 14:19:43 -05:00
SabreCat
7c553e535c
feat(gifting): restore ability to send gift messages
...
by @CuriousMagpie
2022-11-01 20:56:21 -05:00
SabreCat
aea0be3245
fix(subs): establish lock to prevent race condition
2022-11-01 20:47:21 -05:00
Natalie L
3bc82a6692
chore(content): add Bone to Pick achievement ( #14318 )
...
* chore(content): add Bone to Pick achievement
* chore(content): update spritesmith-main.css
* chore(content): add more bone picking
* chore(content): more bone picking
* chore(content): bone picking
* chore(content): i gotta bone to pick here
* chore(content): final bone picking
* chore: add migration script
* chore: update habitica-images
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-31 14:19:56 -05:00