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

627 Commits

Author SHA1 Message Date
Tyler Renelle bef4f0685e Merge pull request #2291 from HabitRPG/sabe/tweak2 
Beef up critical hit notification with its own style and icon
 2014-01-07 10:34:07 -08:00
Sabe Jones 1a92ec1748 Beef up critical hit notification with its own style and icon 2014-01-07 12:03:07 -06:00
Tyler Renelle 54c8f4bc3a Merge pull request #2288 from HabitRPG/sabe/fix 
Client side of Rebirth-related fix: don't remove Wolf Eggs upon unlock
 2014-01-07 09:49:40 -08:00
Tyler Renelle 154abcefbb #2010 Add party stats back in. Depends on habirpg-shared#939ce14 to wrap members 2014-01-07 10:46:51 -07:00
Sabe Jones be2def91f1 Fix #2048 (streak bonuses not appearing to add up) 2014-01-07 11:14:34 -06:00
Sabe Jones bbbc9bfe50 Client side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:13:03 -06:00
Tyler Renelle 53aa0bba59 #2245 fix tour wording from 1.5% => 50% class stat bonus 2014-01-06 21:26:55 -07:00
Tyler Renelle f539108b39 Merge pull request #2275 from colegleason/streak-modal 
Don't show Streak achievement modal on Fix Character Values if it was undefined
 2014-01-06 19:59:14 -08:00
steve hiemstra fd56c17518 work on #2183 resize checklist items 
such that they resize dynamically; however the text will still not wrap
due to the fact that it is an input.
 2014-01-06 21:21:01 -05:00
Cole Gleason eb9db5b612 Don't show Streak achievement modal on Fix Character Values if it was previously undefined 2014-01-06 16:43:56 -06:00
Tyler Renelle f6e6d115ac chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob) 2014-01-05 22:12:02 -07:00
Tyler Renelle eb5a9150ab hall: use infinite-scroll to load patrons, since there are so many 2014-01-05 19:51:33 -07:00
Tyler Renelle a5db8628e2 hall: start moving admin stuff to hall-of-heroes / hall-of-patrons, so everyone can see contribs / backers 2014-01-05 19:19:34 -07:00
Tyler Renelle e474278ab3 groups: upon group-creation, creator is automatically assigned as leader 
and only member. Remove sending up leader & members from the client,
should all be handled on the server
 2014-01-05 15:08:10 -07:00
Sabe Jones 7904b8e4db Clear up some confusion caused by AngularJS number filter 2014-01-05 09:32:20 -06:00
Tyler Renelle 3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop 
Conflicts:
	views/shared/footer.jade
 2014-01-04 16:02:22 -07:00
Dušan Juretić f854d2d022 Use $window on inventoryCtrl, so it can be mocked on tests 2014-01-04 00:01:29 -03:00
Tyler Renelle c9e083b602 challenges: add "official habitrpg challenge" option 2014-01-03 13:36:13 -07:00
Cole Gleason f218a52bf2 Add Critical Hit notification by watching user._tmp.crit 2014-01-02 13:41:50 -06:00
Tyler Renelle 7f3b6a4470 Merge pull request #2209 from benblank/pet-alignment 
Fix (apparent) misalignment of paws on pets/mounts grids
 2014-01-01 20:14:44 -08:00
Tyler Renelle c5ed6917fe Merge pull request #2210 from benblank/popover-shadows 
Prevent popover shadows from being clipped/overlapped
 2014-01-01 20:13:05 -08:00
Sabe Jones a9e57a8adf Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:53 -06:00
Ben Blank 56613910f0 prevent popover shadows from being clipped/overlapped 2013-12-31 14:58:47 -08:00
Ben Blank 32d1ff68b4 fix apparent misalignment of paws on pets/mounts grids 2013-12-31 14:34:24 -08:00
Tyler Renelle 09eddd3eb2 checklists #2198 click badge to collapse checklist @sabrecat 2013-12-31 14:03:16 -07:00
Sabe Jones be38029015 Extend notification time, fix MP alerts 2013-12-31 10:29:48 -06:00
Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop 
Conflicts:
	src/models/user.js
	views/shared/modals/index.jade
 2013-12-31 08:04:51 -07:00
