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

1318 Commits

Author SHA1 Message Date
negue 8fbb600273 saveCancelButtons.vue allow to hide the cancel part 2023-06-25 21:40:35 +02:00
negue 4915f2a3fb Hide Transactions Page again 2023-06-25 21:09:07 +02:00
negue 8b5ae17f02 also check for invalid arguments in the password settings 2023-06-25 20:52:03 +02:00
negue 87a4e4931b show notification on username change + fix userEmail checks 2023-06-25 20:01:31 +02:00
negue 6a6f55f6fc Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/components/settings/site.vue
 2023-06-24 22:54:00 +02:00
SabreCat df84d7c7b1 Merge branch 'release' into develop 2023-06-19 16:36:39 -05:00
Natalie L c7ed693e18 feat(gala): Add 2023 Summer Splash Gala Items (#14712) 
* feat(content): add June subscriber items

* feat(gala): add images

* feat(gala): add code

* feat(gala): text strings

* feat(gala): testing and final updates

* feat(gala): fixed a couple of typos

* fix(event): proofread strings and dates
Also replace empty descriptions for Rogue and Healer

* fix(event): NO EGG

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-06-19 16:36:05 -05:00
Ash e72a25ad02 Fixes #14438: a11y: add semantic roles to habit and todo controls (#14467) 
* a11y: add aria roles to habit control

* a11y: add role to todo checkboxes

* a11y: add aria-labels to score buttons
Helps with screen readers

* add i18n to aria-labels
 2023-06-19 17:00:16 -04:00
SabreCat 91d98b86e1 fix(lint): whitespace 2023-06-13 14:40:26 -05:00
Natalie L ab68e8a5fe feat(content): add June pet quest bundle (#14694) 
* feat(content): add June subscriber items

* feat(content): add June pet quest bundle

* fix(bundle): correct timing and visual issues

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-06-12 15:01:34 -05:00
SabreCat 60ed9d2944 Merge branch 'develop' into release 2023-06-06 16:33:27 -05:00
Natalie L 91fc4235aa fix(string): remove "due" string (#14683) 2023-06-06 16:33:01 -05:00
SabreCat 42e8dd1361 fix(vue): correct bad popovers breaking Chrome 2023-06-06 16:30:37 -05:00
Natalie L bb28bb5969 feat(content): add June backgrounds and Enchanted Armoire items (#14684) 
* feat(content): add June subscriber items

* feat(content): add July backgrounds and Enchanted Armoire items

* feat(fix): correct sizing for aquarium background

* fix(strings): JSON formatting

* fix(sprites): add missing broad variant

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-06-06 09:17:22 -05:00
negue f9ff5e5c55 check password inputs and mark invalid for "password change" setting 2023-05-30 22:41:42 +02:00
Natalie L 867eed176e feat(content): add June subscriber items (#14669) 
Co-authored-by: SabreCat <sabe@habitica.com>
 2023-05-30 15:26:16 -05:00
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
SabreCat 17072dcc45 Merge branch 'due-dates-in-todos' into release 2023-05-25 14:42:46 -05:00
SabreCat 2448f401f2 Merge branch 'increment-component' into release 2023-05-25 14:42:42 -05: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
CuriousMagpie 86b15cb580 fix(style): css fix, today if-statement added 2023-05-23 15:19:26 -04: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
CuriousMagpie 60b180681e Merge remote-tracking branch 'origin/due-dates-in-todos' into due-dates-in-todos 2023-05-17 13:30:45 -04:00
CuriousMagpie 7c1c18a329 fix(styling): update colors to be a11y-friendly and to show items due today in gray 2023-05-17 13:29:26 -04:00
Sabe Jones 48917fd8be Merge branch 'develop' into due-dates-in-todos 2023-05-16 14:18:22 -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
negue e3a1ea6180 save task column filter (#14587) 
* save task column filter

* remove old setting

* fix tests
 2023-05-15 16:01:32 -05:00
CuriousMagpie daccade2e2 disabled sell button when user tries to sell more items than they own 2023-05-15 12:03:58 -04:00
SabreCat 79a5c2ec5f Merge branch 'develop' into due-dates-in-todos 2023-05-12 16:06:18 -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
CuriousMagpie 0a23dd5311 attempt to fix sellModal 2023-05-11 16:25:11 -04: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 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
CuriousMagpie 479cfb76ef fix(to do dates): locate a string for "Due" 2023-05-04 16:40:11 -04:00
CuriousMagpie 0e0cd99ded fix(to do dates): Add the word "Due" to the HTML 2023-05-04 16:35:27 -04:00
CuriousMagpie 7e210c56b0 fix(to do dates): change formatDueDate () to show exact due dates 2023-05-04 16:29:54 -04:00
SabreCat d92a03048b fix(analytics): tweak CTA event 2023-05-04 14:20:49 -05:00
SabreCat 8183699cb7 feat(analytics): differentiate party CTA scenarios 2023-05-03 16:04:22 -05:00