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

752 Commits

Author SHA1 Message Date
SabreCat d34beca3cc Merge branch 'release' into develop 2018-01-17 18:24:48 +00:00
Sabe Jones 049844ea7d chore(i18n): update locales 2018-01-16 22:35:00 +00:00
Pizilden 67b396bf16 Added Lunasol Theme (#9635) 2018-01-12 16:22:57 -06:00
MathWhiz 183c90ac3a Fix presskit (#9418) 
* Move presskit to static folder

* Fix image location

* Add press kit FAQ strings

* Add faq section, fix images

* Update Images

* Add images to presskit page

* Remove unecessary parts
 2018-01-12 16:18:20 -06:00
borisabramovich86 9e1a262f96 Fixes Purchase contributor equipment (fixes #9179) (#9306) 
* Able to see all non class related items in market

* Fix lint errors

* Able to see all non class related items in market

* Fix lint errors

* add test for showing contributor gear

* Added previously owned items to test with eslint exception
 2018-01-12 16:16:28 -06:00
MathWhiz 06dd9fe859 Add SpacePenguin's Theme (#9237) 
* Add SpacePenguin's Theme

* Fix files
 2018-01-12 16:15:55 -06:00
Sabe Jones b2c1c9d9dc Merge branch 'release' into develop 2018-01-12 21:54:20 +00:00
Sabe Jones 56434cce71 chore(i18n): update locales 2018-01-12 21:46:32 +00:00
SabreCat 043a6cd4ba chore(shops): update Featured Items 2018-01-12 21:25:09 +00:00
SabreCat 0ca2f9034f Revert "WIP: Buy-1-Get-1 Gift Subs (#9719)" 
This reverts commit dc3d694d0e, with the exception of locale strings that need not be purged.
 2018-01-12 21:15:42 +00:00
Alys 1c8797e473 change Attribute to Stat and upper-case Stat Points and a couple of other terms 2018-01-12 08:09:31 +10:00
Keith Holliday e0bf6d2e55 Reverted group flag code (#9784) 
* Reverted group flag code

* Reverted all flagging code

* Added hyphens back
 2018-01-11 12:04:07 -06:00
Sabe Jones b53c03bca8 Merge branch 'release' into develop 2018-01-10 16:42:13 +00:00
Sabe Jones 0112bd9b5a chore(i18n): update locales 2018-01-10 16:40:59 +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
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 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
Sabe Jones 7842cd8a41 chore(i18n): update locales 2018-01-08 17:18:12 +00:00
Pizilden daa796454c Added Farvoid Theme (new, clean branch) (#9634) 
* Added Farvoid Theme

* Updated generic.json and index.js

* fix(merge): address conflicts
 2018-01-05 14:34:19 -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
Allison Virgil 75b00ce2df Fixed Challenge Winner Text (partial fix for #9629) (#9664) 
* Fixed Challenge Winner Text (#9629)

* Fixing typo
 2018-01-05 13:29:00 -06:00
Julius Jung 4576353f26 inital commit to add confirmation to animalEars (#9666) 2018-01-05 13:26:45 -06:00
Sabe Jones 005ffe850a chore(i18n): update locales 2018-01-04 21:44:47 +00:00
SabreCat 71cb4e8510 feat(content): enable Wintery Skins and Hair 2018-01-04 21:35:26 +00:00
Sabe Jones 7e241bb76f Merge branch 'release' into develop 2018-01-03 00:07:42 +00:00
Sabe Jones 0069aee5b0 chore(i18n): update locales 2018-01-03 00:00:07 +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
Sabe Jones 0e404ad6ba chore(i18n): update locales 2017-12-31 02:43:40 +00:00
SabreCat d57c525fab feat(event): New Year's 2017-18 2017-12-31 02:34:52 +00:00
SabreCat 446e0422c7 Merge branch 'release' into develop 2017-12-22 21:57:43 +00:00
SabreCat 5220cc1bf3 fix(market): add broken Armoire items 2017-12-22 21:56:39 +00:00
Sabe Jones e8976b40f4 Merge branch 'release' into develop 2017-12-22 21:42:02 +00:00
Sabe Jones bbbdd89ade chore(i18n): update locales 2017-12-22 21:41:18 +00:00
Sabe Jones a20c1ba751 Include seasonal gear in Market class lists (#9739) 
* fix(shops): include seasonal gear in Market class lists

* fix(market): display non-seasonal broken special items
Also fixes a bug where if a current seasonal item was broken, it would show up twice.
 2017-12-22 15:29:51 -06:00
Alys d725b5be19 fix typo in loading screen tip 8 2017-12-22 20:45:35 +00:00
Sabe Jones 762e87a82a chore(i18n): update locales 2017-12-21 23:19:35 +00:00
SabreCat 4764f115b1 feat(content): Subscriber Items Dec 2017 2017-12-21 23:10:54 +00:00
Sabe Jones 8f744565e2 chore(i18n): update locales 2017-12-20 19:28:22 +00:00
SabreCat 9538c86d02 fix(seasonal): include current season gear in Shop 2017-12-20 18:31:10 +00:00
Sabe Jones 9435a3089a chore(i18n): update locales 2017-12-20 02:43:00 +00:00
SabreCat 98bb6fd7ce feat(content): Winter Wonderland 2017-18 
and Starry Night Hatching Potions
 2017-12-20 02:23:11 +00:00
Sabe Jones 7fccf59f50 Merge branch 'release' into develop 2017-12-15 15:54:09 +00:00
Sabe Jones fbdcd4b0a3 chore(i18n): update locales 2017-12-15 15:01:52 +00:00
SabreCat e229bc5042 Merge branch 'release' into develop 2017-12-15 05:37:04 +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
Sabe Jones 4f0ce77205 Winter Quest Bundle (#9718) 
* feat(content): Winter Quest Bundle

* fix(sprites): revert spritesheet changes
 2017-12-14 22:40:42 -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