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

1277 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 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
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 8c88f56d08 fix(tests): chat related 2023-08-02 18:07:19 -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
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 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
SabreCat f968bdd3a9 fix(analytics): re-enable group chat tracking 2023-05-15 16:02:24 -05: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 e9e4265545 Squashed commit of the following: 
commit 00affb306655a543f5d29b3af6361e686b577a97
Author: SabreCat <sabe@habitica.com>
Date:   Tue May 2 09:47:25 2023 -0500

    fix(tests): account for invite limit changes

commit 47661117f9fd661b8bc8f63b7cc7c8d5f8fa0fd7
Author: SabreCat <sabe@habitica.com>
Date:   Mon May 1 17:39:29 2023 -0500

    fix(lfp): final polish

commit 6a1e5af1db0dd90be3ced7e223f53c9183a206f5
Merge: 728ed2ddad 9e0777bb42
Author: SabreCat <sabe@habitica.com>
Date:   Mon May 1 16:54:12 2023 -0500

    Merge branch 'release' into sabrecat/party-seeking

commit 728ed2ddad7f0962d28f1ab0a271e3555b19296c
Author: SabreCat <sabe@habitica.com>
Date:   Thu Apr 27 16:51:06 2023 -0500

    fix(lfp): loading layout and page visit event

commit 8a56ab329bff922e05963e3ef78fbc26ff273924
Author: SabreCat <sabe@habitica.com>
Date:   Wed Apr 26 16:54:46 2023 -0500

    fix(faq): copy and style updates

commit 6fd00d7f30150a1802e5a37edbb914ef120caf9a
Author: SabreCat <sabe@habitica.com>
Date:   Fri Apr 21 17:12:52 2023 -0500

    feat(lfp): fixes, analytics, FAQ

commit 4b5d7304ad7cfc5f72320b23456ed2898e53caac
Author: SabreCat <sabe@habitica.com>
Date:   Mon Apr 17 15:13:03 2023 -0500

    fix(lfp): smol tweaks

commit 9a5476a2558eb17a603f4aae1b5b2d35773be8b4
Author: SabreCat <sabe@habitica.com>
Date:   Thu Apr 13 16:03:33 2023 -0500

    feat(lfp): refresh button

commit aa58f5018469f38a9a9d31c3bffa26bb88a8c672
Merge: bbb03d006e c8adf20804
Author: SabreCat <sabe@habitica.com>
Date:   Tue Apr 11 17:44:56 2023 -0500

    Merge branch 'release' into sabrecat/party-seeking

commit bbb03d006e8b122bb7206bdc778a31de422167bb
Author: SabreCat <sabe@habitica.com>
Date:   Tue Apr 4 18:30:50 2023 -0500

    fix(lint): whitespace and const

commit 23683ad29a4cce0b0da061ad6c030982034c0a9c
Author: SabreCat <sabe@habitica.com>
Date:   Tue Apr 4 17:02:57 2023 -0500

    chore(LFP): add analytics
    also re-fix loading state

commit 4477d84f5266c87f5583368029b72153f00f0568
Author: SabreCat <sabe@habitica.com>
Date:   Mon Apr 3 16:24:26 2023 -0500

    fix(LFP): address issues with loading

commit bdc5154f24bb5e50963376c3c0c9cc73c0b05ccc
Merge: 81923eef6f 229ed46425
Author: SabreCat <sabe@habitica.com>
Date:   Mon Apr 3 15:58:12 2023 -0500

    Merge branch 'release' into sabrecat/party-seeking

commit 81923eef6f0c627d079475a28f9d93d8e4628934
Author: SabreCat <sabe@habitica.com>
Date:   Thu Mar 30 16:44:49 2023 -0500

    feat(LFP): release candidate

commit fe1f8939fc6b09d36cfaf0b6e5838df04e41009d
Author: SabreCat <sabe@habitica.com>
Date:   Wed Mar 29 17:35:54 2023 -0500

    WIP(LFP): fixes

commit afc361f5a9f806cbd814ad910d1274e3a6609efd
Merge: d6b5cbdebc 7ede3acd01
Author: SabreCat <sabe@habitica.com>
Date:   Wed Mar 29 16:24:39 2023 -0500

    Merge branch 'release' into sabrecat/party-seeking

commit d6b5cbdebc2829e9325ea57fb5deeccc128c1635
Author: SabreCat <sabe@habitica.com>
Date:   Tue Mar 28 16:13:18 2023 -0500

    WIP(LFP): change copy, add close X, fix API response

commit 4274a4625862351ef0ecf33c8a3249ca5ebec7cb
Author: SabreCat <sabe@habitica.com>
Date:   Mon Mar 27 17:07:36 2023 -0500

    fix(LFP): layout, unset when stopping

commit 95abfcfa5f13c9cce6385206947a47f85b76d11d
Merge: 4a360eedd8 53c536b525
Author: SabreCat <sabe@habitica.com>
Date:   Mon Mar 27 16:32:46 2023 -0500

    Merge branch 'release' into sabrecat/party-seeking

commit 4a360eedd8b9cf41d3a0fe7a4cfaa72c5bd7bd26
Author: SabreCat <sabe@habitica.com>
Date:   Thu Mar 23 16:54:49 2023 -0500

    feat(LFP): completed style and infinite scroll

commit bbc439d9d03c9631a450236eb33af66f0428fa50
Author: SabreCat <sabe@habitica.com>
Date:   Tue Mar 21 10:40:26 2023 -0500

    WIP(LFP): nicer layout, buffs fix

