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

2256 Commits

Author SHA1 Message Date
negue 41cde37675 Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/router/user-routes.js
 2023-08-21 21:51:22 +02:00
SabreCat db56134832 Merge branch 'sabrecat/leave-challenge' into release 2023-08-15 15:32:23 -05:00
SabreCat 1ea954ab10 fix(challenge): don't pierce privacy on GET/:id 2023-08-15 15:21:28 -05:00
SabreCat 8f64afe9df fix(challenges): leave chal from invalid group 2023-08-15 14:54:22 -05:00
SabreCat bf0e640fa6 fix(parties): actual 30 not 29 2023-08-15 14:33:32 -05:00
SabreCat 464e4f10b2 feat(chats): increase chat entries to 400 2023-08-11 14:34:27 -05:00
negue d279af7897 Merge branch 'negue/refactor/routes' into negue/ui/setting 
# Conflicts:
#	config.json.example
#	website/client/src/router/index.js
#	website/client/src/router/static-routes.js
#	website/client/src/router/user-routes.js
#	website/common/locales/en/settings.json
 2023-08-09 21:13:37 +02:00
SabreCat 60c0e6b3df fix(lint): whitespace 2023-08-08 01:26:56 -05:00
SabreCat 43c10f75c3 fix(lint): arrow fn 2023-08-08 01:08:11 -05:00
SabreCat d4e3e83d46 fix(challenges): map IDs 2023-08-07 23:53:55 -05:00
SabreCat 013f8bcca7 fix(challenges): fetch purchased 2023-08-07 22:56:58 -05:00
SabreCat ebd0cb72de fix(challenges): better screening 2023-08-07 22:26:56 -05:00
SabreCat c44b1670cf fix(challenges): revert to working 2023-08-07 22:00:47 -05:00
SabreCat 39477c6f11 fix(lint): or/and, import 2023-08-07 21:33:31 -05:00
SabreCat 1371b80635 fix(groups): add back string 
also fix party seeking analytics and a spurious text decoration
 2023-08-07 15:55:29 -05:00
SabreCat 9fa355fbcc fix(sunset): release candidate 2023-08-07 15:04:44 -05:00
SabreCat cce6d91611 fix(groups): return Plans on GET guilds 2023-08-07 12:24:43 -05:00
SabreCat 3109a03055 fix(sunset): Challenge filtering, transactions 2023-08-03 16:30:00 -05:00
SabreCat 8c88f56d08 fix(tests): chat related 2023-08-02 18:07:19 -05:00
SabreCat 9d61bd724a fix(tests): GET members 2023-08-02 16:02:53 -05:00
SabreCat c2ced5c925 fix(tests): manyfix 2023-07-28 16:29:51 -05:00
SabreCat 4c60371ebd fix(tests): fix fix fix 2023-07-28 16:08:14 -05:00
SabreCat 16be591ed8 fix(tests): subscriptions, group updates 2023-07-28 15:03:56 -05:00
SabreCat d394858022 fix(tests): new approach attempt 2023-07-25 18:00:31 -05:00
SabreCat cbaa3180cc Merge branch 'develop' into sabrecat/unsociable 2023-07-25 15:17:13 -05:00
Phillip Thelen 754d46f1f3 Optimise looking for party request (#14773) 
* Reset looking for party state if a user joins a party

* filter out users that already received an invite in query

* fix(lfp): add back in-party filter
Temporary until migration to clear seeking flag from users in party

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-07-25 14:16:03 -05:00
Sabe Jones 683649ff1a Don't collapse different spell targets in party chat (#14775) 
* fix(spells): don't collapse different targets

* fix(lint): indentation

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-07-25 14:15:12 -05:00
negue ccfdd9bb9c Merge remote-tracking branch 'origin/develop' into negue/ui/setting 2023-07-22 22:48:13 +02:00
SabreCat 067a1de49e fix(lint): newlines, console 2023-07-18 10:20:58 -05:00
SabreCat 259f7ef588 fix(chat): add default to switch block 2023-07-11 18:25:59 -05:00
SabreCat 106a0c9ed8 fix(chat): collapse repetitive spells for real now 2023-07-11 17:01:17 -05:00
Phillip Thelen 74ba5c0b27 bring merging to MVP 2023-07-11 15:10:50 +02:00
SabreCat bb54a6532d fix(chat): correct bad length check 2023-07-10 15:37:46 -05:00
SabreCat 3c36c59bb3 Merge branch 'develop' into phillip/chat-skill-merge 2023-07-10 15:12:12 -05:00
SabreCat 2308961de6 fix(lint): address fatal errors 2023-07-10 15:11:22 -05:00
Phillip Thelen 2d71a902f1 Merge skill casting messages together 2023-07-10 16:27: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 8445f45b31 Merge branch 'release' into sabrecat/unsociable 2023-06-19 18:14:22 -05:00
Phillip Thelen adf0a2efca Fix perkMonthCount not being editable/saving (#14711) 
Co-authored-by: SabreCat <sabe@habitica.com>
 2023-06-13 14:51:58 -05:00
SabreCat 7e2a35d7a9 WIP(sunset): fix private Guild and report form 2023-06-05 16:36:00 -05:00
SabreCat df5d1e95d1 chore(sunset): end standard guild creation API 2023-06-02 16:09:11 -05:00
SabreCat f4e8bf9c2e feat(form): Ask a Question mode on bug report 2023-06-02 15:58:24 -05: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 9228b070fa Merge branch 'release' into sabrecat/unsociable 2023-05-24 14:17:49 -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
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 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
SabreCat 8d9602fb16 WIP(chat): first pass deprecation 2023-05-17 16:33:44 -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