* 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>
* 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>
* 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>
* 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>
* 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>
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
* 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>
* 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>
* 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
* 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
* 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-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>
* 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
* 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 2ab76db27c
* add newsPoster Bailey CMS permission to User model and Admin Panel
* move formatDate from mixins to filters
* make lint fixes
* remove development comments from hall.js
I'll be handling the TODO comment and I've left in my "XXX" marker
to remind me
* fix bug in Hall's castItemVal: mounts are null not false
* move Items section to a new component and delete Update Items section
The Update Items section is no longer needed because the new Items
component has in-place editing.
* remove unused imports
* add "secret" field to "Privileges, Gem Balance" section.
Also move the markdownPreview style from contributorDetails.vue to
index.vue since it's used in two components now.
* show non-Standard never-owned Pets and Mounts in Items section
* redirect non-admin users away from admin-only page
This completes the work started in commit a4f9c754ad3886466925de4d8ed9a5ac55d2f999
It now allows admins to access the page when coming from another
page on the site or from a direct link, including if the admin user
isn't logged in yet.
* display memberCount for party
* add secret.text field to Contributor Details
This is in addition to showing it in the Privileges section because
the secret text could be about either troublesome behaviour or
contributions.
* allow user to be loaded into Admin Panel via a URL
This includes:
- router config has a child route for the admin panel with a
Username/ID as a parameter
- loadHero code moved from top-level index page into a new
"user support" index page
- links in the Hall changed to point to admin panel route
- admin panel link added to admin section of user profile modal
* keep list of known titles on their own lines
* sort heroFields alphabetically
No actual changes.
* return all flags for use in Admin Panel and fix Hall tests for flags
Future Admin Panel changes will display more flags.
NB 'flags' wasn't in the tests before, even though two optional
flags were being fetched.
The tests weren't failing because the test users hadn't been given
data for those optional flags.
The primary reason for this change now is to fix the tests.
* show part of the API Token in the Admin Panel
* send full hero object into cronAndAuth.vue
This is a prelude to allowing this component to change the hero.
* split heroAdminFields string into two: one for fetching data and one for showing it
This is because apiToken must be fetched but not shown,
while apiTokenObscured is calculated (not fetched) and shown.
* let admin change a user's API Token
* restore sanity
* remove code to show obscured version of API Token
It will return with tighter permissions for viewing it.
* add Custom Day Start time (CDS) to Timestamps, Time Zone... section
* commit lint's automatic fixes - one for admin-panel changes in hall.js
The other fixes aren't related to this PR but I figured they may
as well go live.
* apply fixes from paglias's comments, excluding style/CSS changesd
The comments that this PR fixes start at
https://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>
* 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>
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* fix failing test
* Fix minor inconsistencies
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* Fix minor inconsistencies
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
* added logic to exclude completed tasks from having task.value set to 0
* logic refinement
* fix(rebirth): complete D
Co-authored-by: SabreCat <sabe@habitica.com>
* i18n string updates (issue #9210)
* change offHand to offHandCapitalized
* added removeTasks to challenge.json
* added hairBangs back to character.json
* added hairBangs back to character.json
* more hairBangs nonsense
* added hairBangs to hair-settings.vue, removed same from character.json
* changed levelUp to levelup in levelUp.vue and achievements.json
* fix duplicate string values
* fixed different strings with same content in different files
* updated test/api/v3 and test/api/v4 with messageTaskNotFound
* Delete POST-tasks_taskId_checklist_itemId_score.test.js
File got copied to a new directory, doesn't need to be here.
* fix: userID token in patrons.vue and heroes.vue
* removed: unused clock of code
* Restored eggsItemType to inventory.json
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
* Fixed party size and notification when inviting
Fixed party limit to 30 members (previously 31) and pop-up when trying
to invite someone, when party has already reached it's members limit, to properly
show members number.
* Fixed View Party button in header
Fixed View Party button in header to properly show Load More button
when party size exceeds party limit.
* Fixed View Party button to properly open party
Fixed View Party button to properly open party members list on refreshing the main page, this bug was
caused by previous commit.
* Fixed SelectMembersModal to properly show Load More button
Fixed SelectMembersModal (the modal that apperas when casting
cards/specials on party member) to properly show Load More button when party size exceeds party limit
* fix(test): limit now technically 29 plus leader
* fix(test): adjust for tweakage
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
* WIP notifications only show 2 at once
* separate and bundle notifications to pairs
* notification fadein/-out/move animations - remove notifications on an interval instead of calculated timeouts
* easier way to import all sprite css files
* add stories + fix sizes / paddings + click to hide + animation fixes
* keep notification at the top but always under the toolbars
* change animations to ease-in 0.25s + add prop to change the delay between deletion and add
* fix adding logic in a rare case of added notifications when only one item is currently visible + add debug mode
* disable lint for notification console
* add more notification example trigger buttons
* potential fix of animation / queue
* increase amount of notifications to 4
* fix sanity
* fix test:unit call again
* new notification styles - fix animations
* keep error notifications visible until manually removed + refactor adding/removal logic
* fix margins
* prevent multiple filling + different delay on filling
* stop and restart removal timer on new notifications
* reduce line-height / apply different margin for icons
* move sprites.scss out and use it in app.vue as well
* update sprites back to 31
* Fix habits' dropdown list overlap
Fix habits' tags dropdown list to properly close after expanding
difficulties dropdown list so they don't overlap
* Fix transform antidote unpin after rebirth
Fix transformation buff antidote to properly unpin from Rewards section
after using Orb of Rebirth
* Revert "Fix habits' dropdown list overlap"
This reverts commit 6a72e27b89dfaa337169ea0137ec1e7b0ca11c02.
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
* move groups/sidebar to groupSidebar.vue
* lint files
* extract group/party sidebar to rightSidebar.vue
* wip stories with example data
* update stories - wip sidebar re-styling
* message party / group leader + move items to the menu
* update paddings /place for quest section
* invite to party / guild
* update labels (* Party / Guild )
* guild-background to group-background
* correct menu order + missing a label based on the group type
* no quest - styles / layout applied
* quest owner / not started - styles applied + extracted questActions from questDetailsModal.vue to a mixin
* no challenge style
* hover with underlines
* quest-pending area layout / margins
* "Collection Quest/Quest Owner Participating" Styling Done
* group sidebar menu with icons / background
* remove most participate button styles
* fix quest-invite panel
* move "Start Quest" + add "Leave Quest"
* Not Participating + Boss + Rage Quests restyling
* party quest changes - invitedToQuest + button styles + no-items style + view details
* fix icons + rage value + colors
* fix duplicate key
* hide items label if 0 items found + hide pending damage if there is none + sidebar section margin + fix percent calculation 0 => 0%
* combine quest abandon / cancel to one call + hide begin if quest has already started + close modal if quest was canceled
* remove unused translate string
* allow leaving an accepted but inactive quest + disable leave when user is quest leader
* update "are you sure" questions - remove "doubleSureAbort" - add "sureLeaveInactive"
* sidebar margins + menu icon color
* refactored css rules
* improve some styles
* fix button spacing
* fix dropmenu with icon hover
* hide leave quest for leaders + fix quest buttons spacing
* add pending items label
* remove "X items found" label
* first round of fixes
* last v-once
* Update Quest Dialogs (#13112)
* new quest rewards panel + extract questPopover and itemWithLabel
* WIP: questInfo still not applying the row-height..
* split up start-quest-modal into select and detail modal - also rename the current quest-details to be the group-quest-details modal
* remove start-quest-modal from modal-scss
* update package-lock
* WIP before using the quest sidebar branch as a base
* move quest detail actions to the "new" details dialog
* quest details layout for owner / participant
* fix quest rewards - open details modal from sidebar
* apply quest-details dialog styles to the buyQuestModal one
* fix quest reward icons / popover / texts
* WIP back to quest selection
* fix lint
* merge selectQuestModal.vue with questDetailModal.vue + UI for the select quest
* fix margins / layout / labels
* fix quest detail + wip invitationListModal.vue / participantListModal.vue
* fix questmodal user label centered
* fix centered reward items + grouping items and adding a count-badge
* sort quests by AZ or quantity
* invitations modal
* remove console.info
* complete participantListModal.vue + extracted getClassName
* missed a file for getClassName extraction
* fix invitations
* select the actual quest on details
* fix margins on invite to party / start quest buttons
* replace buyQuestModal close button and title
* fix recursion due to the same name
* missing import
* sort quantity by highest first
* fix "Can't find a Quest to start" styles
* fix "your balance" padding
* fix quest collections / drop items
* fix member details in participants list
* fix quest info
* remove nullable because the build doesn't like it (on this file..)
* add questCompleted to the stories + fix getDropName
* replace quest-rewards in questCompleted.vue
* fix questCompleted.vue style
* delete obsolete components
* add missing spritesheets to storebook
* requested pr changes
* refactored fetchMember
* revert optional chaining
* fix merge conflicts
* fix rightSidebar hover colors - $scss var to css var
* overflow auto instead of scroll
* prevent wrapping of quest collections
* rollback to multi line quest items
* use min-width for the quest popover
* upgrade stripe module
* switch stripe api to latest version
* fix api version in tests
* start upgrading client and server
* client: switch to redirect
* implement checkout session creation for gems, start implementing webhooks
* stripe: start refactoring one time payments
* working gems and gift payments
* start adding support for subscriptions
* stripe: migrate subscriptions and fix cancelling sub
* allow upgrading group plans
* remove console.log statements
* group plans: upgrade from static page / create new one
* fix#11885, correct group plan modal title
* silence more stripe webhooks
* fix group plans redirects
* implement editing payment method
* start cleaning up code
* fix(stripe): update in-code docs, fix eslint issues
* subscriptions tests
* remove and skip old tests
* skip integration tests
* fix client build
* stripe webhooks: throw error if request fails
* subscriptions: correctly pass groupId
* remove console.log
* stripe: add unit tests for one time payments
* wip: stripe checkout tests
* stripe createCheckoutSession unit tests
* stripe createCheckoutSession unit tests
* stripe createCheckoutSession unit tests (editing card)
* fix existing webhooks tests
* add new webhooks tests
* add more webhooks tests
* fix lint
* stripe integration tests
* better error handling when retrieving customer from stripe
* client: remove unused strings and improve error handling
* payments: limit gift message length (server)
* payments: limit gift message length (client)
* fix redirects when payment is cancelled
* add back "subUpdateCard" string
* fix redirects when editing a sub card, use proper names for products, check subs when gifting