commit 1658688597456663477ab19da61ae1b9bc85cf2a
Merge: 664507434f 027e61a93e
Author: SabreCat <sabe@habitica.com>
Date:   Tue Mar 21 09:29:02 2023 -0500

    Merge branch 'release' into sabrecat/party-seeking

commit 664507434f2f76e6bf3b61cdc9e3daddb81204af
Author: SabreCat <sabe@habitica.com>
Date:   Fri Mar 17 17:13:08 2023 -0500

    WIP(LFP): API and client adjustments

commit 2f0b6f2517f9e2d634cb23ee303cfb4542e998ce
Merge: 0db1704325 a16098ccda
Author: SabreCat <sabe@habitica.com>
Date:   Fri Mar 17 16:45:13 2023 -0500

    Merge branch 'release' into sabrecat/party-seeking

commit 0db1704325c3555f0b5d9c8d1dfc44177e90c093
Author: SabreCat <sabe@habitica.com>
Date:   Mon Mar 13 14:48:10 2023 -0500

    fix(modal): scrollbar for squashed viewports

commit 733c35192e0a4e31e1bebfdd7488cfc1f7587f36
Author: SabreCat <sabe@habitica.com>
Date:   Thu Mar 9 12:51:02 2023 -0600

    WIP(party): seekers functional rough

commit d4b854410b557db26eec6e6a26b6d174c02cee3a
Merge: 7fe919825a 0b6b967753
Author: SabreCat <sabe@habitica.com>
Date:   Thu Mar 9 10:07:28 2023 -0600

    Merge branch 'release' into sabrecat/party-seeking

commit 7fe919825abfb6d518cb93b91f5997d3831bd0b5
Author: SabreCat <sabe@habitica.com>
Date:   Thu Mar 2 14:40:09 2023 -0600

    feat(party): several adjustments to seeking feature

commit c93900efcf925f7aaa4c4cb56b4451f19adfb1b3
Author: SabreCat <sabe@habitica.com>
Date:   Wed Mar 1 20:37:11 2023 -0600

    feat(party): initial Seeking API

commit 8bb784daeceb14c23992a6f3af1054a900fc26c1
Merge: e19a661a21 f327795761
Author: SabreCat <sabe@habitica.com>
Date:   Wed Mar 1 18:58:20 2023 -0600

    Merge branch 'release' into sabrecat/party-seeking

commit e19a661a2163a50307a286379bffb44201ed392e
Author: SabreCat <sabe@habitica.com>
Date:   Fri Feb 24 15:51:42 2023 -0600

    WIP(parties): add seeking flag and modal toggle
 2023-05-02 09:51:33 -05:00
SabreCat 3cf5b90f04 fix(3p): bad import, change flag format 2023-04-19 09:33:03 -05:00
SabreCat 86efb02358 fix(api): address issues caused by 3p tools 
and flag accounts that use them
 2023-04-18 15:43:35 -05:00
negue b4904a8b84 Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/components/settings/api.vue
#	website/client/src/components/settings/site.vue
 2023-04-06 00:18:07 +02:00
SabreCat b472af532c Merge branch 'apple_sub_fix' into release 2023-03-21 13:54:16 -05:00
negue 576c80af7e Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/components/payments/selectUserModal.vue
#	website/client/src/components/settings/site.vue
#	website/client/src/router/index.js
 2023-03-14 21:04:05 +01:00
SabreCat 3354ca048c fix(analytics): record missing group ID info 
also update subproject while I'm here
 2023-03-06 15:36:17 -06:00
Phillip Thelen 967717a010 Fix logic for apple subscriptions 2023-02-06 11:17:35 +01:00
negue bec75c6e12 reset account + password required in api 2023-02-05 18:52:54 +01:00
SabreCat 27964a2d86 fix(analytics): add headers to group task assignment 2023-01-27 19:57:15 -06:00
SabreCat ecac3f0c5f fix(backgrounds): disallow equipping unowned bashground 
Also add missing headers when recording group task creation
 2023-01-27 19:26:19 -06:00
SabreCat e5bbde7e97 feat(event): 10th Birthday Bash 
with @CuriousMagpie and @phillipthelen
 2023-01-20 16:14:33 -06:00
SabreCat 1f59d95465 Merge branch 'sabrecat/pass-change-max' into release 2022-12-15 15:02:05 -06:00
Sabe Jones eb2cb9e921 Refactor FAQ (#14372) 
* refactor(faq): fetch from API on web
Also make question list more maintainable, allowing different questions across platforms

* fix(tests): don't return null when function is expected
Also removes the unnecessary default to web in controller

* fix(tests): add new fields to expectation, add placeholders

* refactor(faq): allow reordering

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-12-15 11:34:07 -06:00
SabreCat df25e0574d fix(auth): enforce max pass length at update 2022-12-05 16:36:42 -06:00
Natalie L 116068effa fix(apiDescription): remove incorrect information (#14367) 2022-11-18 16:21:03 -06: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
SabreCat aea0be3245 fix(subs): establish lock to prevent race condition 2022-11-01 20:47:21 -05:00
Adam Tommasi 137f7d53dc add qty param for gem/gem-purchasable item apidoc (#14219) 
* add qty param for gem/gem-purchasable item

* fix(lint): remove extra whitespace

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-10-07 16:33:38 -05:00
SabreCat 8cd9536bdc Merge branch 'develop' into release 2022-09-30 15:25:27 -05:00