Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,337 Commits 64 Branches 1,256 Tags
0474b5d2e6661b2d10acfc0eee170be41bf93bca
Commit Graph

1461 Commits

Author SHA1 Message Date
Matteo Pagliazzi 71f2f49a28 Merge pull request #7972 from HabitRPG/paglias/realtime-chat-v1 
Real Time Chat v1 (parties only)
 2016-09-11 12:59:02 +02:00
Blade Barringer b8878df6bd fix(client): Apply sleep prevention to some avatar generation calls 2016-09-10 22:41:20 -05:00
Alyssa Batula aac38dda91 Avatar's eyes can be set to open or closed in modals while in the Inn fixes #6282 (#7988) 
* Avatar model can be set to have eyes open, eyes shut, or left to default by specifying the sleep parameter in generatedAvatar to be false, true, or null (respectively).

* Explicitly check true and false and switched to using triple equals for equality comparisons for avatar sleep setting.
 2016-09-10 22:41:00 -05:00
Blade Barringer 3d53781bd3 Fix content name error (#7995) 
* fix: correct translation strings for pet/mount names

* chore: expose potion and egg key, not object in pet content api

* fix: Update feed route to use potion and egg objects

* refactor: Update feed route to use petInfo

* Use pet/mount text method for name

* correct feed route
 2016-09-10 22:05:25 -05:00
Blade Barringer f496a6b0c7 feat: Lower cost of orb of rebirth 
closes #7917
fixes #7944
 2016-09-09 21:08:42 -05:00
Oziris 0dfb1f150f Provide better invitation messaging 
closes #7794
fixes #7789
 2016-09-09 20:37:05 -05:00
Matteo Pagliazzi f6c765b7b5 better notifications icon 2016-09-09 21:03:47 +02:00
Matteo Pagliazzi e2b03ec9cf Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-09 20:13:21 +02:00
Kaitlin Hipkin a3f83b9076 Improvement #6912: New achievement modal service and more achievement tests (#6943) 
* add tests for beastMaster, mountMaster, and triadBingo achievements

* add tests for challengeWon, streak, ultimateGear, rebirth, and contributor achievements

* add achievement service that has openModal function

* achievement test pass again

* fix indentation, rename openModal to more descriptive displayAchievement

* add unit tests for achievements service

* initialize user.preferences.suppressModals in specHelper.newUser

* update achievement tests to account for new notification service

* add new achievementServices file to manifest.json

* fix tests

* award wonChallenge achiev like other achievs

* differentiate between small and normal achiev modals

* refactor achievementService.displayAchievement() to take options param
 2016-09-09 07:58:44 -05:00
Alys f16f9684ca fix spelling mistake and remove outdated material 2016-09-09 16:36:09 +10:00
Blade Barringer d9b8ee840d chore: Update press kit 
Implimented from #7262

fixes #7174
closes #7262
 2016-09-08 21:18:02 -05:00
Blade Barringer 454ccffb03 fix: save tour state 
Implimentation of #6545 by @tylerxo

fixes #5854
fixes #5852

closes #6545
 2016-09-08 20:23:49 -05:00
Matteo Pagliazzi 6ba721998a Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-08 19:12:05 +02:00
Matteo Pagliazzi cac764e5d1 add online indicator for party members 2016-09-08 18:48:07 +02:00
AccioBooks ef73c61e0e API Warning message (#7978) 
* Warning message

* Change warning text and style

* Update settings.json
 2016-09-08 16:46:21 +10:00
Blade Barringer aff9af7db2 Revert "Disable checkbox" 
This reverts commit 82448b2a93.
 2016-09-07 20:45:40 -05:00
Sabe Jones 4844aa5e47 chore(news): misc Bailey 2016-09-07 20:19:43 +00:00
Blade Barringer ee409174f1 Format files to adhere to editorconfig (#7977) 2016-09-07 12:58:26 -05:00
Thomas Gamble db19dbf49c shows quest progress in menu #7928 
fixes #7928
closes #7960
 2016-09-07 12:47:50 -05:00
Matteo Pagliazzi 15ceab4bf4 Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-07 16:59:50 +02:00
Matteo Pagliazzi fd00543a8d change button text for syncing party 2016-09-07 16:01:21 +02:00
Blade Barringer def2ea0add Merge branch 'Ozzystrasza-challenge_sample_tasks' into develop 2016-09-07 08:23:55 -05:00
Ozzystrasza 82448b2a93 Disable checkbox 
fixes #5284
closes #7961
 2016-09-07 08:23:17 -05:00
Alys 9fde8b4d48 adjust footer to have relative link for Submit Bug (fixes #7973) and "News" link for Old News page (ref. #7976) 2016-09-07 23:17:21 +10:00
AccioBooks 5f9eb6a72c Old news (#7976) 
* Update footer.jade

* Update front.json

* Update front.json
 2016-09-07 07:55:33 -05:00
Sabe Jones 5c761b1237 feat(content): BGs and Armoire comp (#7964) 2016-09-01 15:56:35 -05:00
Blade Barringer 7702f9dccc Challenge checklist fix (#7963) 
* fix(challenges): don't wipe user xlists

* Add test for challenge checklists not syncing to user
 2016-09-01 12:34:02 -05:00
Sabe Jones 7efde862f1 fix(challenges): temp remove challenge edit 2016-09-01 15:45:36 +00:00
Sabe Jones cb1417ea58 Handle empty market category on Drops page (#7959) 
* fix(market): hide category in view

* refactor(view): if, not hide

* fix(test): allow empty market cat
 2016-08-31 17:16:22 -05:00
Sabe Jones 7e0a860b25 chore(content): disable Thunderpotions 
Also remove superfluous message about the Quests Shop
 2016-08-31 19:14:28 +00:00
Sabe Jones c726fa78f5 chore(news): misc Bailey 2016-08-30 17:11:29 +00:00
Sabe Jones 2e050be111 fix(contact): s/leslie/admin/g (#7945) 2016-08-29 19:58:51 -05:00
Alys 320d8cac5f replace "Tavern Talk" with "Tavern Chat" above Tavern's chat box - fixes https://github.com/HabitRPG/habitrpg/issues/6813 2016-08-26 07:57:16 -07:00
Sabe Jones 88d26cd200 fix(news): credit TheHollidayInn 2016-08-24 15:15:43 -05:00
Blade Barringer 5bcc2561ae feat(client): Show battle with friends button with 3 members 
fixes #6754
closes #6765
 2016-08-24 08:45:39 -05:00
Blade Barringer 3d64f2b849 fix: Revert #7692 2016-08-23 21:40:33 -05:00
Blade Barringer f148c592f5 Merge pull request #7911 from crookedneighbor/fix_magic_pets_spacing 
fix(client): Correct logic to show premium pets
 2016-08-23 17:20:17 -05:00
Sabe Jones 71a759c551 feat(content): mystery items 201608 (#7919) 2016-08-23 14:49:22 -05:00
Blade Barringer 67187c1b08 fix: show markdown compiled task text while editing 2016-08-20 09:21:52 -04:00
Blade Barringer b3b7108bd6 Merge branch 'develop' into Hus274-7688 2016-08-20 08:31:22 -04:00
Blade Barringer a69ab954f5 fix(client): Correct logic to show premium pets 
Fixes #7888
 2016-08-19 08:41:27 -04:00
Sabe Jones 3ac5617e57 chore(news): Bailey 20160818 2016-08-18 18:58:37 +00:00
Travis 1a409848a8 allow flagging the post of a deleted user (#7897) 
* Allowing the flagging of messages that were written by user accounts that have since been deleted

* replacing ternary operator with else if, else paradigm

* formatting fixes

* fixing message in tests
 2016-08-15 22:14:52 -05:00
Kaitlin Hipkin 55111a6ddc New Party Loading Messages (#7862) 
* add basic party loading message code; doesn't work yet

* fixup party loading messages, remove rpg-style messages

* move party-loading messages back into groups.json

* party-loading message logic returns a string instead of a number
 2016-08-12 08:53:03 -05:00
Blade Barringer e3c40aa142 fix(client): Prevent restore streak from showing up in challenge creation 2016-08-11 08:48:44 -05:00
Husman 725c3b36f3 feat: allowing modification of challenge tasks after challenge creation. fixes #7320 
closes #7877
 2016-08-11 08:48:39 -05:00
Blade Barringer 858da4f9c9 Merge pull request #7890 from HabitRPG/sabrecat/prefs-undefined 
Fix preferences typeError
 2016-08-11 07:48:14 -05:00
Josh Holland cdeb498c0b Align guild gems box with other page elements (#7829) 
* Align guild gems box with other page elements

Fixes #7796.

* Fix issues caused by aligning guild gems box

* Remove unnecessary comment

* Connect gem total box and plus/add gems button

When the add gems button is displayed, set border-radius on touching
corners between the two buttons to 0, so that they are displayed as a
unit rather than two separate buttons.
 2016-08-11 07:45:21 -05:00
Sabe Jones e7a820e28d fix(editing): preferences typeError 2016-08-10 20:23:14 +00:00
Blade Barringer 420cebd93b fix: Correct purchase call to use purchaseType, not identifier 2016-08-10 08:58:01 -05:00