Commit Graph

1234 Commits

Author SHA1 Message Date
Aleksey
5b57d91a9b Fix: Antidotes to Avatar Transformation Items should be added to Rewards by API (#11353)
* Fix: moved debuffPotions from vue component

- Move logic of choosing proper debuf potion from vue component to website commons
- introduce new function to get debuffSpellItems

* Fix: move debuffPotions to server

* Refactoring: move setting of debuff potion to func

* Fix: sanity

* Refactoring & Tests:

- Create test case for get and set DebuffPotionItems functions
- Fix setDebuffPotionItems function to not create duplicated debuff items
- Make debuff potion type of items unpinnable
- Move list of debuffs to constant to reuse it in tests and functions

* Fix: typo in test describe

* Fix: translation of unpin

* Fix: setDebuffPotionItems on cron buffs reset

* Fix: use full path for debuff potions
2019-10-06 18:41:39 +02:00
citrusella
85eab76a71 fix dark-on-dark in quest modal tooltip (#11397) 2019-10-06 17:58:28 +02:00
Mark Kop
e1246ff99f fix(chat): change class name because of active route (#11405) 2019-10-06 17:49:51 +02:00
negue
e92320a256 remove obsolete z-index override (#11384) 2019-10-01 18:58:44 -05:00
Sabe Jones
ebfced4a2e Revert "Refactoring & Feature: edit/delete controls of tasks (#11357)"
This reverts commit 70b6501135.
2019-09-26 18:21:32 -05:00
Sabe Jones
01d272d2c4 Teams Updates 201908 (#11347)
* fix(teams): no hover bg change for noninteractive checkboxes

* feat(teams): send notification to managers on task claim
Also fix client unit test broken by prev commit

* feat(groups): don't penalize for tasks assigned since last activity

* fix(tests): actually fix client unit

* fix(teams): improve task styles

* fix(teams): let people other than leader see relevant approvals
Also more style fixes

* fix(approvals): better filtering and task headings for approval data

* fix(test): correct test expectations for new GET /approvals behavior

* fix(groups): style tweaks

* different border for group and normal tasks

* fix(teams): remove extra click for claiming

* fix(teams): leaders & managers can check off approval-required tasks

* fix(teams): don't notify user of own claim

* fix group task margin and z-index on hover

* fix(menu): sporadic error in top bar

* fix(teams): more approval header and footer adjustments

* fix(tests): adjust expectations for self-approval

* fix(teams): address PR comments

* refactor(timestamps): date user activity on authenticated requests

* refactor(timestamps): update local user instead of direct db update
2019-09-26 14:49:11 -04:00
negue
5f2032a9d5 Style fixes: Onboarding (#11241)
* wip: createIntro / onboard ui rework

* extract more methods - working body settings component

* move justin above the dialog

* extract submenu + fix styles

* white background on items, working example of "none" item, item border radius

* extract options as component

* move more subMenu's to the component

* add chair margins

* move tasks to common/content

* add menu indicator

* extract more parts of onboarding-intro

* refactor / fully converted hair-settings

* extract extra-settings

* fix sprite positions / lint

* extract task-strings to be translatable

* style fixes - hide submenu's if not editing

* style / margin fixes

* more style fixes

* show hair styles at onboarding - use arrowleft/right as svg instead of image fix next color

* finish button style - full set background/purchase button

* fix footer - prev/next hover

* Add Default Tasks + `byHabitica` property

* customize-options click item on the full zone

* purple tasks

* footer animation => none

* fix onboarding task habit up/down

* onboarding circle color/position

* task styles

* fix onboarding position

* show seasonal options

* add hover to (locked-) options

* added the correct behavior of shop-items to onboarding options

* hide hover on active options
2019-09-26 12:43:47 +02:00
Sabe Jones
388892ccdd Merge branch 'release' into develop 2019-09-24 19:34:39 -05:00
Sabe Jones
59b13c8c80 fix(gear): add missing Healer eyewear and fix headgear desc 2019-09-24 19:34:15 -05:00
Sabe Jones
70e672df93 Merge branch 'release' into develop 2019-09-24 18:46:51 -05:00
Sabe Jones
88b8f20d12 feat(event): Fall Festival 2019 2019-09-24 18:41:00 -05:00
Matteo Pagliazzi
749138df4d fix(chat): timestamp tooltip 2019-09-22 13:30:59 +02:00
Aleksey
70b6501135 Refactoring & Feature: edit/delete controls of tasks (#11357)
* Refactoring & Feature: edit/delete group and challenge tasks

- Remove showOption from tasks props
- Pass all needed data to task for understand in mapGetter function which controls we should show
- Improve current solution with edit and delete logic

* Fix: this in template

* Fix & Test: extend tests, fix can Edit/Delete functions
2019-09-20 17:24:05 +02:00
Sebastiaan Nijland
c6281b6f17 fix(styles): improve hover effect (#11301) 2019-09-20 16:55:58 +02:00
Sabe Jones
56b4008835 Merge branch 'release' into develop 2019-09-17 16:11:30 -05:00
Sabe Jones
7d732b5612 feat(content): new pet color achievements 2019-09-17 16:10:32 -05:00
Matteo Pagliazzi
03dbd1dfc6 fix(sell modal): change saddle check 2019-09-13 17:53:37 +02:00
Matteo Pagliazzi
945fb674a5 Merge branch 'saddles' of https://github.com/gpalsingh/habitica into gpalsingh-saddles 2019-09-13 17:46:40 +02:00
Matteo Pagliazzi
bbba0510a7 Merge pull request #11338 from Scens/scens/edit-avatar-links-to-body
User Icon > Edit Avatar option always links to a correct page.
2019-09-13 17:42:55 +02:00
Gurkirpal
23c7177da6 Check for item name before showing sellWarningNote 2019-09-12 03:10:41 +05:30
Sabe Jones
36f6860e79 Pet Hatching Item Overbuy Warning (#11313)
* fix(shops): warn if user is purchasing too many pet-hatching items

* fix(shops): handle undefined potion count
2019-09-10 11:22:14 -04:00
Matteo Pagliazzi
73d1acd8ec fix conflict 2019-09-09 17:15:45 +02:00
Matteo Pagliazzi
6e806669f5 Merge pull request #11324 from rjbernaldo/prevent-checklist-events-on-skill-use
This change prevents checklists from being toggled when casting skills or spells.
2019-09-09 15:50:03 +02:00
Matteo Pagliazzi
7edbe5b763 fix: decrease image height so footer is clickable (#11327)
* fix: decrease image height so footer is clickable

* fix: use kraken to reduce image size
2019-09-09 15:47:47 +02:00
Aleksey
659c7e7249 Fix: Edit/deleting tasks in a challenge appears possible for people who are not admin/the creator (#11349)
* Fix: introduce new prop showOptions for task component

- Pull showOptions propr from challenge container to task itself to restrict editing for non leader of challenge users

* Fix: for group plan edit/delete tasks
2019-09-09 15:47:30 +02:00
Aleksey
7219aa963b Fix: unauthorized sorting of group tasks (#11348)
- Check if column is belongs to user dashboard before choosing which endpoint use to move task
2019-09-09 15:46:38 +02:00
Scens
9a49a05eac Fix clickable area on customize options while editing avatar. (#11351) 2019-09-09 15:46:24 +02:00
Matteo Pagliazzi
ebe3736207 fix(task-modal): removno conno console error when modal closed 2019-09-09 15:11:17 +02:00
cheng-shiqi
0ee29e2fa3 Enable challenges to be closed by "End Challenge" button fix#11339 (#11342)
* fix the dropdown list empty problem in close-challenge-modal

* fix the memberSearchDropdown not accepting input problem

* prevent submit event in dropdown input reloading the page
2019-09-04 16:30:43 -04:00
Matteo Pagliazzi
39aa785b32 Merge branch 'release' into develop 2019-09-02 14:38:22 +02:00
Matteo Pagliazzi
b76f871288 fix #11340 2019-09-02 14:35:56 +02:00
r.brzezinski
24ecbfa51d User Icon > Edit Avatar option now always takes you to the avatar editing modal with the Body section open 2019-09-01 15:49:25 +02:00
negue
6d76dfe15f hide "clear completed todos" while no entries are listed (#11321)
* hide "clear completed todos" while no entries are listed

* move column background (negative margin)
2019-09-01 14:50:48 +02:00
Matteo Pagliazzi
923bc9b284 fix #11336, categories not selectable when creating a challenge 2019-08-30 13:26:05 -05:00
Matteo Pagliazzi
c38e97875f fix #11336, categories not selectable when creating a challenge 2019-08-30 19:05:33 +02:00
Sabe Jones
fc841d0ad4 Hourglass Quest (#11325)
* feat(content): Hourglass Quest

* fix(hourglasses): NaN from undefined

* fix(quests): sanity check for negative scrolls

* fix(hourglasses): don't show quantity selection for binary items

* fix(route): validate number, use body not params

* test(timetrav): add quest tests
2019-08-29 15:22:12 -04:00
Sabe Jones
8b9c7da5dc Merge branch 'release' into develop 2019-08-27 16:00:52 -05:00
Sabe Jones
3bcd82f6fe feat(content): Mystery Items 2019-08-27 16:00:02 -05:00
Sebastiaan Nijland
85c2c37693 fix: decrease image height so footer is clickable 2019-08-23 14:31:26 +02:00
Rj Bernaldo
8aa13369a6 Add proper fix according to description 2019-08-22 13:06:43 +10:00
Rj Bernaldo
7e90c5e8a7 Prevent checklists from being toggled when casting spells.
This change closes #11028
2019-08-22 10:18:27 +10:00
Matteo Pagliazzi
5a2350a034 fix(task-modal): reorganize form to fix saving (#11323) 2019-08-21 19:16:47 +02:00
Sabe Jones
38f17f0b6a Merge branch 'release' into develop 2019-08-20 11:23:19 -05:00
Sabe Jones
ccde367a06 chore(news): Kickstarter announcement 2019-08-20 10:30:31 -05:00
Preston Skupinski
8b5129cd4f Make usernames clickable in Hall of Heroes Fixes #11014 (#11281)
* Add userLink (user-link) import to heroes component

* Use the userLink component to make user names clickable in the hall of heroes

This fixes #11014
2019-08-18 17:28:48 +02:00
Sabe Jones
2c8614ea5c fix(quests): add missing display of pet item unlocks
Also rewords some awkward text in said unlocks
2019-08-15 16:29:58 -05:00
Sabe Jones
47f3cad984 fix(quests): remove erroneous gray text
fixes #11117
2019-08-15 16:06:42 -05:00
Dominick Triola
f0e6703546 Add audio theme demo button (#11252) 2019-08-15 11:04:19 -04:00
LanceWengLin
aa114ccc73 Change 404 page contact link to Bug Guild (#11285) 2019-08-15 11:03:46 -04:00
Sabe Jones
4de8e9a3fd chore(news): Bailey
Also adds target:_blank to some Tavern links
2019-08-15 09:47:52 -05:00