Commit Graph

2254 Commits

Author SHA1 Message Date
CuriousMagpie 190fe048a1 Merge branch 'develop' into report-profile-modal 2023-08-23 11:52:08 -04:00
SabreCat 63376b918e Squashed commit of the following:
commit b7fb903dcab2dbdc55ddd27e9cbd8054f0d5e2a8
Author: SabreCat <sabe@habitica.com>
Date:   Sat Aug 19 19:44:42 2023 -0500

    fix(invites): add missing param

commit 30053cc8b86fc1992d872a068e60f3dd5a456a07
Author: SabreCat <sabe@habitica.com>
Date:   Sat Aug 19 19:06:51 2023 -0500

    fix(party): enforce size limit when using @-names

commit 62dd314cda4165bedbc6b490a8e2f21de87deaf4
Author: SabreCat <sabe@habitica.com>
Date:   Sat Aug 19 19:01:15 2023 -0500

    Revert "Revert "fix(parties): actual 30 not 29""

    This reverts commit 63414a80fe.
2023-08-22 12:25:17 -05:00
SabreCat ba96cd6e24 Squashed commit of the following:
commit 22971a0c0bd1c25e147fdc9d662fd55ca522193b
Author: SabreCat <sabe@habitica.com>
Date:   Fri Aug 18 21:13:49 2023 -0500

    fix(auth): don't mix include/exclude

commit efbb8fa136587a4c781660246cb426968cfe108a
Author: SabreCat <sabe@habitica.com>
Date:   Fri Aug 18 20:51:30 2023 -0500

    refactor(auth): remove unneeded query field
2023-08-22 12:24:16 -05:00
SabreCat 9e0e2a83be Squashed commit of the following:
commit 474fa530a0392ff6e7461eaff64c81a67b5e4eff
Author: SabreCat <sabe@habitica.com>
Date:   Fri Aug 18 21:44:09 2023 -0500

    fix(challenges): filter out groups without perms
2023-08-22 12:23:39 -05:00
SabreCat c71f0b3fda Squashed commit of the following:
commit 6d74f87db332fd28c7522cabc0f96a390d36e64f
Author: SabreCat <sabe@habitica.com>
Date:   Fri Aug 18 20:04:52 2023 -0500

    fix(i18n): default to EN for empties
2023-08-22 12:23:02 -05:00
Natalie L e8f5958f77 feat(content): add boneless boss achievement (#14788)
* feat(content): add June subscriber items

* feat(content): add boneless boss achievement

---------

Co-authored-by: SabreCat <sabe@habitica.com>
2023-08-22 12:23:43 -05:00
SabreCat e73e8bfb9e Revert "fix(parties): actual 30 not 29"
This reverts commit bf0e640fa6.
2023-08-16 16:56:01 -05:00
SabreCat 58d58ff962 fix(guilds): correct various errors 2023-08-16 15:56:10 -05: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
CuriousMagpie c301a2b460 Merge branch 'develop' into report-profile-modal 2023-08-11 12:40:07 -04: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
CuriousMagpie 1b25394f3e Merge branch 'develop' into report-profile-modal 2023-07-26 11:50:12 -04: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
SabreCat 067a1de49e fix(lint): newlines, console 2023-07-18 10:20:58 -05:00
SabreCat c50cee0d88 fix(flagging): debug params issue
Also add and document the "source" body param
2023-07-12 16:32:25 -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 55848c58be WIP(members): basic report a user API 2023-07-10 16:24:20 -05: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
SabreCat dda6180792 fix(lint): remove console.info 2023-07-06 10:21:12 -05: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