Phillip Thelen
ce796fa1d9
begin building recurring content scheduling
2024-04-01 17:51:24 -05:00
Sabe Jones
0b230b0a87
fix(content): adjust release dates
2024-04-01 15:48:43 -05:00
Sabe Jones
ef1f27c09f
Squashed commit of the following:
...
commit 0eb12305a58c148027759ea257f0f287796afdda
Author: Sabe Jones <sabe@habitica.com>
Date: Thu Mar 28 17:13:05 2024 -0500
feat(event): start April 1 midnight end April 2 8pm
commit de75cf2b9616ad4fe56051d5644c556bd40b874e
Author: Sabe Jones <sabe@habitica.com>
Date: Thu Mar 28 08:52:01 2024 -0500
fix(event): correct start timing
commit 34b72be4f447f00c31169c4cd6e8ba79655adf8a
Author: Sabe Jones <sabe@habitica.com>
Date: Wed Mar 27 08:56:27 2024 -0500
feat(event): AF by @CuriousMagpie
2024-03-28 17:17:17 -05:00
Sabe Jones
c762146ec9
fix(quests): egg availability, again
2024-03-26 13:09:41 -05:00
Sabe Jones
39fc6248d6
fix(event): adjust Egg quest release date
2024-03-26 06:48:45 -05:00
Natalie
64f5c170d0
update(content): 2024-04 content prebuild ( #15176 )
...
* update(content): starting april prebuild
* update(content): april prebuild
* update(content): april prebuild
2024-03-21 15:25:33 -05:00
Sabe Jones
70434b17cc
WIP(shop): show customs in buy modal
2024-03-14 17:29:15 -05:00
Sabe Jones
a921a8bc61
Merge branch 'release' into sabrecat/customizations
2024-03-14 14:55:56 -05:00
Natalie
3e5226de67
update(content): add 2024 Spring Fling ( #15168 )
...
* update(content): add spring fling images, items, and placeholder text
* update(dates) : set canonical dates
* update(dates/quests): set canonical dates for both, add egg quest availability
* update(date): update quest availability start date
* update(content): add magic hatching potions
* fix(dates): canonical dates
* fix(event): add correct event name to potions
* fix(dates): canonical dates
* fix(dates): fix UTC offset, remove package.json and package-lock.json
* fix(dates): canonical
* fix: re-added package.json and package-lock.json
* update(content): add gear strings
* update(content): add Rogue off-hand string, canonical dates
2024-03-13 16:34:41 -05:00
Sabe Jones
0aa9d4d1d5
WIP(shops): start wiring up buy modals
2024-03-11 16:09:16 -05:00
Sabe Jones
0ead06937b
Merge branch 'release' into sabrecat/customizations
2024-03-11 14:54:34 -05:00
Sabe Jones
8fa91a3805
chore(node): upgrade to Node 20
2024-03-11 09:59:57 -05:00
Sabe Jones
4e0d8cba51
Merge branch 'release' into sabrecat/customizations
2024-03-01 14:31:28 -06:00
Sabe Jones
ecc8a65d28
WIP(customizations): animal bits
2024-02-29 15:59:31 -06:00
Natalie
caa73057d8
update(content): March 2024 content ( #15161 )
...
* feat(content): add February subscriber item, backgrounds, and enchanted armoire gear
* feat(content): add spritesheet
* feat(content): bug smashing
* fix(file): revert package.json to release
* feat(content): add quest bundles
* feat(content): add new achievement
* feat(content): add achievement script
* fix(curlies): remove stray curly boi
* fix(date): add canonical date
* fix(dates): updated background & armoire to canonical dates
* feat(content): add armoire strings & stats
* fix(migration): Golden Squirrel
* fix(backgrounds): trim extra whitespace
* fix(test): cuddle timing
---------
Co-authored-by: Sabe Jones <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2024-02-27 17:25:57 -06:00
Sabe Jones
28fef8df86
WIP(shops): shirts vs skins
2024-02-27 15:17:10 -06:00
Sabe Jones
33b54a734e
WIP(shop): more CSS, add hair styles
2024-02-22 17:03:07 -06:00
Sabe Jones
09ff3ee865
WIP(customizations): load hair colors
2024-02-20 17:56:56 -06:00
Sabe Jones
cbfeb18517
WIP(shop): backgrounds appear
2024-02-16 17:58:11 -06:00
Sabe Jones
63e7ace693
WIP(shops): customization categories skeleton
2024-02-15 17:51:14 -06:00
CuriousMagpie
5626991074
fix(content): fix February background release date
2024-02-01 15:43:11 -05:00
Natalie
0b5ce61555
feat(content): add February items ( #15090 )
...
* update(content): add February 2024 items
* feat(content): add October content
* feat(content):update February Content
* feat(content): finish up February content
* fix(backgrounds): tweak consistency
* fix(strings): remove extra whitespace
* fix(event): add missing Valentine features
---------
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: Sabe Jones <sabe@habitica.com>
2024-01-26 16:35:02 -06:00
Sabe Jones
724c710636
fix(birthday): correct birthday robe ownership check
2024-01-23 15:08:20 -06:00
Phillip Thelen
f8d315ff6e
Upgrade to mongoose 7 ( #14971 )
...
* remove some unused dependencies
* update mongoose version
* make common tests pass
* Make unit tests pass
* make api v3 integration tests pass
* fix lint issues
* fix issue with package-lock
* fix(lint): we don't need no .js
* fix(lint): update to latest config-habitrpg
* chore(npm): update package locks
* fix(test): replace deprecated fn
* chore(package): update eslint-habitrpg again
* fix(lint): server linting
* fix(lint): client linting
* fix(client): correct mangled common imports
* chore(npm): update package-locks
* fix(lint): punctuation, module
---------
Co-authored-by: SabreCat <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2024-01-16 15:18:47 -06:00
Phillip Thelen
d0e4b533e3
Add new fields to admin panel ( #14943 )
...
* Add new fields to admin panel
* fix lint
* Update hall.js
* fix(plab): plab
* fix(lint): destructure assignment
* fix(subs): coerce offset to number
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2024-01-16 14:45:57 -06:00
Sabe Jones
5300de834f
Squashed commit of the following:
...
commit 4950f403782ba12e54e2254a894b608673e27621
Author: SabreCat <sabrecat@gmail.com>
Date: Fri Jan 5 16:02:08 2024 -0600
fix(armoire): remove unreleased items at definition time
commit b195f0c45581c81f8aec7f5ddb105f5fc5aa7767
Author: SabreCat <sabrecat@gmail.com>
Date: Fri Jan 5 15:37:09 2024 -0600
Revert "fix(content): filter out unreleased gear"
This reverts commit 6f9e526d94b1e473eba37e5f40fa6b889cccff1c.
commit 6f9e526d94b1e473eba37e5f40fa6b889cccff1c
Author: SabreCat <sabrecat@gmail.com>
Date: Thu Jan 4 16:22:39 2024 -0600
fix(content): filter out unreleased gear
2024-01-10 15:18:36 -06:00
SabreCat
7fb1c9db8c
Squashed commit of the following:
...
commit 5b2f90356bd5630272ebabefb763f100926288c8
Author: SabreCat <sabrecat@gmail.com>
Date: Fri Dec 15 16:19:02 2023 -0600
fix(migration): full URL
commit a2962c0d106ce84d06a6478c1babacb1b776cc6f
Author: SabreCat <sabrecat@gmail.com>
Date: Fri Dec 15 15:57:21 2023 -0600
feat(migration): add birthday notif
commit 9da8e39dd03932cd9d4269ff7f6823856fa97798
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Dec 15 12:32:25 2023 -0500
feat(script): awards 2024 Habitica birthday robes
commit 7de6b80ee6fe59d708ba38b0e0aff8269b5b2f58
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Dec 14 13:11:07 2023 -0500
feat(content): add Habitica birthday item
commit 1bb95f58679425fbb323ccfae1fe0a823d120a70
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Dec 14 11:43:12 2023 -0500
fix(dates): fix availability dates to canonical
commit 8e7f49f2539b5dbd5cb35176f77a93796e4880d0
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Dec 14 11:37:44 2023 -0500
feat(content): make 2024 default backgroumd, fix errors
commit acc30f044eee3550e778831c91587e1a48f17ede
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Dec 13 16:53:33 2023 -0500
feat(content): the rest of the January content
commit 6a5e45c6d0dd9d6ef7f8898085ea10b9a25c2199
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Dec 13 16:49:33 2023 -0500
feat(content): January content
2023-12-29 16:07:43 -06:00
SabreCat
f66b05f707
fix(potions): use normal release date notes
2023-12-29 15:57:46 -06:00
SabreCat
f8ba191eea
fix(gala): correct seasonal shop quests/spell
2023-12-19 10:07:32 -06:00
SabreCat
8a45f753ca
Merge branch '2023-winner-funderlamb' into release
...
by @CuriousMagpie
2023-12-17 19:36:15 -06:00
SabreCat
97c63e2be7
fix(faq): correct duped index
2023-12-01 16:44:40 -06:00
Natalie
8db8a8267b
feat(content): December 2023 Content ( #15023 )
...
* feat(content): add December subscriber items, backgrounds, and enchanted armoire
* feat(content): correct item slot for armoire, change release dates for testing
* fix(backgrounds): correct start date
* fix(armoire): Add canonical start date
* fix(test): only count released items
---------
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2023-11-28 15:01:27 -06:00
Natalie
ed907c1ae5
fix(dates): upgrade dynamic end dating for quest bundle endings ( #15015 )
...
* fix(quest text): Updated end date for Oddballs to November 30.
* fix(dates): remove hard-coded bundle end-dates
* fix(dates): add dynamic dating to end of quest bundles
* fix(dates): commas are important
* fix(dates): November only has 30 days
* fix(dates): upgrade dynamic end dating for quest bundle endings
2023-11-22 15:28:23 -06:00
Natalie
021825ebb9
fix(shop): add November magic hatching potions to featured items in shop ( #15014 )
2023-11-22 15:14:42 -06:00
Natalie
a80ef78be0
2023 November Content Prebuild ( #14954 )
...
* feat(content): October sub items
* feat(content): October bgs and armoire
* feat(content): add Dune Buddy achievement
* feat(releases): timed Backgrounds and Armoire
* feat(content): timed release achievement
* feat(content): November subscriber items
* feat(content): November pet quest bundle
* feat(content): November magic hatching potions
* feat(content): November backgrounds and armoire
* feat(content): new achievement code -- needs work
* update package.lock on local/origin repos
* fix(content): added October headgear info and November set name
* fix(typo): spelling is important
* feat(content): added logic to allow for pets & mounts to be in one achievement and fixed issues with image
* fix(armoire): correct month
* fix(armoire): deprecate armoireEmpty flag
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-11-07 08:55:50 -06:00
SabreCat
33b6de85cc
feat(faq): unify platform FAQs
...
by @CuriousMagpie with edits by @SabreCat
2023-10-31 11:41:24 -05:00
SabreCat
61beb770f1
feat(content): subscriber items Nov 2023
...
by @CuriousMagpie
2023-10-31 11:18:23 -05:00
Sabe Jones
38974617b5
fix(event): sale in 2023 not just 2022
2023-10-17 22:34:05 +00:00
Sabe Jones
4974712d6c
fix(stats): enforce sensible maxima in db
2023-10-17 22:31:43 +00:00
SabreCat
1da6eeb169
feat(content): Dune Buddy Achievement
2023-10-16 20:15:08 -05:00
CuriousMagpie
56ccf19c26
feat(content): October bgs and armoire
2023-10-09 12:55:16 -05:00
SabreCat
a0941ffa84
Squashed commit of the following:
...
commit 16d8b87e90655c5444d0138e3c9df432b6dab8d9
Merge: 07387faf48 6bea232d476bea232d47#14867 )
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.32.1 to 3.32.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.32.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>
commit cebb3f0f25#14868 )
Bumps [webpack](https://github.com/webpack/webpack ) from 4.46.0 to 4.47.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.46.0...v4.47.0 )
---
updated-dependencies:
- dependency-name: webpack
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 ea8563cd17bb2a60c74eb518bbce105b66a8ecd5
Merge: 3e16584dcf 6259955891
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 21:23:02 2023 +0200
Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting
commit 3e16584dcf70dc844d806f5f487bf94c171f91ad
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 21:22:06 2023 +0200
fix PR comments
commit 84ba44fb192c1e6ccd895beae067468285f438a3
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 20:38:54 2023 +0200
fix PR comments
commit 6259955891a6469760768dcc5e6ae204fa3b44bd
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Aug 25 11:20:26 2023 -0400
update form.scss
commit da82bd8e68fb1d6567b987a61c2d15176ffa81c2
Author: negue <eugen.bolz@gmail.com>
Date: Thu Aug 24 21:40:02 2023 +0200
remove ending
commit 82e5fd2a83e9df85e0268e0937dd83be62bcc73d
Author: negue <eugen.bolz@gmail.com>
Date: Mon Aug 21 22:25:41 2023 +0200
fix spacing
commit 9ad06ea88bbb6b806823184a370366392ff7ad01
Author: negue <eugen.bolz@gmail.com>
Date: Mon Aug 21 22:09:22 2023 +0200
clean up debug row for login methods
commit 41cde37675d6132425b3bb4bb0ac5badb9ba0447
Merge: 8c568060f9 82ebe71eb4647b27c55f8558dcc3a8e49d26eacdd4a58239166e3a36783249f45d27e371e165433ab159182188c8b98678d0377b152ffd9f64633a57c7aadede4d580139ff6990b34c4dac04e2a39a9f4dca69f14b53fb28cc4862b4315b3d137f7d53dc
2023-10-03 13:30:44 -05:00
CuriousMagpie
b8b0d668c9
feat(content): October sub items
2023-09-29 14:51:45 -05:00
SabreCat
1d3006ae29
chore(event): schedule spooky gems
2023-09-27 14:09:50 -05:00
Natalie
f72eef6bff
feat(content): prebuild Fall Festival ( #14869 )
...
* feat(content): prebuild Fall Festival
* fix(typos): because 2023 is not the same as 2024
* feat(css): having stylesheets is important
* feat(content): ready for review & testing
* fix(tests): account for Sept 09 bundle
* fix(gala): use multi event list more
fix a couple of strings too
* feat(content): Warrior and Rogue text
also fix timing of quest bundle feature
* fix(strings): correct stat boosts
* fix(content): missing mage
also adds missing margin to purchase gems button in buy modal
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-09-20 19:46:34 -05:00
SabreCat
cdd87abcf9
Merge branch 'release' into 2023-09-pet-quest-bundle
2023-09-12 09:42:48 -05:00
Natalie
c4f870c421
feat(content): add September 2023 Backgrounds and Enchanted Armoire items ( #14845 )
...
* feat(content): add Sept 2023 backgrounds and enchanted armoire items
* fix(content): fix broken strings in September items
* chore(sprites): update spritesheet
* fix(strings): w.
* fix(strings): capitalization, missing words
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-09-05 13:23:20 -05:00
Natalie
ca5b02d0ea
feat(content): September 2023 subscriber items ( #14844 )
...
* feat(content): add June subscriber items
* feat(content): September subscriber items
* fix(image)
fixed filename for April sub item shop set
* chore(sprites): update habitica-images
* fix(images): add missing subscriber items
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-08-30 14:33:44 -05:00
CuriousMagpie
941194b7c7
feat(content): add September pet quest bundle
2023-08-29 16:59:05 -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
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
63414a80fe
Revert "fix(parties): actual 30 not 29"
...
This reverts commit bf0e640fa6
2023-08-17 14:22:33 -05:00
SabreCat
c9395ba1ca
fix(strings): patch up Orb, quests, potions
2023-08-16 15:01:41 -05:00
SabreCat
bf0e640fa6
fix(parties): actual 30 not 29
2023-08-15 14:33:32 -05:00
Natalie L
d564944507
feat(content): add August Pet Quest Bundles and Magic Hatching Potions ( #14786 )
...
* feat(content): add June subscriber items
* feat(content): add August pet quest bundle and magic hatching potions
* fix(time): updated start time to 0800EDT
* fix(content): correct start date for potions
---------
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-08-14 14:37:42 -05:00
SabreCat
a3784e98a3
fix(gear): correct stat assignment
2023-08-10 12:52:02 -05:00
SabreCat
5931f02692
feat(content): 2023 August Armoire and Backgrounds by @CuriousMagpie
2023-08-10 12:36:48 -05:00
SabreCat
1532f8f774
Merge branch 'sabrecat/chat-warning' into sabrecat/unsociable
2023-07-31 18:44:43 -05:00
SabreCat
aa4426c800
fix(event): corrections to contributor goodies
2023-07-31 18:44:08 -05:00
SabreCat
0140b9beb7
feat(chat): veteran awards
2023-07-31 16:38:30 -05:00
SabreCat
cbaa3180cc
Merge branch 'develop' into sabrecat/unsociable
2023-07-25 15:17:13 -05:00
Natalie L
08ac059a7f
feat(content): add August 2023 subscriber items ( #14784 )
...
* feat(content): add June subscriber items
* feat(content): add August subscriber items
2023-07-25 14:14:28 -05:00
SabreCat
08a5bff815
Merge branch 'release' into sabrecat/unsociable
2023-07-17 16:11:14 -05:00
Natalie L
c562c93158
feat(content): add July 2023 backgrounds and Enchanted Armoire ( #14733 )
...
* feat(content): add June subscriber items
* feat(content): add July backgrounds and Enchanted Armoire Items
* Update backgrounds.json
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-07-04 13:23:06 -05:00
SabreCat
f84b5f163c
Merge branch 'develop' into sabrecat/unsociable
2023-06-29 14:53:00 -05:00
Natalie L
77a490283c
feat(content): add July 2023 subscriber items ( #14732 )
...
* feat(content): add June subscriber items
* feat(content): add July subscriber items
2023-06-29 14:35:05 -05:00
SabreCat
8445f45b31
Merge branch 'release' into sabrecat/unsociable
2023-06-19 18:14:22 -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
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
e1398e8d7c
Merge branch 'develop' into sabrecat/unsociable
2023-06-06 09:22: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
SabreCat
8d73e2949a
Merge branch 'release' into sabrecat/unsociable
2023-06-01 15:42:47 -05: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
SabreCat
9228b070fa
Merge branch 'release' into sabrecat/unsociable
2023-05-24 14:17:49 -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 27287ac3aab594de7fbd96cd9c6a169289979bea
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon May 22 15:59:20 2023 -0400
fix(typo): typos fixed
commit a4df8097cfbcaf6497119e2922f2a55cdabe200e
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon May 22 15:57:17 2023 -0400
feat(content): add migration script
commit 23ff7845c1f03153f2b0688fafea686760b278a2
Merge: d02644e21b 8ba7117fa58ba7117fa5#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#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 d02644e21b3e2b76829e72b96b3a69b8ec8ea34d
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
8d9602fb16
WIP(chat): first pass deprecation
2023-05-17 16:33:44 -05:00
CuriousMagpie
0b0cbb45f4
feat(content): add May pet quest bundle
2023-05-17 10:49:37 -04: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
Natalie L
17f6054ef0
feat(content): add May magic hatching potions ( #14641 )
2023-05-15 15:59:49 -05:00
Natalie L
453bf3a961
feat(content): add May Backgrounds and Enchanted Armoire items ( #14628 )
2023-05-09 10:26:00 -05: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 9e0777bb42c8adf20804229ed464257ede3acd0153c536b525027e61a93ea16098ccda0b6b967753f327795761
2023-05-02 09:51:33 -05:00
Natalie L
76845f5f20
feat(content): add May subscriber items ( #14613 )
...
Co-authored-by: SabreCat <sabe@habitica.com>
2023-04-28 16:18:45 -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
CuriousMagpie
360c17c56e
feat(content): add April backgrounds and enchanted armoire item
2023-04-06 15:37:32 -04:00
SabreCat
afee09e7cb
fix(tz): adjust release timing for DST
2023-04-05 14:02:38 -05:00
CuriousMagpie
01fea6b968
feat(fix): add correct string for potion end date
2023-04-05 12:13:40 -04:00
CuriousMagpie
c0362c614e
feat(content): add April fool day potions
2023-04-04 17:14:25 -04:00
SabreCat
229ed46425
fix(tz): dst
2023-04-01 07:08:38 -05:00
SabreCat
7ede3acd01
feat(event): add AF2023 event const
2023-03-29 15:35:26 -05:00
Natalie L
e8501f5cf8
feat(content): Add April 2023 subscriber items ( #14562 )
...
* feat(content): add April Subscriber items
* feat(content): add slim armor version to April subscriber items
2023-03-29 14:53:51 -05:00
SabreCat
b472af532c
Merge branch 'apple_sub_fix' into release
2023-03-21 13:54:16 -05:00
SabreCat
118c8421fe
fix(tz): account for DST
2023-03-17 15:09:02 -05:00
Natalie L
a363e68080
feat(cont): 2023 Spring Fling content ( #14525 )
...
* feat(cont): 2023 Spring Fling
* feat(content): 2023 Spring Fling (attempt to add Jungle Buddies Quest Bundle)
* fix(event): various typos and date ranges
* fix(event): correct countdown on Shiny Seed
* fix(quests): correct TypeError in featured list
* feat(content): update Spring gear to canon desc
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-03-17 15:05:04 -05:00
SabreCat
aea075d0bf
chore(content): make Jungle Buddies available
2023-03-16 16:22:47 -05:00
CuriousMagpie
c481354f78
feat(content): add new achievement, Plant Parent
2023-03-15 15:51:04 -05:00
SabreCat
383cd84016
feat(event): Pi Day
2023-03-14 09:12:39 -05:00
Natalie L
57f86bac70
feat(content): March backgrounds and Enchanted Armoire items ( #14524 )
...
* feat(content): March backgrounds and Enchanted Armoire
* fix(backgrounds): trivial syntax consistency
* fix(gear): missing verbiage
* fix(gear): correct usage of <%= attrs %>
* fix(backgrounds): broken string tokens
* fix(backgrounds): more broken tokens
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-03-06 16:57:56 -06:00
SabreCat
80f517f1ad
feat(content): subscriber items March 2023
...
Also fixes Vue templating in one paragraph of the Community Guidelines.
2023-02-24 16:31:50 -06:00
Phillip Thelen
c5f5da1d32
Merge remote-tracking branch 'origin/develop' into apple_sub_fix
2023-02-16 09:38:14 +01:00
SabreCat
f9db4b9b5b
fix(event): correct logic for various Valentine's items
2023-02-13 11:25:02 -06:00
Phillip Thelen
6ee2e3a379
Merge remote-tracking branch 'origin/develop' into apple_sub_fix
2023-02-13 17:38:14 +01:00
Natalie L
a73e4d399e
chore(content): add Pink Marble Magic Hatching Potion ( #14497 )
...
* chore(content): add quest text
* chore(content): add rest of potion quest content
* fix(image): pad quest scroll image
* feat(quest): add Rage action
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-02-12 23:17:56 -06:00
Natalie L
8f4d668b0f
chore(content): add pet quest bundle and magic hatching potions for February ( #14499 )
2023-02-12 23:17:09 -06:00
Phillip Thelen
58f4dd0c43
fix typo
2023-02-10 17:13:04 +01:00
Phillip Thelen
0ce64a0197
fix next hourglass calculation
2023-02-09 16:20:46 +01:00
Natalie L
0335eb1f7e
chore(content): add February backgrounds and Enchanted Armoire Items ( #14482 )
...
* chore(content): add February backgrounds and Enchanted Armoire Items
* fix(test): birthday week adjustment
* fix(strings): .
* fix(strings): correct background tokens
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-02-07 09:12:19 -06:00
Natalie L
059269f9b0
chore(content): add February subscriber items ( #14466 )
...
* chore(content): add February subscriber items
* fix(strings): month typo
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-01-31 10:33:36 -06:00
SabreCat
f31103094b
fix(events): don't start "no event" until after birthday10
2023-01-26 15:05:07 -06:00
SabreCat
9aa8b6d64d
fix(shops): use gala-specific logic for gala gear canBuy
2023-01-25 12:45:55 -06:00
SabreCat
def9aa16b5
fix(events): handle overlap of unseasonal events and seasonal
2023-01-25 10:51:47 -06:00
SabreCat
efae9429c0
feat(event): adjust dates, add NPC variations
2023-01-24 16:11:16 -06:00
SabreCat
e5bbde7e97
feat(event): 10th Birthday Bash
...
with @CuriousMagpie and @phillipthelen
2023-01-20 16:14:33 -06:00
Natalie L
a80ac76015
chore(content): add January 2023 Backgrounds and Enchanted Armoire Item ( #14440 )
...
* chore: images & spritesheet
* chore: add january backgrounds and armoire item
* fix(backgrounds): typos and 2023 updates
Co-authored-by: SabreCat <sabe@habitica.com>
2023-01-09 15:39:04 -06:00
SabreCat
f0c3be4800
fix(event): show NYE card on client
2022-12-29 11:07:17 -06:00
Natalie L
b1dab729b6
chore(content): january subscriber items ( #14433 )
...
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-29 10:46:17 -06:00
SabreCat
f72224f9f1
fix(event): more date corrections
2022-12-28 11:42:56 -06:00
SabreCat
3adbc33546
fix(event): update Snowball dates
2022-12-27 11:59:15 -06:00
Natalie L
55e7ef138e
chore(content): add NYE party hat and migration script ( #14419 )
...
* chore(content): add NYE party hat and migration script
* chore(subproj): update habitica-images
* chore(sprites): corrected sprite CSS run
* fix(event): unbork migration, add latecomer hook
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-23 15:35:23 -06:00
Natalie L
fd9d738cc6
chore(content): add winter wonderland items ( #14407 )
...
* chore(content): add winter wonderland items
* chore(typos): dates are hard
* fix(tz): how far back we have fallen
* fix(event): four extra hours for stragglers
* fix(typo): singular snowball spell
* fix(gear): remove stray incorrect event prop
* merge release
* Revert "merge release"
This reverts commit 83e29d028866e1d2ab2c1c181e4c82eeb161b647.
* feat(content): add EN text
* fix(dates): 2022-2023 Winter
* chore(content): add featured quest bundle
* fix(event): delay Snowballs, add quests to Seasonal Shop
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-19 15:53:52 -06:00
SabreCat
1587827b22
Merge branch 'develop' into release
2022-12-15 14:04:11 -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
9c10cb3b88
chore(event): enable G1G1 promo
2022-12-14 14:13:36 -06:00
Natalie L
573c932565
chore(content): add Polar Pro achievement ( #14399 )
...
* chore(content): add Polar Pro achievement
* chore(script): add migration script
* fix(typo): rogue backticks
* fix(capitalization): revert css blurp
* fix(migration): no babby wuff
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-13 14:50:53 -06:00
Natalie L
1ce060eac6
chore(content): add December 2022 Backgrounds and Enchanted Armoire Items ( #14382 )
...
* chore(content): css and images
* chore(content): add December 2022 Backgrounds and Enchanted Armoire Items
* fix(typos): dots no dip
* fix(typo): capitalize game terms
* fix(typos): GitHub regex find, why
* fix(typo): last one maybe?
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-12-06 13:21:24 -06:00
Natalie L
9bd039b17b
chore(content): add December 2022 Mystery Items ( #14379 )
...
* chore(submodule): images
* chore(content): December Mystery Items
* chore(content): sprites
* fix(typo): whitespace
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-11-28 15:34:18 -06:00
SabreCat
04e2a39a9f
fix(test): rearrange for legacy event logic
2022-11-21 20:08:15 -06:00
SabreCat
a8e9c9bc70
chore(event): set up Harvest Feast 2022
2022-11-21 18:54:57 -06:00
Sabe Jones
82c5e40b92
Enforce maximum password length ( #14290 )
...
* fix(auth): enforce maximum password length
* fix(auth): line length and better error message
* fix(auth): correctly import/export constant
Co-authored-by: SabreCat <sabe@habitica.com>
2022-11-18 16:49:10 -06:00
Adam Fitzgibbon
300c2bb0a8
change currency to gold if the gear is owned ( #14326 )
...
* change currency to gold if the gear is owned
* fix linting error
2022-11-18 16:43:14 -06:00
SabreCat
5e05190f22
fix(event): start at 8AM not 8PM
2022-11-15 16:05:06 -06:00
SabreCat
81540ef399
fix(events): EST now not EDT
2022-11-14 14:38:58 -06:00
SabreCat
9f52e47011
feat(content): November Quests and Hatching Potions
...
by @CuriousMagpie
2022-11-14 14:13:08 -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
Sabe Jones
5c7d537c61
Armoire and Backgrounds 2022/11 ( #14329 )
...
* chore(content): Add November Backgrounds and Enchanted Armoire Items
* fix(strings): typos and fullstops
* fix(style): de-whitespace
Co-authored-by: CuriousMagpie <eilatan@gmail.com>
2022-11-08 10:03:25 -06:00
SabreCat
aea0be3245
fix(subs): establish lock to prevent race condition
2022-11-01 20:47:21 -05:00
Natalie L
3bc82a6692
chore(content): add Bone to Pick achievement ( #14318 )
...
* chore(content): add Bone to Pick achievement
* chore(content): update spritesmith-main.css
* chore(content): add more bone picking
* chore(content): more bone picking
* chore(content): bone picking
* chore(content): i gotta bone to pick here
* chore(content): final bone picking
* chore: add migration script
* chore: update habitica-images
Co-authored-by: SabreCat <sabe@habitica.com>
2022-10-31 14:19:56 -05:00
Natalie L
b5c950ac96
chore(content): add November 2022 Mystery Items ( #14317 )
...
* chore(content): add November Mystery Items
* chore: merge release into 2022-11-mystery-items
* Revert "chore: merge release into 2022-11-mystery-items"
This reverts commit e12b61d73fb42cad79bbd69af2584c7bb9a96254.
Co-authored-by: SabreCat <sabe@habitica.com>
2022-10-30 19:52:55 -05:00
SabreCat
18534a21ff
Merge branch 'develop' into release
2022-10-11 11:59:02 -05:00
Natalie L
4d1bbdd8d0
chore(content): add October Backgrounds and Enchanted Armoire Items ( #14266 )
...
* chore(content): add October Backgrounds and Enchanted Armoire Items
* fix(typo): fix a couple of descriptions
* chore(subproject): update images
* fix(typo): keepin our caps consistent
* fix(typo): whitespace, caps
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-10-11 11:54:24 -05:00
Natalie L
d1928c9181
chore(content): add October Pet Quest Bundle ( #14268 )
...
* chore(content): add October Pet Quest Bundle
* update: change event start date to the correct one
2022-10-11 11:53:46 -05:00
SabreCat
3974adcb65
chore(event): set Gem sale dates
2022-09-30 14:57:15 -05:00
SabreCat
173d7a178c
Merge branch 'sabrecat/next-hourglass' into release
2022-09-30 14:46:27 -05:00
Natalie L
a08ecbe044
chore(content): add October 2022 Mystery Items ( #14254 )
2022-09-28 15:04:47 -05:00
SabreCat
f75a6eb11d
fix(hourglass): handle missing planId
2022-09-20 15:25:37 -05:00
SabreCat
155d6d5af6
Merge branch 'develop' into sabrecat/next-hourglass
2022-09-20 15:18:44 -05:00
Natalie L
f030135c82
chore(content): add 2022 Fall Festival ( #14244 )
...
* chore(submodule): add August 2022 Mystery Items
* update(content): add 2022 Fall Festival content
* update(content): add 2022 Fall Festival content
* update(content): update event dates for release
* fix(lint): remove extra spaces
also correct typo in gear string keys
* feat(content): remaining descriptions
* fix(event): correct spell availability
* fix(test): work around first-match logic
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-09-19 16:55:53 -05:00
Phillip Thelen
24841346dc
Purge Facebook ( #13696 )
...
* Don't sign in user when trying to connect a social account that was already created
* Log social users into matching local auth accounts
If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account
* If possible set local authentication email for social users
* Allow password reset emails to be sent to social login users
* lint fixes
* Fix issues and tests
* fix tests
* Fix lint error.
* purge Facebook.
Only keep it in some select places to allow for some compatablilty.
* Fix error
* fix error
* Let settings handle it when you don't have a password set but an email
* fix error
* Fix boolean logic
* fix json conversion
* .
* fix password reset for old social accounts
* Don't sign in user when trying to connect a social account that was already created
* Log social users into matching local auth accounts
If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account
* If possible set local authentication email for social users
* Allow password reset emails to be sent to social login users
* lint fixes
* Fix issues and tests
* fix tests
* Fix lint error.
* purge Facebook.
Only keep it in some select places to allow for some compatablilty.
* Fix error
* fix error
* Let settings handle it when you don't have a password set but an email
* fix error
* Fix boolean logic
* fix json conversion
* fix password reset for old social accounts
* Revert "lint fixes"
This reverts commit c244b1651c2c23050d058fe15381518231d8a317.
# Conflicts:
# website/client/src/components/auth/registerLoginReset.vue
# website/client/src/components/static/contact.vue
* Revert "fix password reset for old social accounts"
This reverts commit 7e0069a80fd20bc54d13cec4f83e072ad20d6610.
* fix duplicate code
* chore(misc): remove irrelevant changes
* chore(privacy): update policy page with note about FB
Co-authored-by: SabreCat <sabe@habitica.com>
2022-09-15 18:22:52 -05:00
Natalie L
0f4711c358
chore(content): add 2022-09 Pet Quest bundle ( #14218 )
...
* chore(content): farmFriends quest bundle
* chore(content): 2022-09 Pet Quest Bundle
* fix(date): fix start date
2022-09-13 09:12:24 -05:00
SabreCat
1a86943711
fix(subscriptions): better next-hourglass logic
2022-09-12 15:17:39 -05:00
Natalie L
6df4ce251c
chore(content): add September 2022 Backgrounds and Enchanted Armoire Items ( #14200 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): add September 2022 Backgrounds and Enchanted Armoire Items
* fix(typo): periods so people don't grumble
* fix(typo): consistent caps
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-09-06 12:31:55 -05:00
Natalie L
2b21410abd
fix(quest shop): correct forest friends end date ( #14202 )
2022-09-01 14:45:49 -05:00
Natalie L
755f51b674
chore(content): add September 2022 Mystery Items ( #14199 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): add September 2022 Mystery Items
* fix(typo): verb form
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-08-30 14:06:06 -05:00
SabreCat
5251598369
fix(cron): fix score down breaking during middleware
2022-08-22 16:38:51 -05:00
SabreCat
149da578fd
fix(teams): fix fix fix
...
Removed testing banner
Fixed a JS console error when assigning a user to a previously open task
Fixed a potential abuse where user might be able to score someone else's
task via API call
Fixed an issue where finding tasks by alias could return tasks belonging
to other users
Fixed an issue that was appending the user's party ID to their list of
Guilds
Fixed an issue where group tasks were not receiving the default tag
needed for filtering them on user's personal list
2022-08-22 16:16:23 -05:00
SabreCat
5893312d75
Merge branch 'develop' into sabrecat/teams-rebase
2022-08-17 14:28:43 -05:00
SabreCat
b82239811c
chore(content): add items to featured
2022-08-15 15:28:47 -05:00
Natalie L
f0b5637e9e
chore(content): add Porcelain Magic Hatching Potion ( #14168 )
...
* chore(submodule): add August 2022 Mystery Items
* chore: update habitica-images
* chore(content): add Porcelain Magic Hatching Potion
* chore(content): update moonglow potion availability
* fix(events): no gap between events
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-08-15 15:14:23 -05:00
SabreCat
1701fc702b
Merge branch 'develop' into sabrecat/teams-rebase
2022-08-09 11:55:46 -05:00
Natalie L
0528ee1761
fix(dates): update end dates for quest bundle ( #14167 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): add Woodland Wizard achievement
* chore(content): add Forest Friends quest bundle
* fix(typo): whitespace
* fix(dates): update end date for quest bundle
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-08-09 11:50:05 -05:00
SabreCat
3654e01fee
Merge branch 'develop' into sabrecat/teams-rebase
2022-08-08 12:13:29 -05:00
SabreCat
79071e3445
Merge branch 'develop' into release
2022-08-04 16:18:58 -05:00
Natalie L
f7b727dc95
chore(content): add Woodland Wizard Achievement and Forest Friends Quest Bundle ( #14159 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): add Woodland Wizard achievement
* chore(content): add Forest Friends quest bundle
* fix(typo): whitespace
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-08-04 15:14:27 -05:00
SabreCat
a78aea5456
Merge branch 'release' into develop
2022-08-02 10:10:00 -05:00
SabreCat
1c3d4a6fd5
Revert "Revert "chore(content): add August 2022 Backgrounds and Enchanted Armoire Items ( #14149 )""
...
This reverts commit 9a2b49b4bf
2022-08-02 10:09:02 -05:00
SabreCat
a418752041
Merge branch 'develop' into sabrecat/teams-rebase
2022-08-01 15:40:08 -05:00
Natalie L
e2c6fb1ea2
chore(content): add August 2022 Backgrounds and Enchanted Armoire Items ( #14149 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): August 2022 Backgrounds and Enchanted Armoire Items
* chore(submodule): August 2022 Backgrounds and Enchanted Armoire images
* fix(typo): space
* fix(whitespace): spaces
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-07-29 16:51:56 -05:00
SabreCat
9a2b49b4bf
Revert "chore(content): add August 2022 Backgrounds and Enchanted Armoire Items ( #14149 )"
...
This reverts commit 2748455f16
2022-07-29 16:25:14 -05:00
SabreCat
750a02053c
feat(content): August 2022 subscriber items
...
Code by @CuriousMagpie
2022-07-29 16:24:32 -05:00
Natalie L
2748455f16
chore(content): add August 2022 Backgrounds and Enchanted Armoire Items ( #14149 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): August 2022 Backgrounds and Enchanted Armoire Items
* chore(submodule): August 2022 Backgrounds and Enchanted Armoire images
* fix(typo): space
* fix(whitespace): spaces
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-07-29 16:21:20 -05:00
SabreCat
30d3892fb4
Merge branch 'develop' into sabrecat/teams-rebase
2022-07-25 15:04:43 -05:00
Nishant Jain
8070486def
add max length validations for summary in challenge create and update… ( #14053 )
...
* add max length validations for summary in challenge create and update controllers
* Add validation to group APIs
* fix lint errors
* add validation to group plan
* fix imports
* add tests
* add max length validations for summary in challenge create and update controllers
* Add validation to group APIs
* fix lint errors
* add validation to group plan
* fix imports
* add tests
* lint checks
2022-07-22 15:24:24 -05:00
SabreCat
153561dd42
Merge branch 'develop' into sabrecat/teams-rebase
2022-07-18 15:50:20 -05:00
Vi Mio
3b1407f529
feat: prevent user from purchasing a quest if prerequisites are not met ( #14073 )
...
* feat: prevent user from purchasing a quest if prerequisites are not met
* test: fail to buy quest if not all prerequisites are met
* test: modify to check all quest prerequisites
2022-07-14 15:24:52 -05:00
SabreCat
9a879d566e
fix(content): correct availability range for Seafoam
2022-07-12 10:05:02 -05:00
Natalie L
0d444a9d6a
chore(content): prebuild July Enchanted Armoire and Backgrounds ( #14108 )
2022-07-06 14:30:40 -05:00
SabreCat
9453b1269e
Merge branch 'develop' into sabrecat/teams-rebase
2022-07-05 14:34:53 -05:00
Natalie L
0e458683fd
chore(content): add splashySkins for Summer Gala event ( #14107 )
...
* chore(content): add splashySkins for Summer Gala event
* fix(content): use date string, not Boolean, for range start
Co-authored-by: SabreCat <sabe@habitica.com>
2022-07-05 14:33:50 -05:00
SabreCat
6ebfa976fe
Merge branch 'develop' into sabrecat/teams-rebase
2022-06-29 14:30:25 -05:00
Natalie L
dcced2debb
chore(content): July 2022 Mystery Items ( #14095 )
...
* merge upstream/release into release
* chore(content): Added July 2022 Mystery Items
2022-06-29 14:02:46 -05:00
SabreCat
b790b87ca8
Merge branch 'develop' into sabrecat/teams-rebase
2022-06-21 09:34:17 -05:00
Natalie L
f0c25dab05
2022 Summer Gala Content ( #14067 )
...
* merge upstream/release into origin/release
* Revert "merge upstream/release into origin/release"
This reverts commit 902ed08cc3f7bc29feb3cc2a98530583dd3c5b8d.
* Summer Splash 2022 Content
* added magic hatching potions
* updated events for testing
* fix whitespace
* various corrections
* fix(gear): mage set, healer set, event start date
* update: habitica-images
* fix(events): include normal/empty season data outside of gala
* fix(string): missing attribute and event verbiage for warrior item
Co-authored-by: SabreCat <sabe@habitica.com>
2022-06-21 09:29:53 -05:00
SabreCat
8b084e627e
WIP(teams): show open tasks on user view
2022-06-16 13:25:09 -05:00
SabreCat
4ac1a3e717
Merge branch 'develop' into sabrecat/teams-rebase
2022-06-14 14:46:50 -05:00
SabreCat
0f8ed2c06a
Merge branch 'release' into develop
2022-06-14 14:38:29 -05:00
SabreCat
285fcbd71f
fix(content): add event field for countdown
2022-06-14 14:34:25 -05:00
CuriousMagpie
36d82a1d39
June 2022 Pet Quest Bundle
2022-06-14 14:33:53 -05:00
SabreCat
a0177fa44d
WIP(teams): display assigned tasks on user's personal board
2022-06-13 16:53:29 -05:00
sau226
4d10c53216
Further transition from HTTP to HTTPS ( #14039 )
2022-06-10 14:02:58 -05:00
SabreCat
9fec111c4d
Merge branch 'develop' into sabrecat/teams-rebase
2022-06-06 15:15:16 -05:00
Natalie L
2d1bf74858
June 2022 Backgrounds and Enchanted Armoire ( #14049 )
2022-06-06 14:55:38 -05:00
Natalie L
d726b88a86
Content: Beta Groups Testing Achievement ( #14014 )
...
* content: beta Groups testing achievement
* resolving merge conflict
2022-06-03 15:04:27 -05:00
SabreCat
c98c7ab26c
Merge branch 'develop' into sabrecat/teams-rebase
2022-05-31 15:51:16 -05:00
Natalie L
dd5066ab72
2022-06 Subscriber Items ( #14016 )
...
* 2022-06 Subscriber Items
* chore(mystery): compile sprites, tidy up whitespace
Co-authored-by: SabreCat <sabe@habitica.com>
2022-05-30 15:56:50 -05:00
SabreCat
1ef7924ba5
Merge branch 'develop' into sabrecat/teams-rebase
2022-05-24 09:39:01 -05:00
SabreCat
8358da227d
fix(quests): hide offseason quests, again
...
Also tidy up some Reptacular Rumble issues
2022-05-23 15:38:16 -05:00
CuriousMagpie
5fa705c390
code for reptacular rumble achievement
2022-05-23 14:58:17 -05:00
SabreCat
7651e6a540
Merge branch 'develop' into sabrecat/teams-rebase
2022-05-19 14:30:29 -05:00
SabreCat
e7f60cb68f
fix(achievements): TigerCub not Tiger, sigh
2022-05-18 14:43:10 -05:00
SabreCat
9c24d43a13
Merge branch 'develop' into sabrecat/teams-rebase
2022-05-17 09:34:51 -05:00
SabreCat
c0e22377d1
Merge branch 'release' into develop
2022-05-17 09:33:45 -05:00
Natalie L
4e78d72cee
May 2022 Magic Hatching Potions and Quest Bundle ( #13979 )
...
* May 2022 magic hatching potions and quest bundle
* fix(string): typo
* fix(content): add and use event
Co-authored-by: SabreCat <sabe@habitica.com>
2022-05-17 09:32:50 -05:00
Megan Searles
5bc544c481
for locking items in market, special overrides available set. fixes #13798 ( #13817 )
...
* for locking items, special overrides available
* fix(market): allow purchase of broken item
Co-authored-by: Megan Shepherd <meg.d.shep@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-05-13 16:11:49 -05:00
SabreCat
1a74d2b3b0
refactor(achievements): crush down to much fewer notification types
...
most work by @CuriousMagpie
2022-05-12 15:25:40 -05:00
Sabe Jones
a0de2dab49
fix(tasks): don't send delta around as an array ( #13967 )
...
Co-authored-by: SabreCat <sabe@habitica.com>
2022-05-12 14:56:05 -05:00
SabreCat
209b7bd1aa
Merge branch 'develop' into sabrecat/teams-rebase
2022-05-10 13:58:14 -05:00
Natalie L
d317bd1c41
May 2022 Backgrounds and Enchanted Armoire ( #13966 )
...
* 2022-05 backgrounds and enchanted armoire images
* 2022-05 backgrounds and enchanted
* chore(sprites): compile
also fix a few string typos
Co-authored-by: SabreCat <sabe@habitica.com>
2022-05-09 14:21:25 -05:00
SabreCat
db354875ee
fix(teams): adjust task title spacing, don't damage user for team Daily
2022-05-06 14:23:09 -05:00
Natalie L
5e12b7b042
Fix: Inconsistent Quest Unlock Behavior ( #13734 )
...
* remove quest refactoring, created new branch for that task
* remove quest refactoring, created new branch for that task
* More trying to figure out how buying a quest actually works
* rolling back changes
* updated shops/quests/index.vue to disable clicking on locked quests
* removed console.log(item)
* misc fixes per review comments
* changes as requested
* incorporated quest refactors updates
* removing a couple lines of code
2022-05-05 16:51:47 -05:00
SabreCat
565d33f6a7
Merge branch 'develop' into sabrecat/teams-rebase
2022-05-03 15:53:11 -05:00
Phillip Thelen
38b39b600c
Adminpanel and revamped permissions ( #13843 )
...
* create Admin Panel page with initial content from Hall's admin section
* reorganise Admin Panel form and add more accordians
* add lastCron to fields returned by api.getHeroes
* improve timestamps and authentication section
* add party and quest info to Admin Panel, add party to heroAdminFields
* move Admin Panel menu item to top of menu, make invisible to non-admins
* remove code used for displaying all Heroes
* add avatar appearance and drops section in Admin Panel
* allow logged-in user to be the default hero loaded
* add time zones to timestamp/authentication section
* rename Items to Update Items
This will allow a new Items section to be added.
* add read-only Items display with button to copy data to Update Items section
* remove never-used allItemsPaths code that had been copied from Hall
* update tests for the attributes added to heroAdminFields
* supply names for items and also set information for gear/equipment
* remove code that loads subsections of content
We use enough of the content that it's easier to load it all and
access it through the content object, especially when we're looping
through different item types.
* add gear names and set details to Avatar Costume/Battle Gear section
* make the wiki URLs clickable and make minor item format improvements
* add gear sets for Check-In Incentives and animal ears and tails
* add gear set for Gold-Purchasable Quest Lines
Also merges the existing Mystery of the Masterclassers quest set into it.
* fix error with Kickstarter gear set and include wiki link
* improve description of check-in incentive gear set
* fix description of Items section
* fix lint warnings
* update another test for the attributes added to heroAdminFields
* allow "@" to be included when specifying Username to load
* create GetHeroParty API v3 route to fetch a given user's party data
Only some data from the party will be loaded (e.g., not private
data such as name, description).
Includes tests for the route.
See the next commit for front-end changes that use this.
* display data from a given user's party in admin panel
Only some data from the party will be loaded (e.g., not private
data such as name, description).
Also adds support for finding and displaying errors from the
user's data.
* use new error handling method for other sections
- Time zone differences
- Cron bugs
- Privilege removal (mute/block) - not a bug but needs to be highlighted
* redirect non-admin users away from admin-only page (WIP)
This needs more work. Currently, admin users are also redirected
if they access the page by direct URL or after reload.
* clarify source of items from Check-In Incentives and Lunar Battle quests
* replace non-standard form fields with HTML forms
* add user's language, remove unused export blocks
* convert functions to filters: formatDate, formatTimeZone
* improve display of minutes portion of time zone in Admin Panel
* move basic details about user to a new component
* move Timestamp/Cron/Auth/etc details to a new component - WIP, has errors
The automatic expand and error warnings don't reset themselves when
you fetch data for a new user.
* replace non-standard form fields with HTML forms
Most of this was done in 26fdcbbee51937d39a149a20bf7ccd1cf674ca18
* move Timestamp/Cron/Auth/etc details to a new component (fixed)
* move Avatar and Drops section to a new component
* move Party and Quest section to a new component
* move Contributor Details to new component, add checkbox for admin, add preview
This adds a markdown-enabled preview of the Contributions textarea.
It also removes the code that automatically set contributor.admin
to true when the Tier was above 7.
That feature wasn't secure because the Tier can be accidentally
changed if you scroll while the cursor is over the Tier form field
(we accidentally demoted a Socialite once by doing that and if
we'd scrolled in the other direction we would have given her
admin privileges).
Instead there's now a checkbox for giving moderator-level privileges.
We'll want that anyway when we move to a system of selected
privileges for each admin instead of all admin privileges being
given to all mods/staff.
There's also a commented-out checkbox for giving Bailey CMS
privileges, for when we're ready to use that. The User model doesn't
yet have support for it.
* move Privileges and Gems section to a new component
* rename formatItems to getItemDescription; make other minor fixes
* remove an outdated test description
This "pended" explanation probably wasn't needed after "x" was
removed from "describe" in 2ab76db27chttps://github.com/HabitRPG/habitica/pull/12035#pullrequestreview-500422316
Style fixes will be in a future commit.
* fix styles/CSS
* allow profile modal to close when using admin panel link
Also removes an empty components block.
* prevent Admin Panel being used without new userSupport privilege
Also adds initial support for other contributor.priv privileges
and changes Debug Menu to add userSupport privilege
* don't do this: this.hero = { ...hero };
* enhance quest error messages
* redirect to admin-panel home page when using "Save and Clear Data"
The user's ID / name is still in the form for easy refetching.
* create ensurePriv function, use in api.getHeroParty
* fix lint problems and integration tests
* add page title to top-level Admin Panel
Also add more details to a router comment (consistent with a similar
comment) in case it helps anyone.
* fix tests
* display Moderation Notes above Contributions
* lint fix
* remove placeholder code for new privileges
I had planned to have each of these implemented in stages, but
paglias wanted it all done at once. I'm afraid that's too big a
project for me to take on in a single PR so I'm cancelling
the plans for adjusting the privileges.
* Improve permission handling
* Don't report timezone error on first day
* fix lint error
* .
* Fix lint error
* fix failing tests
* Fix more tests
* .
* ..
* ...
* fix(admin): always include permissions when querying user
also remove unnecessary failing test case
* permission improvements
* show transactions in admin panel
* fix lint errors
* fix permission check
* fix(panel): missing mixin, handle empty perms object
Co-authored-by: Alys <alice.harris@oldgods.net>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-05-03 14:40:56 -05:00
SabreCat
588e5dd487
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-29 14:42:08 -05:00
CuriousMagpie
5faa49d032
2022-05 Subscriber Items
2022-04-28 15:54:09 -04:00
SabreCat
32823e3760
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-21 14:10:27 -05:00
SabreCat
3fa940bdfd
Merge remote-tracking branch 'CuriousMagpie/quest-refactors' into develop
2022-04-15 16:35:27 -05:00
SabreCat
48f5ffc997
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-15 14:26:19 -05:00
SabreCat
723249e60d
Merge branch 'develop' into release
2022-04-14 15:28:47 -05:00
SabreCat
b608f0ad9c
fix(potion): correct year
2022-04-12 16:01:27 -05:00
SabreCat
c4a92ba384
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-12 14:48:45 -05:00
SabreCat
afa9a65933
Merge branch 'release' into develop
2022-04-12 14:41:03 -05:00
SabreCat
53569ff983
Merge branch 'sabrecat/wacky-fix' into release
2022-04-12 14:38:41 -05:00
SabreCat
d0c736a7a6
fix(gala): correct dates on seeds and customizations
2022-04-12 14:36:59 -05:00
CuriousMagpie
c8ee51b741
move quest constants to their own folder
2022-04-11 17:10:01 -04:00
SabreCat
405721602f
fix(quests): correct events import, prod bug with seasonal availability
2022-04-07 15:51:14 -05:00
SabreCat
19cf89baec
fix(pr): remove unrelated change
2022-04-07 15:29:52 -05:00
SabreCat
8a4e9888dd
Merge branch 'develop' into quest-refactors
2022-04-07 15:27:19 -05:00
SabreCat
8f7e5d544e
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-07 14:55:16 -05:00
negue
8cb8411cc6
Show "Next Hourglass" Month ( #13860 )
...
* Show "Next Hourglass" Month
* fix lint
* lint,
* lint
* lint..
* linting bad
* ui fixes
* remove additional margin
* show next hourglass date to debug further
* WIP tests - maybe broken logic
* flex:1 doesn't work - so stats columns now at 33% width
* fix(cron): lint and short circuit
* refactor logic
* update test dates using timezone
* also check for the timezone date
* fix timezone for tests
* fixing the test dates?
* fixing the test dates?
* change nextHourglass logic + update gem cap label / value
* fix lint
* dont add gemsBought to it
* remove tooltip
Co-authored-by: SabreCat <sabe@habitica.com>
2022-04-06 16:30:13 -05:00
SabreCat
91511746bc
fix(quest): update market criterion
2022-04-06 13:36:43 -05:00
CuriousMagpie
2f16fe11e1
fix(quest): virtualPet => virtualpet
2022-04-06 12:14:31 -05:00
SabreCat
fb017e1f08
fix(pets): various quest and animation corrections
2022-04-05 16:03:46 -05:00
SabreCat
1ca528eb95
Merge branch 'develop' into 2022-04-wacky-potion-quest
2022-04-05 15:08:18 -05:00
SabreCat
40113b0458
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-05 13:56:25 -05:00
CuriousMagpie
3498b9ccdf
Virtual Pet Hatching Potion Quest Content
2022-04-04 17:29:51 -04:00
Natalie L
c3278a3baf
2022-04 Backgrounds & Enchanted Armoire Items ( #13915 )
...
* 2022-04 Backgrounds & Enchanted Armoire Items
* remove spritesmith-main.css
* adding spritesmith-main.css back in
* css fix
2022-04-04 14:53:34 -05:00
SabreCat
48be0a38bf
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-31 14:49:35 -05:00
SabreCat
ae6918d52e
chore(event): canonical duration
2022-03-31 14:41:59 -05:00
SabreCat
608ae5fc43
feat(event): April Fooly 2022
2022-03-30 15:31:17 -05:00
SabreCat
aa81c330af
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-30 11:35:33 -05:00
SabreCat
2b93ea3740
chore(sprites): compile
2022-03-30 09:44:36 -05:00
SabreCat
61956ea720
Merge remote-tracking branch 'CuriousMagpie/2022-04-subscriber-items' into release
2022-03-30 09:17:52 -05:00
CuriousMagpie
265dfbbb98
2022-04 Subscriber Items
2022-03-29 16:08:25 -04:00
SabreCat
7283d112f4
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-29 14:10:18 -05:00
SabreCat
93ae36d139
fix(event): add underscore for mobile handling of NPCs
2022-03-29 14:04:37 -05:00
CuriousMagpie
0783ccae24
2022 Spring Fling Potions
2022-03-29 13:54:07 -05:00
SabreCat
c5ef803458
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-22 16:29:47 -05:00
SabreCat
ad9c468e77
fix(event): CSS build, small fixes
2022-03-22 10:34:44 -05:00
SabreCat
e141e2407c
Merge remote-tracking branch 'CuriousMagpie/2022-spring-fling-gala' into release
2022-03-22 09:41:59 -05:00
CuriousMagpie
c94195129f
2022 Spring Fling Content
2022-03-18 17:24:05 -04:00
