Commit Graph

1944 Commits

Author SHA1 Message Date
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
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 acb409245a Merge branch 'release' into develop 2019-09-10 17:20:54 -05:00
Sabe Jones 3f2b3da449 feat(content): Rocking Reptiles Bundle 2019-09-10 17:20:06 -05:00
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 9145782d3c fix purple logo svg 2019-09-09 16:33:08 +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
Sabe Jones 1081392c2b Merge branch 'release' into develop 2019-09-03 16:09:03 -05:00
Sabe Jones 00956d6ca1 chore(sprites): compile 2019-09-03 16:07:48 -05: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
Sabe Jones 2f4ebdac10 chore(news): Bailey 2019-08-30 13:46:30 -05:00
Matteo Pagliazzi 923bc9b284 fix #11336, categories not selectable when creating a challenge 2019-08-30 13:26:05 -05:00
Sabe Jones cea9c745b8 chore(sprites): compile 2019-08-29 14:25:19 -05: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 a1535d286d chore(sprites): compile 2019-08-27 16:00:12 -05:00
Sabe Jones 3bcd82f6fe feat(content): Mystery Items 2019-08-27 16:00:02 -05:00
Sebastiaan Nijland c21611c982 fix: use kraken to reduce image size 2019-08-23 14:35:15 +02: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