80e193e4ce
Merge branch 'develop' into increment-component
2023-03-15 12:38:07 -04:00
8ff8213954
Merge branch 'sabrecat/invite-notif' into release
2023-03-14 09:25:29 -05:00
7874ae5092
fix(hyperlinks): WHITE inactive drawer tabs
2023-03-13 15:28:26 -05:00
481719e513
Revert "fix(hyperlinks): gray inactive drawer tabs"
...
This reverts commit 9657112bca
2023-03-13 15:19:41 -05:00
9657112bca
fix(hyperlinks): gray inactive drawer tabs
2023-03-13 14:35:43 -05:00
f7026b2478
Merge branch 'release' into sabrecat/invite-notif
2023-03-13 14:13:06 -05:00
76fa6ec1b8
updates to snumberIncrement, buyModal, and sellModal
2023-03-09 15:54:26 -05:00
458aee9a3a
Merge branch 'release' into develop
2023-03-07 11:48:14 -06:00
57f86bac70
feat(content): March backgrounds and Enchanted Armoire items ( #14524 )
...
* feat(content): March backgrounds and Enchanted Armoire
* fix(backgrounds): trivial syntax consistency
* fix(gear): missing verbiage
* fix(gear): correct usage of <%= attrs %>
* fix(backgrounds): broken string tokens
* fix(backgrounds): more broken tokens
---------
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2023-03-06 16:57:56 -06:00
f2fe83a469
feature(upgrade): copy Pause Damage button to Settings page ( #14532 )
...
* feature(upgrade): copying Pause Damage button to Settings page
* Removing duplicate string 'cause I can't search effectively. 😅
2023-03-06 16:16:23 -06:00
1ac4466c24
trying to make more components for the buy/sell modals
2023-03-02 14:33:27 -05:00
03f0061c85
Merge branch 'develop' into increment-component
2023-03-01 15:46:04 -05:00
16ae182f34
Merge branch 'release' into develop
2023-02-28 15:37:35 -06:00
45107fe48f
Merge branch 'sabrecat/transactions-404' into release
2023-02-24 16:32:35 -06:00
80f517f1ad
feat(content): subscriber items March 2023
...
Also fixes Vue templating in one paragraph of the Community Guidelines.
2023-02-24 16:31:50 -06:00
b6e9d0c9c0
Merge branch 'sabrecat/transactions-404' into develop
2023-02-22 15:20:16 -06:00
442d9ca9cd
fix(permissions): route away from purchase history for non-support
2023-02-22 15:15:03 -06:00
14f9debfdb
fix(css): remove yet more blue-10 overrides
2023-02-16 14:34:24 -06:00
4a1011f1af
fix(hyperlinks): remove some blue overrides
2023-02-16 12:57:35 -06:00
9ec1917e6d
feat(invites): provide link to inviting user in party notif
...
Also changes basic links sitewide to purple-300
2023-02-15 16:54:46 -06:00
c349de6908
finish up sellModal and questModal (also Time Travelers)
2023-02-15 12:54:26 -05:00
fd7f3a646e
add functionality and styling to sellModal and questModal
2023-02-14 17:22:05 -05:00
7244c1bebc
Merge branch 'develop' into increment-component
2023-02-14 15:30:18 -05:00
ce1ce47d18
build(deps): bump dompurify from 2.4.1 to 2.4.3 in /website/client ( #14443 )
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 2.4.1 to 2.4.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.1...2.4.3 )
---
updated-dependencies:
- dependency-name: dompurify
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>
2023-02-13 16:27:33 -06:00
7f65079cfe
build(deps): bump ua-parser-js from 0.7.31 to 0.7.33 in /website/client ( #14463 )
...
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js ) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases )
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md )
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33 )
---
updated-dependencies:
- dependency-name: ua-parser-js
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-13 16:26:11 -06:00
04f54d5e03
build(deps): bump hellojs from 1.19.5 to 1.20.0 in /website/client ( #14479 )
...
Bumps [hellojs](https://github.com/MrSwitch/hello.js ) from 1.19.5 to 1.20.0.
- [Release notes](https://github.com/MrSwitch/hello.js/releases )
- [Changelog](https://github.com/MrSwitch/hello.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.19.5...v1.20.0 )
---
updated-dependencies:
- dependency-name: hellojs
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>
2023-02-13 16:03:23 -06:00
a549668522
build(deps): bump validator from 13.7.0 to 13.9.0 in /website/client ( #14492 )
...
Bumps [validator](https://github.com/validatorjs/validator.js ) from 13.7.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases )
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/validatorjs/validator.js/compare/13.7.0...13.9.0 )
---
updated-dependencies:
- dependency-name: validator
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>
2023-02-13 15:40:52 -06:00
02e0e45da6
build(deps): bump @sideway/formula in /website/client ( #14495 )
...
Bumps [@sideway/formula](https://github.com/sideway/formula ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sideway/formula/releases )
- [Commits](https://github.com/sideway/formula/compare/v3.0.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: "@sideway/formula"
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-13 15:40:31 -06:00
b3d83431e6
build(deps): bump stopword from 2.0.5 to 2.0.7 in /website/client ( #14504 )
...
Bumps [stopword](https://github.com/fergiemcdowall/stopword ) from 2.0.5 to 2.0.7.
- [Release notes](https://github.com/fergiemcdowall/stopword/releases )
- [Commits](https://github.com/fergiemcdowall/stopword/commits/v.2.0.7 )
---
updated-dependencies:
- dependency-name: stopword
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>
2023-02-13 15:38:02 -06:00
6b95f648c4
Merge remote-tracking branch 'CuriousMagpie/footer-link-updates' into release
2023-02-13 11:28:14 -06:00
f9db4b9b5b
fix(event): correct logic for various Valentine's items
2023-02-13 11:25:02 -06:00
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
945c19cc80
chore(links): add weblate link to footer and update data display tool
2023-02-10 15:11:36 -05:00
0b8f2bc58e
update(content): revise community guidelines ( #14481 )
...
* update(content); revise community guidelines
* fix(CG): remove outdated spoiler advice, remove unneeded string token
* chore(CG): update date line to intended publication
---------
Co-authored-by: SabreCat <sabe@habitica.com >
2023-02-08 15:04:30 -06:00
20df5eeb8f
buy modal complete!
2023-02-08 15:16:17 -05:00
23f7dd94b6
more stylin' of the buy modal
2023-02-07 15:24:53 -05:00
7125da4533
Merge branch 'develop' into increment-component
2023-02-07 14:05:48 -05:00
0335eb1f7e
chore(content): add February backgrounds and Enchanted Armoire Items ( #14482 )
...
* chore(content): add February backgrounds and Enchanted Armoire Items
* fix(test): birthday week adjustment
* fix(strings): .
* fix(strings): correct background tokens
---------
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2023-02-07 09:12:19 -06:00
684cb59a7c
buyModal styling/functions
2023-02-06 16:23:20 -05:00
9274fe9a10
Merge branch 'develop' into increment-component
2023-02-06 14:30:34 -05:00
0f9b6ab591
fix(lint): revert bad lint rule again
2023-01-31 11:00:08 -06:00
3470382528
fix(lint): revert bad lint rule again
2023-01-31 10:59:53 -06:00
a19b5356b5
Merge branch 'sabrecat/admin-panel-gems' into develop
2023-01-31 10:53:03 -06:00
059269f9b0
chore(content): add February subscriber items ( #14466 )
...
* chore(content): add February subscriber items
* fix(strings): month typo
---------
Co-authored-by: SabreCat <sabe@habitica.com >
2023-01-31 10:33:36 -06:00
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
5dc4fccddc
Merge branch 'release' into develop
2023-01-26 15:09:09 -06:00
a21f083761
gem modal styling/functions
2023-01-25 16:44:14 -05:00
c7e2834fc6
Merge branch 'develop' into increment-component
2023-01-25 14:35:39 -05:00
efae9429c0
feat(event): adjust dates, add NPC variations
2023-01-24 16:11:16 -06:00
1988ef957d
fix(strings): dedupe jubilantGryphatrice
2023-01-20 16:15:33 -06:00
CuriousMagpie