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

201 Commits

Author SHA1 Message Date
Sabe Jones 2da9876e42 Revert "fixes task edit cancellation commit (#7931)" 
This reverts commit bbf15e1756.
 2016-09-13 16:32:52 +00:00
Kaitlin Hipkin 6f2767edd3 Separate stats and achievs pages (#7804) 
* separate stats and achievs tabs, move 'enable class system' button to stats

* move stats layout stuff from profile.jade to stats.jade

* shuffle stats page into more columns

* separate stats and achievs in expandable navbar submenus

* add multiple options for stats.jade: col1, col2, all; fixes weirdly crowded members modal

* make stats and achievs strings consistent

* remove mobile checks in profile.jade

* fix merge issue
 2016-09-12 22:04:47 -05:00
Travis bbf15e1756 fixes task edit cancellation commit (#7931) 
* fixes the commit that shows actual task values when task edit is canceled.

This reverts commit 3d64f2b849.

* removing _edit references from fields of a task that can't change and are always set

* removing _edit from task.type as type cannot change while editing.

* Addressing comments by blade
 2016-09-12 21:23:23 -05:00
Blade Barringer 9d537d93d8 fix(client): Copy inbox messages to tasks 
fixes #7017
closes #6994
 2016-09-12 08:01:50 -05:00
Blade Barringer 379b318202 fix(client): Allow bulk task adding in challenges 
closes #6781
fixes #6723
 2016-09-11 21:59:18 -05:00
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 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
Oziris 0dfb1f150f Provide better invitation messaging 
closes #7794
fixes #7789
 2016-09-09 20:37:05 -05:00
Matteo Pagliazzi 2d6223377f chat: better behavior for menu notification 2016-09-09 21:34:24 +02:00
Matteo Pagliazzi 60f7a1dbd9 add small timeout before asking for notification permission 2016-09-09 21:26:40 +02: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
Matteo Pagliazzi 98df0f26e7 add notifications, fix too many seen requests and misc fixes 2016-09-09 20:12:17 +02:00
Matteo Pagliazzi a748e57cd7 do not sync automatically on chat seen requests 2016-09-09 19:11:21 +02:00
Oziris Moreira 7d7bb3ecb8 Prevent Challenge page from scrolling to top (#7975) 
* Test pageTitle challenge

* Test state name challenge detail

* Change != to !==

* IGNORE_SCROLL_PAGES

* add challenge to ignore_scroll
 2016-09-09 08:51:08 -05: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
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 d1903578f9 pusher: remove more duplicate code ( sorry :( ) 2016-09-08 19:13:52 +02:00
Matteo Pagliazzi 6ba721998a Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-08 19:12:05 +02:00
Matteo Pagliazzi 459a41a5ac pusher: remove duplicate code 2016-09-08 19:05:22 +02:00
Matteo Pagliazzi 136b4ada45 renable limit on number of tabs connected 2016-09-08 19:05:03 +02:00
Matteo Pagliazzi d4dc455926 re-enable limit of 1 tab per user connected to pusher 2016-09-08 18:51:24 +02:00
Matteo Pagliazzi cac764e5d1 add online indicator for party members 2016-09-08 18:48:07 +02:00
Blade Barringer 0862c3b077 fix: Correct quest damange calculation 
fixes #7980
 2016-09-07 21:09:12 -05:00
Blade Barringer ee409174f1 Format files to adhere to editorconfig (#7977) 2016-09-07 12:58:26 -05:00
Blade Barringer 67716ef309 Clean up quest progress logic 2016-09-07 12:48:06 -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 ea2be45414 add notifications for real time messages 2016-09-07 17:16:32 +02:00
Matteo Pagliazzi 41079a65c6 correctly reconnect to pusher after inactivity 2016-09-07 17:00:43 +02:00
Matteo Pagliazzi 85c4332a40 pusher: remove commented code that is unused 2016-09-07 16:51:22 +02:00
Matteo Pagliazzi dafae31366 disable limit of 1 tab per browser connected to pusher 2016-09-07 16:50:22 +02:00
Matteo Pagliazzi 40c9c05514 fix first connection to pusher 2016-09-07 16:46:32 +02:00
Matteo Pagliazzi 0baff2dfd9 remove limit of 1 connected tab per browser 2016-09-07 16:44:20 +02:00
Matteo Pagliazzi a4ecdbeb3e fully sync party on system messages 2016-09-07 16:39:53 +02:00
Matteo Pagliazzi f28dead692 do not sync party every time the page is opened, update chat in realtime 2016-09-06 11:18:52 +02:00
Matteo Pagliazzi 6792464fbf limit rtc to parties 2016-09-05 17:54:24 +02: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 6a04ed7392 fix(editing): send user on dblclick 2016-08-23 20:22:27 +00: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
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
Phillip Thelen 679378331d add client and OS info to amplitude events 
closes #7865
 2016-08-11 08:58:13 -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 89822222fe Merge pull request #7881 from Hus274/7716 
fix: shows user correct challenge when showing won challenge modal
 2016-08-11 08:07:16 -05:00
Blade Barringer fed1eb8c21 fix(client): set state chagne to scroll to top 
closes #7880
fixes #4326
 2016-08-11 07:59:12 -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