Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,467 Commits 64 Branches 1,256 Tags
ee2fc8c763be5f9ec00a93dd89c0af1437245704
Commit Graph

465 Commits

Author SHA1 Message Date
Sabe Jones b53c03bca8 Merge branch 'release' into develop 2018-01-10 16:42:13 +00:00
SabreCat 3d5d5da933 feat(content): Pept quest 2018-01-10 16:31:56 +00:00
Alys 9b19477e2f adjust wording for Keys to Kennels 
Also moves the new Keys text strings to the same place as the old ones in the locales file.
Also fixes minor typos in code that was preventing the new text from being displayed.
 2018-01-10 21:21:58 +10:00
Sabe Jones 5a9c95f07e fix(guilds): include exact breakpoints 2018-01-09 18:29:59 -06:00
Keith Holliday 3000e2b72c Removed keys and inbox flagging (#9776) 2018-01-09 12:58:01 -06:00
Matteo Pagliazzi c1f6f0398e fix positioning of checkmarks for checklist items 2018-01-09 11:31:02 +01:00
Matteo Pagliazzi cb6488fa05 fix path for KeysToKennel module 2018-01-09 11:29:12 +01:00
Keith Holliday 126d90f471 Added keys to the kennel (#9772) 
* Added keys to the kennel

* Added titles and descriptions
 2018-01-08 13:15:19 -06:00
Keith Holliday 98d4fb0f34 Chat flag inbox (#9761) 
* Refactored chat reporting

* Added inbox flag chat

* Added flag chat to inbox

* Added you have flagged message
 2018-01-08 13:13:25 -06:00
Matteo Pagliazzi 7eac5cebf5 fix typo 2018-01-08 18:47:59 +01:00
Matteo Pagliazzi 6a109adbc5 Task Modal Improvements (#9560) 
* start adding advanced options

* new imput

* partial colors

* update deps

* misc adds

* fix text color

* add advanced options

* initial reordering of task modal labels

* start to fix colors in the modal

* wip colors

* update package-lock.json

* fix merge

* finish modal

* refactor colors

* fix quick add

* fix colors

* new icon colors

* add markdown formatting help

* fix habits colors

* fix rewards colors

* fixed remaining colors

* start to inline inputs

* fix typ

* fixes

* habits hover state

* wip new task modal inputs

* bootstrap: upgrade to v4-beta3

* finish reward edit modal

* fix attributes allocation, checklists and add help tooltips for attributes and difficulty

* lots of fixes

* update datepicker

* misc fixes
 2018-01-08 18:43:57 +01:00
Cassidy Pignatello c531239618 Fixes equipment sorting by name in inventory (#9692) 
* returns items sorted in ascending order when sorted by name

* returns items sorted in ascending order when sorted by name
 2018-01-05 13:51:47 -06:00
Matti Petrelius f6ac7b890a Both eggs and potions should hatch pets from Items (#9645) 
* Show click on hatching potion when egg is clicked

* Fix translation parameter name

* Show egg as active when clicked

* Remove itemDragStart event handler from egg items

* Change isHatchable to take in potion and egg objects

* Add margin to item popover content
 2018-01-05 13:31:34 -06:00
Julius Jung 4576353f26 inital commit to add confirmation to animalEars (#9666) 2018-01-05 13:26:45 -06:00
Allister acf4b4da63 Change focused state of introjs button (#9677) 2018-01-05 13:24:32 -06:00
josteins1 8b5933177a Given back header the priority over snackbar with z-index value and a padding to avoid collision. (#9687) 
* increased top padding to match main header

referring to issue 9678
https://github.com/HabitRPG/habitica/issues/9678

* adjusted the z value to appropriate levels

z-index adjusted from 99999 to 999
 2018-01-05 13:23:03 -06:00
Julius Jung a6ddd6d233 fix drawer-slider carousel function && convert to pointer logic (fixes #9366 AND #9638) (#9711) 
* fix drawer-slider carousel function && convert to pointer logic

* refactor conditional logic

* get rid of absolute value
 2018-01-05 13:20:21 -06:00
SabreCat 71cb4e8510 feat(content): enable Wintery Skins and Hair 2018-01-04 21:35:26 +00:00
SabreCat 40244ab81b Merge branch 'develop' into release 2018-01-04 21:11:44 +00:00
Keith Holliday 15b65b342a Removed extra achievement sound (#9763) 2018-01-04 10:17:33 -06:00
Matteo Pagliazzi 7df3aba71b make search case insensitive in equipment and inventory pages (#9762) 2018-01-04 13:06:15 +01:00
Keith Holliday 6bb535c129 Reset chat options when change guild routes (#9743) 2018-01-02 22:56:31 -07:00
SabreCat df9c42c1b5 fix(backgrounds): add 2018 group 2018-01-03 00:52:54 +00:00
Sabe Jones 7e241bb76f Merge branch 'release' into develop 2018-01-03 00:07:42 +00:00
SabreCat 88e6b2da7c feat(content): Armoire and BGs 2018-01 
Also ends New Year's hat fanciness
 2018-01-02 23:49:50 +00:00
Sabe Jones da73c5c418 Merge branch 'release' into develop 2017-12-31 02:45:04 +00:00
SabreCat d57c525fab feat(event): New Year's 2017-18 2017-12-31 02:34:52 +00:00
Keith Holliday d90d781740 Added mobile style fixes (#9741) 2017-12-26 17:31:00 -06:00
Sabe Jones e8976b40f4 Merge branch 'release' into develop 2017-12-22 21:42:02 +00:00
Keith Holliday 545b052c10 Added fix for quantity confirmation (#9735) 2017-12-22 10:23:55 -06:00
SabreCat 028b9d569d Merge branch 'release' into develop 2017-12-21 23:20:51 +00:00
SabreCat 4764f115b1 feat(content): Subscriber Items Dec 2017 2017-12-21 23:10:54 +00:00
Keith Holliday a7617fa947 Added broken megaphone icon (#9737) 2017-12-21 10:25:54 -06:00
Keith Holliday afc1ffd90b Refactored duplicate card section (#9730) 
* Refactored duplicate card section

* Updated to new computed methods
 2017-12-20 12:27:21 -06:00
Keith Holliday 6e0b6171c6 Many ie style fixes (#9728) 2017-12-20 10:33:21 -06:00
Sabe Jones 75092336c4 fix(news): Holly, not Peppermint, potions 2017-12-20 04:43:43 +00:00
SabreCat 98bb6fd7ce feat(content): Winter Wonderland 2017-18 
and Starry Night Hatching Potions
 2017-12-20 02:23:11 +00:00
Keith Holliday b8c716ff82 Fixed pending damage display and nav size (#9723) 2017-12-18 12:31:16 -06:00
SabreCat e229bc5042 Merge branch 'release' into develop 2017-12-15 05:37:04 +00:00
SabreCat c4ffe39ec9 chore(news): Bailey 2017-12-15 05:34:30 +00:00
Sabe Jones dc3d694d0e WIP: Buy-1-Get-1 Gift Subs (#9719) 
* feat(promo): Buy-1-Get-1 Gift Subs

* feat(promo): add explanatory text to subscription screens
Also adds some add'l test coverage and creates a test context for this event
 2017-12-14 23:09:02 -06:00
Keith Holliday c28ec24c33 Added notification for when leader is updated (#9674) 
* Added notification for when leader is updated

* Abstracted challenge member search component

* Added challenge member search modal to challenge detail

* Added group search
 2017-12-14 12:12:43 -06:00
SabreCat b0ebdfeb65 Merge branch 'release' into develop 2017-12-13 22:16:30 +00:00
SabreCat 5a3751cbac chore(news): Blog Bailey 2017-12-13 22:14:19 +00:00
Keith Holliday 7802e30e80 Added static/front and meta tags (#9712) 
* Added static/front and meta tags

* Moved meta to index
 2017-12-13 15:11:22 -06:00
Keith Holliday 566716e2fe Added display logic for npcs (#9709) 
* Added display logic for npcs

* Fixed lint
 2017-12-12 19:05:18 -06:00
SabreCat 2a42bc9450 Merge branch 'release' into develop 2017-12-12 21:27:04 +00:00
SabreCat 355773ecf3 chore(news): FCC CTA 
Also fixes an issue with sprite alignment of the Lamplighter Set.
 2017-12-12 21:24:18 +00:00
Keith Holliday 1750a0c2e6 Updated responsive styles (#9696) 
* Updated responsive styles

* Font adjustments

* Changed to max height
 2017-12-09 23:23:16 -06:00
Keith Holliday 759ce61492 Added support for party invites by email (#9665) 
* Added support for party invites by email

* Changed to groupInvite
 2017-12-07 12:57:01 -05:00