CuriousMagpie
f4aa88e1ff
more style updates to buy modal
2022-12-21 16:58:22 -05:00
CuriousMagpie
53eab7aa29
Working on styling
2022-12-20 16:53:51 -05:00
CuriousMagpie
8374d61f52
why does NaN ask the user to buy gems?
2022-12-19 17:26:49 -05:00
CuriousMagpie
4c943b7575
number-increment works on buy modal and there was much rejoicing...
2022-12-16 16:51:19 -05:00
CuriousMagpie
24032b57f6
why clicky click no click?
2022-12-15 16:48:59 -05:00
CuriousMagpie
8628c774e5
more css changes to buy modal
2022-12-13 10:53:38 -05:00
CuriousMagpie
523f044914
css changes to buy modal
2022-12-09 17:04:35 -05:00
CuriousMagpie
892c9ad040
trying to make clicky clicky work
2022-12-09 11:47:57 -05:00
CuriousMagpie
570f39c620
Merge branch 'develop' into increment-component
2022-12-08 10:22:08 -05: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
CuriousMagpie
6d6195ae6a
props attempt
2022-12-01 14:43:08 -05:00
CuriousMagpie
4ba66c7018
unbreaking what was broken yesterday
2022-11-30 17:16:51 -05:00
CuriousMagpie
54b9424c6e
Merge branch 'develop' into increment-component
2022-11-30 12:04:09 -05:00
CuriousMagpie
af574634b0
tried to make if/else logic simpler, ended up breaking everything.
2022-11-29 17:13:48 -05: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
CuriousMagpie
d1e1c09b4a
add conditionals, add component to buy & sell modals
2022-11-22 15:28:48 -05: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
CuriousMagpie
4f5a720c30
how to make component show up?
2022-11-18 15:27:18 -05: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
CuriousMagpie
4ddfdb84ac
get most of the right parts in the same place
2022-11-17 14:57:58 -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
Natalie L
b5c950ac96
chore(content): add November 2022 Mystery Items ( #14317 )
...
* chore(content): add November Mystery Items
* chore: merge release into 2022-11-mystery-items
* Revert "chore: merge release into 2022-11-mystery-items"
This reverts commit e12b61d73f .
Co-authored-by: SabreCat <sabe@habitica.com >
2022-10-30 19:52:55 -05:00
SabreCat
18534a21ff
Merge branch 'develop' into release
2022-10-11 11:59:02 -05:00
Natalie L
4d1bbdd8d0
chore(content): add October Backgrounds and Enchanted Armoire Items ( #14266 )
...
* chore(content): add October Backgrounds and Enchanted Armoire Items
* fix(typo): fix a couple of descriptions
* chore(subproject): update images
* fix(typo): keepin our caps consistent
* fix(typo): whitespace, caps
Co-authored-by: SabreCat <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2022-10-11 11:54:24 -05:00
Natalie L
3f9d55254e
fix(style): update to scoped colors & set footer background image to pointer-events:none ( #14265 )
...
* first pass
* second pass
* third pass
* fourth pass, not a lot of progress
* fifth pass, slowly gettin there
* breakpoint nonsense
* flexbox and breakpoint nonsense
* svg updates, css updates
* whitespace
* chore: merge upstream/develop
* style(breakpoints): added responsive breakpoints, social column alignment tweaks
* style(breakpoints): add xs-specific selectors and classes
* style: mobile footer
* style: mobile footer
* style: static landing page footer
* style: small tweaks to social layout
* fix(translations): update website/common/locales/de/gear.json to develop
* update(style): small updates
* update(style): cleaning up code
* update(style): cleaning up code
* update(style): mobile footer updates
* update(style): complete mobile footer & clean up code
* update(style): add tablet breakpoint and remove rogue terms link
* fix(style): update to scoped colors & set footer background image to pointer-events:none
* fix(style): removed redundant logo class definition
2022-10-07 16:10:29 -05:00
SabreCat
ace964f2b3
fix(subs): escape group demographics without group
2022-10-06 15:53:19 -05:00
SabreCat
57d3fea523
Merge branch 'group-tracking-modal' into release
2022-09-30 14:47:08 -05:00
SabreCat
7db093d2bb
Merge branch 'sabrecat/panel-subscription' into release
2022-09-30 14:46:10 -05:00
SabreCat
06d2ffb37d
Merge branch 'sabrecat/gems-multi-event' into release
2022-09-30 14:45:36 -05:00
SabreCat
4c4d0be31f
fix(analytics): include client tracking parameter
2022-09-29 15:07:21 -05:00
Natalie L
a08ecbe044
chore(content): add October 2022 Mystery Items ( #14254 )
2022-09-28 15:04:47 -05:00
SabreCat
535fddf92d
feat(sale): add fine print
2022-09-21 16:28:15 -05:00
SabreCat
4c988691cf
fix(groups): show group task summary modal for site admins
...
also change "Watcher" to "Peeker" in fall healer gear
2022-09-21 14:39:46 -05:00
CuriousMagpie
9890e0079a
fix: correct groupPlan.vue file
2022-09-21 12:02:35 -04:00