Tyler Renelle 01ecc616f6 Merge branch 'checklists' into develop 2013-12-31 07:53:34 -07:00
Sabe Jones 9c5f1c2150 Add debug button to hand out levels one at a time 2013-12-30 22:56:01 -06:00
katfang 7205221b86 Minor Text Update to Class Tour 
Spells now happen at level 11 rather than 6.

Reflects change from https://github.com/HabitRPG/habitrpg/issues/2096
 2013-12-30 17:26:44 -05:00
Tyler Renelle c7dde3cde1 checklists: add CL up/down keyboard nav 2013-12-30 13:42:19 -07:00
Tyler Renelle 1110338b9b checklists: handle backspacing an empty CL item 2013-12-30 13:19:42 -07:00
Tyler Renelle ebc7cf6bcb checklists: better handling of saveTask, keypress:13, and remove-blur 2013-12-30 12:56:26 -07:00
Tyler Renelle 968b091ccd checklists: checklist as <li> instead of <label>, so that inline-editing 
doesn't trigger checkmark. Unfortunately means we need to replicate some
bootstrap css
 2013-12-30 10:33:48 -07:00
Tyler Renelle 1ace999cb7 Tasks: add double-click to edit, and date-picker-popup for 
due-dates. Show red dates when overdue (basic)
 2013-12-30 10:33:48 -07:00
Tyler Renelle 74c905f1e1 checklists WIP 2013-12-30 10:33:17 -07:00
Tyler Renelle 6f0046dffc Revert b4ff7d4 b20a3b7 . Temporarily remove 
todo-filter. This brings back the big performance issue of always
displaying completed-todos, but fixes #2180 #2189. See #2180 for
discussion.
 2013-12-30 10:19:57 -07:00
Tyler Renelle 61dfb8d129 Merge pull request #2086 from HabitRPG/sabe/tweak2 
Remove sliding effect on avatar mouseover
 2013-12-29 16:19:09 -08:00
Tyler Renelle e9cb9b8a9f task-icons: larger emoji in task text than chat 2013-12-29 01:24:02 -07:00
Tyler Renelle b4ff7d4be4 #1499 check that task[0] exists first 2013-12-29 00:33:58 -07:00
Tyler Renelle b20a3b7381 #1499 add list filter on tasks to not display completed todos at all 
until "completed" tab clicked
 2013-12-29 00:14:46 -07:00
Tyler Renelle 34a955665c Merge pull request #1986 from Magnilucent/develop 
Fixes #1959: petCount was only being updated...
 2013-12-28 21:15:32 -08:00
Tyler Renelle 49d76e1649 fix #2147 put removeMember back in 2013-12-28 12:54:53 -07:00
Tyler Renelle e863d5927a Merge pull request #2138 from HabitRPG/sabe/tweak4 
Remove padding from <li> when used in Markdown
 2013-12-27 07:53:52 -08:00
Tyler Renelle 13e1792685 Merge pull request #2123 from HabitRPG/sabe/tweak3 
Fix #2072 (add Mana delta alerts)
 2013-12-27 07:53:12 -08:00
Tyler Renelle f9d858c588 Merge pull request #2118 from HabitRPG/sabe/drops 
Minimal fix for #2092
 2013-12-27 07:48:00 -08:00
Sabe Jones f3798c0bc8 Remove padding from <li> when used in Markdown 2013-12-27 08:56:55 -06:00
Sabe Jones 601af6ddc0 Make better use of space for customizations and Market 2013-12-26 07:56:01 -06:00
Sabe Jones 3074cc8f16 Fix #2072 (add Mana delta alerts) 2013-12-26 07:31:00 -06:00
Sabe Jones e5b8a92ea2 Minimal fix for #2092 2013-12-25 23:56:51 -06:00