Commit Graph

398 Commits

Author SHA1 Message Date
Ilenia 5830672a68 fixed overpurchase warning for potions with overlapping names (#13386) 2021-07-28 21:34:04 -05:00
Sabe Jones 534450c4d5 fix(countdowns): more-than-a-month edge case 2021-07-01 16:00:00 -05:00
Sabe Jones 1a57f7df00 feat(event): Summer Splash 2021 2021-06-22 18:49:32 -05:00
Sabe Jones a89c7d2957 feat(content): enable quest bundle
also fix some date display and a Vue error
2021-06-09 08:24:50 -05:00
Liza 9e655d70d2 Fix "Not Participating" filter checkbox on Discover Challenges screen, Fixes #13025 (#13183)
* change 'role' options and filters to 'membership'

* added membership filtering function to discover challenges

* fix accidental deletion

* complete removal of roles from challenge filters

* abstract challenge "participating" filtering into mixin

* selecting "participating" and "not participating" shows all challenges
2021-05-28 16:57:03 -05:00
Helcostr 3a5f68420f Proper reset autocomplete - Fixes #13254 (#13257)
* fix resetting searchResults (utlzng cancel mthd)
oh so that's why the cancel method exists...

* reduce code footprint (cancel mthd)
2021-05-28 16:44:01 -05:00
negue a8b58815b4 Update Party / Group Sidebar / Quest states (#12793)
* 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
2021-05-28 16:11:43 -05:00
Sabe Jones 72d0865201 feat(content): new pet color achievements 2021-05-25 14:37:15 -05:00
Sabe Jones 0a85b37e5b fix(quests): don't break Rage if no options sent 2021-05-19 07:07:16 -05:00
Sabe Jones 56efd6fc4b Merge remote-tracking branch 'Helcostr/custom-localized' into release 2021-05-18 11:44:58 -05:00
Helcostr 55b14ad2d0 Add number l10n to another area
_Originally posted by @citrusella in https://github.com/HabitRPG/habitica/issues/9470#issuecomment-842279146_
2021-05-17 07:36:26 -07:00
Sabe Jones f6bd69569f feat(content): new Feathery Friends daterange
Also fixes up some style oddities in quest modals
2021-05-13 15:07:31 -05:00
Sabe Jones 833e2b195d Revert "#12781 Add a unified component for small modals (#12987)"
This reverts commit 591c9bc98c.
2021-05-06 14:18:31 -05:00
Alec Brickner f33720e9fd Drag challenge tasks (#12204)
* Allow challenge tasks to be draggable by leaders and admins

* Drag challenge tasks, ensure they're ordered

* Ensure group tasks are ordered properly, make draggable

* Add tests, fix broken tests

* Resolve merge conflict

* Remove console.log()

* Address code review comments

* Code review fixes

* Fix lint

* Fix importing

* taskManager

* Lint

* Fix collapseChecklist test

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2021-04-30 16:23:27 -05:00
Iffat Saiyara 4d7304ab8d created a variable that stores yesterDay's utcoffset (#12860)
passed this variable in shouldDo function call as timezoneUtcoffset
shouldDo takes timezoneUtcoffset into account when running yesterday's dailies, which fixes DST mismatch issues
2021-04-30 15:21:43 -05:00
Sabe Jones 3d7d7e034f Challenge tags can be sorted, Partial fix for #10934 (#13225)
* Fixes #10934, Challenges can be sorted

* revert all buttons to 'Edit Tags'

* change 'role' options and filters to 'membership'

* added membership filtering function to discover challenges

* fix accidental deletion

* Revert "change 'role' options and filters to 'membership'"

This reverts commit b81f9087bb.

* Revert "added membership filtering function to discover challenges"

This reverts commit 4cd5a4cb4e.

* Revert "fix accidental deletion"

This reverts commit 55025cf602.

* fix(challenges): revert incorrect $t token

Co-authored-by: Lizapritchardg <lizap@umich.edu>
2021-04-30 15:13:31 -05:00
Helcostr 92beff46b6 Various Chat Fixes - Fixes #12377 (#13180)
* Various Chat Fixes
* Allow adding `@mention` anywhere (previously was fixed at the end of the text)
* Add re-focus after mouseclick on `@mention` choice
* Remove`@mention` space barrier (since server ingests mentions without spaces in between)

Co-authored-by: Bart Enkelaar <benkelaar@gmail.com>

* Boundry Search + Select shutoff

Co-authored-by: Bart Enkelaar <benkelaar@gmail.com>
2021-04-29 16:06:16 -05:00
Bart Enkelaar 591c9bc98c #12781 Add a unified component for small modals (#12987)
* 12781 - Add common component for small modal windows

* 12781 - Fix drop cap layout and hide footer

* 12781 - Implement drop cap reached and won challenge modals

* 12781 - Couple small fixes

* 12781 - Remove added drop cap modal test convenience

* Less assumptions in small-modal component

* 12781 - Fix already migrated small modals

* Figured out how to properly test Bootstrap modals

* 12781 - Add unit test for success modal

* 12781 - Some more steps towards integrating successModal.vue

* 12781 - Use small modal mixin in success modal

* 12781 - Optimize templating in successModal

* 12781 - Revert AppFooter additions

* 12781 - Add test case and remove unnecessary method
2021-04-29 15:18:58 -05:00
Sabe Jones 5479c76f08 Fixes #12966 pass the group to groupChallenges so the leader only check can be used to display the create challenge button (#13221)
Co-authored-by: SpeedyLom <speedylomuk@gmail.com>
2021-04-29 15:08:53 -05:00
Ilenia fea39e7c9b over-purchase warning for Gryphon eggs now ignore Royal Purple pets a… (#13121)
* over-purchase warning for Gryphon eggs now ignore Royal Purple pets and mounts

* fixed casing with potion name
2021-04-29 14:18:13 -05:00
j-dover f4934abc62 style: Align Hide Locked Backgrounds to center (#13176) 2021-04-28 16:29:13 -05:00
Helcostr 4dc718fbff L10N boss num (#13178)
* Uses browser JS `toLocaleString` to convert numbers to appropriately "marked" numbers
* Add filter for localizeNumber (suggestion from benkelaar)

Co-authored-by: Bart Enkelaar <benkelaar@gmail.com>

Co-authored-by: Bart Enkelaar <benkelaar@gmail.com>
2021-04-28 16:15:40 -05:00
Helcostr 056f4926f5 selList overflow (#13179)
* Limit `membersModal` list selector to 12-unit grid (to prevent wrap around on long text for `sortOptions`)
* Add ellipse based overflow for `membersModal` list selector
* Add padding so that the checkmark for `membersModal` list doesn't overlap with text
* Use scss with v-deep properly (also pretty checkmark to "full-width" of checkmark)
2021-04-28 16:07:07 -05:00
Sabe Jones 7b4b4240cb Merge branch 'release' into develop 2021-04-16 11:13:19 -05:00
Sabe Jones 9c402152e8 feat(event): Shiny Seed and Egg Hunt countdowns 2021-04-08 16:26:32 -05:00
Sabe Jones 23f6e9b911 feat(event): more datetime countdown improvements 2021-04-08 15:43:47 -05:00
Sabe Jones cdaa504db4 feat(event): countdown banners for limited availability items 2021-04-07 12:24:24 -05:00
Sabe Jones 92be66d9ac Merge branch 'release' into develop 2021-03-30 15:20:28 -05:00
Sabe Jones e9c69f93a6 feat(content): seasonal quest achievement 2021-03-29 17:51:33 -05:00
Sabe Jones e35a4b502d Merge branch 'release' into develop 2021-03-25 15:29:54 -05:00
Sabe Jones 24bf1c31d8 fix(onboarding): remove start date restriction 2021-03-25 15:20:55 -05:00
Sabe Jones 48451b7241 Merge branch 'release' into develop 2021-03-23 13:03:54 -05:00
Sabe Jones 676a9348d0 feat(event): March-April goodness 2021-03-23 11:58:21 -05:00
Lilith a503782e29 Removes excessive padding in footer on mobile view - Fixes issue #12631 (#13021) 2021-03-15 20:04:03 +10:00
Bart Enkelaar 81907643d3 12893 - Keep other chat messages right-aligned when avatar doesn't render (#12969)
* 12893 - Keep other chat messages right-aligned when avatar doesn't render

* 12893 - Don't show spacing for system messages
2021-03-14 19:20:28 +10:00
Bart Enkelaar 84d7df3d42 13046 - Fix creating challenge after cloning (#13048) 2021-03-14 18:17:44 +10:00
Sabe Jones d2795f3ac9 fix(stats): bump level cap to 9999 and related corrections 2021-03-11 16:44:34 -06:00
Sabe Jones 96492e5a0e fix(api): correct world, cap level 2021-03-10 15:36:17 -06:00
Sabe Jones ee1f95bb67 feat(content): bundle and cheevo 2021-02-16 17:00:39 -06:00
Sabe Jones 05f6c6816f fix(event): Valentines does not have class outfits 2021-02-09 18:01:12 -06:00
shantanu96 43fc390e28 #12970 Fixed 'String " not found' bug in categories while saving guild descr… (#12989)
* Fixed 'String " not found' bug in categories while saving guild description

* syntax changes
2021-01-25 16:44:52 -06:00
Alys 9d93821758 remove mentiod of Back Corner from Community Guidelines. (#12901)
This includes deleting the Back Corner image.
2021-01-07 17:31:42 +01:00
Óscar Carretero 14e99c6e6c Remove forum link (#12917)
* remove forum link

* remove `communityForum` from locales
2021-01-07 17:30:39 +01:00
Sabe Jones f172670aa4 feat(content): BGs and Armoire Jan 2021 2021-01-04 15:30:39 -06:00
Matteo Pagliazzi 7b0f43b61c fix(stable & bailey); seasonalNpc: use method instead of class, components: use correct method name for npc class 2020-12-17 10:26:06 +01:00
Sabe Jones bf28a46803 feat(event): one more banner 2020-12-16 16:35:03 -06:00
Sabe Jones fa197e1b57 feat(event): add banner shinies 2020-12-15 20:08:33 -06:00
Sabe Jones 4457b081fa fix(messages): adjust for G1G1 banner height 2020-12-15 16:41:33 -06:00
Sabe Jones 395e1c25d4 fix(g1g1): correct blank private message 2020-12-15 16:07:31 -06:00
Matteo Pagliazzi 6d34319455 Stripe: upgrade module and API, switch to Checkout (#12785)
* 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
2020-12-14 15:59:17 +01:00