Commit Graph

3841 Commits

Author SHA1 Message Date
negue 25e77cbd95 move purchaseHistory.vue 2023-02-21 19:52:12 +01:00
negue 8e4e1bcb0f Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting 2023-02-21 19:04:31 +01:00
SabreCat 85c50d50e9 fix(css): remove redundant formatting for a elements 2023-02-16 14:23:27 -06:00
negue bb14d09aa4 remove console 2023-02-16 01:34:09 +01:00
negue 8c5e722c72 first try with the refactored UI of Login Methods 2023-02-16 01:26:43 +01:00
negue 9c8770051d fix dayStartAdjustmentSetting.vue for 0 value 2023-02-11 19:13:16 +01:00
negue ee2ff3881b fix color after refactor 2023-02-11 18:37:46 +01:00
negue 121e7485ca mark audioThemeSetting as changed 2023-02-11 18:29:00 +01:00
negue 98c6570003 fix ul/li style in resetAccount.vue 2023-02-11 18:05:55 +01:00
negue fed824f705 fix color of gem price 2023-02-11 17:49:36 +01:00
negue 80365e537d fix "fixValuesSetting.vue" 2023-02-11 17:44:55 +01:00
negue d3e15c5413 open forgot password in new tab 2023-02-08 01:06:27 +01:00
negue 31edec9ec5 move validatedTextInput.vue to shared components + fix check pos/size + input-error cleanup 2023-02-08 01:03:19 +01:00
negue 2adfd8c259 hide class setting until level 10 2023-02-05 20:19:30 +01:00
negue 64fb4c0cf9 delete old modals (refactored into new settings ui) 2023-02-05 19:32:40 +01:00
negue b5be137a8d enable forgot password link in settings 2023-02-05 19:27:26 +01:00
negue bec75c6e12 reset account + password required in api 2023-02-05 18:52:54 +01:00
negue 64f7e7a1d9 fix compile 2023-01-30 23:22:55 +01:00
negue 7ffb5101be Merge remote-tracking branch 'origin/develop' into negue/ui/setting
# Conflicts:
#	website/client/src/components/header/notificationsDropdown.vue
2023-01-30 22:47:05 +01:00
negue 2bfb130b92 remove restore-modal and replace it with the finished fix values setting 2023-01-30 22:44:23 +01:00
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
negue 89530a133c wip fix values 2023-01-18 19:22:36 +01:00
negue 428647fc71 refactor change class to design update + clean up old site.vue settings 2023-01-14 21:50:22 +01:00
negue 1f16819bc1 WIP fix values 2023-01-11 22:41:05 +01: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
negue 6fef3d0579 check for unsaved changes when pressing cancel 2023-01-07 22:51:30 +01:00
negue bef8a4cdfc Merge remote-tracking branch 'origin/develop' into negue/ui/setting 2023-01-07 22:10:53 +01: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
negue 494f32c3e3 Class Setting 2022-12-21 00:55:31 +01:00
negue bda210cfbb removes username, email and display name from site.vue 2022-12-20 23:01:41 +01:00
negue 38198d7df6 WIP class setting 2022-12-20 22:36:27 +01:00
negue dddcfa637f fix styles 2022-12-20 22:31:36 +01: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