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

24596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
negue 4497514eeb show notification when chaning display name 2023-05-30 21:59:21 +02:00
negue 3232f12f0d check current password valid style in "delete account" and "reset account" 2023-05-30 21:55:25 +02:00
negue 582a2f1304 mark password field of email setting as invalid on wrong password 2023-05-30 21:27:20 +02:00
negue 8e3b8a962a refactor currentPasswordInput.vue to use validatedTextInput.vue 2023-05-30 21:24:46 +02:00
negue 61521507a4 fix username setting: 
- unsaved values check
- @ char must be first in input, otherwise not remove it for checks
 2023-05-30 20:20:56 +02:00
negue f74c29a065 Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	package-lock.json
#	website/client/src/components/settings/site.vue
#	website/client/src/components/tasks/column.vue
#	website/server/models/user/schema.js
 2023-05-30 19:54:06 +02:00
Phillip Thelen d4a5823916 Fix one-off issue for monthly subs (#14643) 
* Fix initial plan.consecutive.offset for 1 month subs

* fix initial values for group plan subs

* Make perkMonthCount editable in admin panel

* Add aditional info to admin panel

* Implement automatic fix for affected users

* fix(lint): exclusive test, code style

* fixes

* fix issue with initialization

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-05-24 13:29:42 -05:00
SabreCat 8e5b66a73e Merge branch 'release' into develop 2023-05-23 09:16:50 -05:00
SabreCat f755d4c133 4.271.0 v4.271.0 2023-05-23 09:07:47 -05:00
SabreCat 102c71c4ca Merge remote-tracking branch 'CuriousMagpie/2023-05-pet-quest-bundle' into release 2023-05-22 15:14:18 -05:00
SabreCat a7bde80349 Squashed commit of the following: 
commit 27287ac3aa
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Mon May 22 15:59:20 2023 -0400

    fix(typo): typos fixed

commit a4df8097cf
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Mon May 22 15:57:17 2023 -0400

    feat(content): add migration script

commit 23ff7845c1
Merge: d02644e21b 8ba7117fa5
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Mon May 22 15:42:32 2023 -0400

    Merge branch 'develop' into achievement-dinosaur-dynasty

commit 8ba7117fa5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 22 12:35:07 2023 -0400

    build(deps): bump stripe from 12.5.0 to 12.6.0 (#14662)

    Bumps [stripe](https://github.com/stripe/stripe-node) from 12.5.0 to 12.6.0.
    - [Release notes](https://github.com/stripe/stripe-node/releases)
    - [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/stripe/stripe-node/compare/v12.5.0...v12.6.0)

    ---
    updated-dependencies:
    - dependency-name: stripe
      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>

commit fe5d4a0551
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 22 12:34:28 2023 -0400

    build(deps-dev): bump sinon from 15.0.4 to 15.1.0 (#14661)

    Bumps [sinon](https://github.com/sinonjs/sinon) from 15.0.4 to 15.1.0.
    - [Release notes](https://github.com/sinonjs/sinon/releases)
    - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
    - [Commits](https://github.com/sinonjs/sinon/compare/v15.0.4...v15.1.0)

    ---
    updated-dependencies:
    - dependency-name: sinon
      dependency-type: direct:development
      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>

commit d02644e21b
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Wed May 17 11:36:28 2023 -0400

    feat(content): add dinosaur dynasty achievement
 2023-05-22 15:13:49 -05:00
SabreCat bedce203ee 4.270.3 v4.270.3 2023-05-22 13:28:31 -05:00
dependabot[bot] 8ba7117fa5 build(deps): bump stripe from 12.5.0 to 12.6.0 (#14662) 
Bumps [stripe](https://github.com/stripe/stripe-node) from 12.5.0 to 12.6.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v12.5.0...v12.6.0)

---
updated-dependencies:
- dependency-name: stripe
  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-05-22 12:35:07 -04:00
dependabot[bot] fe5d4a0551 build(deps-dev): bump sinon from 15.0.4 to 15.1.0 (#14661) 
Bumps [sinon](https://github.com/sinonjs/sinon) from 15.0.4 to 15.1.0.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v15.0.4...v15.1.0)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:development
  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-05-22 12:34:28 -04:00
SabreCat deebc09a79 fix(analytics): typo 2023-05-22 09:54:10 -05:00
SabreCat b63f2fa1fa fix(analytics): add missing headers to 3 events 2023-05-19 14:54:30 -05:00
CuriousMagpie 0b0cbb45f4 feat(content): add May pet quest bundle 2023-05-17 10:49:37 -04:00
SabreCat d176c31382 4.270.2 v4.270.2 2023-05-16 12:22:21 -05:00
Phillip Thelen 8150fef993 Database Access optimisations (#14544) 
* Optimize database access during spell casting

* load less data when casting spells

* Begin migrating update calls to updateOne and updateMany

* Only update user objects that don’t have notification yet

* fix test

* fix spy

* Don’t unnecessarily update user when requesting invalid guild

* fix sort order for middlewares to not load user twice every request

* fix tests

* fix integration test

* fix skill usage not always deducting mp

* addtest case for blessing spell

* fix healAll

* fix lint

* Fix error for when some spells are used outside of party

* Add check to not run bulk spells in web client

* fix(tags): change const to let

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-05-16 12:21:45 -05:00
SabreCat f0637dcf49 4.270.1 v4.270.1 2023-05-15 16:15:22 -05:00
SabreCat 0518b90eab Merge branch 'develop' into release 2023-05-15 16:11:30 -05:00
SabreCat f968bdd3a9 fix(analytics): re-enable group chat tracking 2023-05-15 16:02:24 -05:00
negue e3a1ea6180 save task column filter (#14587) 
* save task column filter

* remove old setting

* fix tests
 2023-05-15 16:01:32 -05:00
Natalie L 17f6054ef0 feat(content): add May magic hatching potions (#14641) 2023-05-15 15:59:49 -05:00
dependabot[bot] 9b8f213c63 build(deps): bump jquery from 3.6.4 to 3.7.0 in /website/client (#14653) 
Bumps [jquery](https://github.com/jquery/jquery) from 3.6.4 to 3.7.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.6.4...3.7.0)

---
updated-dependencies:
- dependency-name: jquery
  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-05-15 13:46:41 -04:00
dependabot[bot] 48bb3e2886 build(deps): bump core-js from 3.30.1 to 3.30.2 in /website/client (#14635) 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.30.1 to 3.30.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.30.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-12 16:47:35 -05:00
dependabot[bot] 308d557770 build(deps): bump superagent from 8.0.6 to 8.0.9 (#14473) 
Bumps [superagent](https://github.com/ladjs/superagent) from 8.0.6 to 8.0.9.
- [Release notes](https://github.com/ladjs/superagent/releases)
- [Changelog](https://github.com/ladjs/superagent/blob/master/HISTORY.md)
- [Commits](https://github.com/ladjs/superagent/compare/v8.0.6...v8.0.9)

---
updated-dependencies:
- dependency-name: superagent
  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-05-12 16:35:21 -05:00
dependabot[bot] 0f4816c674 build(deps): bump intro.js from 6.0.0 to 7.0.1 in /website/client (#14558) 
Bumps [intro.js](https://github.com/usablica/intro.js) from 6.0.0 to 7.0.1.
- [Release notes](https://github.com/usablica/intro.js/releases)
- [Changelog](https://github.com/usablica/intro.js/blob/master/tsconfig.release.json)
- [Commits](https://github.com/usablica/intro.js/compare/v6.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: intro.js
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-12 16:35:06 -05:00
dependabot[bot] f1b98a530d build(deps): bump jsonwebtoken from 8.5.1 to 9.0.0 (#14418) 
Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.5.1 to 9.0.0.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.1...v9.0.0)

---
updated-dependencies:
- dependency-name: jsonwebtoken
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-12 16:29:16 -05:00
dependabot[bot] 1498eba8d4 build(deps): bump @babel/preset-env from 7.20.2 to 7.21.5 (#14616) 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.20.2 to 7.21.5.
- [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.21.5/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  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-05-12 16:28:41 -05:00
dependabot[bot] fc16ffbf2d build(deps): bump dompurify from 2.4.3 to 3.0.3 in /website/client (#14639) 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.3 to 3.0.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.3...3.0.3)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-12 16:22:06 -05:00
dependabot[bot] 021180fa59 build(deps): bump uuid from 8.3.2 to 9.0.0 in /website/client (#14227) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v8.3.2...v9.0.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-12 16:13:53 -05:00
dependabot[bot] 102e6a64ad chore(deps): bump sass from 1.34.0 to 1.62.1 in /website/client (#14614) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.34.0 to 1.62.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.34.0...1.62.1)

---
updated-dependencies:
- dependency-name: sass
  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-05-12 16:07:36 -05:00
dependabot[bot] 8cd6e1654f build(deps): bump @babel/core from 7.21.4 to 7.21.8 (#14630) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.21.4 to 7.21.8.
- [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.21.8/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  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-05-12 16:05:20 -05:00
dependabot[bot] 63ea21c46d build(deps): bump stripe from 11.10.0 to 12.5.0 (#14646) 
Bumps [stripe](https://github.com/stripe/stripe-node) from 11.10.0 to 12.5.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v11.10.0...v12.5.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-12 16:03:29 -05:00
negue c4b6f0c39c Merge remote-tracking branch 'origin/develop' into negue/ui/setting 2023-05-12 22:08:08 +02:00
negue 37eee140ad delete account without password 2023-05-12 21:57:27 +02:00
SabreCat 6e3a367832 Merge branch 'release' into develop 2023-05-11 14:13:58 -05:00
SabreCat f3348aca4c 4.270.0 2023-05-09 10:29:19 -05:00
SabreCat 90e1bc9d5e Merge branch 'sabrecat/link-tweak' into release 2023-05-09 10:29:14 -05:00
Natalie L 453bf3a961 feat(content): add May Backgrounds and Enchanted Armoire items (#14628) 2023-05-09 10:26:00 -05:00
negue 48a6801f4e fix duplicate json entry 2023-05-08 22:06:29 +02:00
negue 47a2189f49 Merge remote-tracking branch 'origin/release' into negue/ui/setting 2023-05-08 21:48:21 +02:00
negue a56b4a4457 show current class on setting panel 2023-05-08 21:37:31 +02:00
negue 9c973cca2a fix selectDifficulty.vue - refactor selectList.vue 2023-05-08 21:15:46 +02:00
negue 95b37b3ba3 migrate restoreValues fix to new setting component 2023-05-08 20:45:09 +02:00
negue 7947b1c67d Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/components/groups/createPartyModal.vue
#	website/client/src/components/settings/restoreModal.vue
 2023-05-08 20:41:31 +02:00
SabreCat b026daec90 fix(rya): wait for DOM finished before update 2023-05-05 16:27:19 -05:00
SabreCat 49f45d27e3 4.269.1 v4.269.1 2023-05-04 16:08:53 -05:00
SabreCat d92a03048b fix(analytics): tweak CTA event 2023-05-04 14:20:49 -05:00