Commit Graph

1979 Commits

Author SHA1 Message Date
Matteo Pagliazzi 90c917f69e fix duplicates in code 2019-10-08 15:05:48 +02:00
negue 7864ba75c7 [Stlye] fix yesterdaily modal (#11352)
* fix yesterdaily style

* use rem

* unneeded height prop

* fix task-wrapper margin

* fix the modal backgrounds + update package-lock
2019-10-07 20:10:12 +02:00
Matteo Pagliazzi 50cae0165c Revert "Fix: Antidotes to Avatar Transformation Items should be added to Rewards by API (#11353)" (#11406)
This reverts commit 5b57d91a9b.
2019-10-07 16:55:44 +02:00
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
Matteo Pagliazzi 20ef27028e misc test 2019-10-04 19:50:52 +02:00
Sabe Jones cc8d3a9f36 chore(event): enable Sparkles 2019-10-03 14:04:02 -05:00
Matteo Pagliazzi 2a4e103812 fix integration tests and paths for client tests 2019-10-03 17:40:38 +02:00
Matteo Pagliazzi d19b3857ee fix unit tests 2019-10-03 17:24:17 +02:00
Matteo Pagliazzi 17c7a2bad1 fix common tests 2019-10-03 16:27:44 +02:00
Matteo Pagliazzi e0a2528a4f Merge branch 'develop' into client-monorepo 2019-10-02 18:40:24 +02:00
Matteo Pagliazzi 9a2bb981a9 avoid loading moment locales 2019-10-02 18:30:41 +02:00
Matteo Pagliazzi 823a1034e0 fix svgs 2019-10-02 16:40:04 +02:00
Sabe Jones 228f2379aa fix(sprites): rename broad armor 2019-10-02 06:25:16 -05:00
Matteo Pagliazzi 211da982b3 fix env vars 2019-10-02 11:16:31 +02:00
Sabe Jones 33bd3dc65b chore(sprites): compile 2019-10-01 19:01:43 -05:00
negue e92320a256 remove obsolete z-index override (#11384) 2019-10-01 18:58:44 -05:00
Matteo Pagliazzi cca5b8492b fix exports 2019-10-01 17:53:48 +02:00
Matteo Pagliazzi 4faa06f37d fix esling 2019-10-01 16:31:13 +02:00
Matteo Pagliazzi 33b26a69b8 config fixes 2019-10-01 16:23:09 +02:00
Matteo Pagliazzi b466d12263 migrate remaining paths 2019-10-01 16:00:06 +02:00
Matteo Pagliazzi e69275663b rewrite paths, add deps 2019-10-01 15:38:48 +02:00
Matteo Pagliazzi b44fbdcb14 old client structure 2019-10-01 11:44:38 +02:00
Matteo Pagliazzi 46e4036c01 move remaining files 2019-09-30 23:14:31 +02:00
Matteo Pagliazzi b21a07aa66 start moving files 2019-09-30 23:02:24 +02:00
Sabe Jones a715ec1a0f Merge branch 'release' into develop 2019-09-30 13:25:44 -05:00
Sabe Jones 2192646c0a chore(sprites): compile 2019-09-30 13:24:40 -05:00
Sabe Jones c5690e5ea9 Merge branch 'sabrecat/kickstarter-2019' into release 2019-09-30 13:07:18 -05:00
negue f3fb09f4f9 remove obsolete z-index override (#11384) 2019-09-29 18:53:17 +02: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 a2e1922e8d chore(sprites): compile 2019-09-26 14:47:33 -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 77e5ae584c fix(kickstarter): add missing inventory icons, DRY some CSS 2019-09-25 16:23:29 -05:00
Sabe Jones 0e8ad2dc42 fix(css): copypasta 2019-09-25 18:34:24 +00:00
Sabe Jones 509b2e4522 WIP(kickstarter): test setup for 2019 KS backer gear 2019-09-25 11:32:06 -05:00
Sabe Jones 8640f452e9 Merge branch 'release' into develop 2019-09-25 09:03:16 -05:00
Sabe Jones 31062fd20c chore(sprites): compile 2019-09-25 09:02:53 -05: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 e9529d510d chore(sprites): compile 2019-09-24 18:41:08 -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 4afe0cf130 chore(news): Bailey 2019-09-19 14:56:48 -05:00
Sabe Jones 56b4008835 Merge branch 'release' into develop 2019-09-17 16:11:30 -05:00
Sabe Jones 3d53ab09e8 chore(sprites): compile 2019-09-17 16:10:40 -05:00