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

843 Commits

Author SHA1 Message Date
Blade Barringer 2d0d2cedd9 Converted floor mechanism to filter to match health calculation 2015-01-09 09:50:13 -06:00
Blade Barringer 34bd7cb879 Added mana to stats page 2015-01-09 09:47:06 -06:00
Blade Barringer 8ba0bb5d88 Changed spellObj to skill to be more semantic, and match the text in the 
rewards column
 2015-01-06 15:31:07 -06:00
Blade Barringer 870d9d7e86 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 15:04:47 -06:00
Blade Barringer 9da000ec4e Changed spell to spellObj in ng-repeat for class spells in order to 
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
 2015-01-06 15:03:54 -06:00
Blade Barringer 96b48324f8 Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks 
Fix for truncated dates on task due date. Closes #4482
 2015-01-06 14:29:16 -06:00
Blade Barringer 53c466ee7f Rounds tooltip for exp, health and mana to 2 decimal places 2015-01-06 13:52:22 -06:00
Blade Barringer e416b03a59 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 09:39:04 -06:00
Blade Barringer dd4e8d74c7 Fix for truncated dates on task due date. Closes #4482 2015-01-06 09:37:29 -06:00
Sabe Jones 8feffa5431 fix(news): Improve accuracy 2015-01-05 17:31:19 -06:00
Blade Barringer f0c65be629 Fix to allow for challenges with the same award name. Closes #4479 2015-01-05 17:15:33 -06:00
Sabe Jones 8529c0f1db chore(news): Bailey 2015-01-05 16:48:58 -06:00
negue ad8add58d7 Merge pull request #4461 from negue/markdownText 
change markdown ngModel to text attribute
 2015-01-05 22:12:06 +01:00
Blade Barringer cc7b2f70ba Hide buy gems button if over level 100 in rebirth modal 2015-01-05 13:41:58 -06:00
Blade Barringer 10451d3296 Removed gem cost if lv 100 or higher 2015-01-05 13:38:00 -06:00
Jackson Popkin b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Sabe Jones 09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Blade Barringer 914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-01 23:23:08 -06:00
Sabe Jones 3a0de8f9c4 chore(January): news and deactivate cards 2015-01-01 23:20:59 -06:00
Blade Barringer fc4e43bef8 Merge branch '4401_multiple_buy_gems_popups_with_mixins' of https://github.com/lucymhdavies/habitrpg into gems-mixin 
Conflicts:
	views/shared/gems.jade
	views/shared/modals/buy-gems.jade
 2015-01-01 23:18:28 -06:00
Blade Barringer c561562009 Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop 
closes #4401
 2015-01-01 23:12:10 -06:00
Lucy Davies 0cfb705762 Add behaviour specific to the buy-gems popup. 2015-01-02 00:01:44 +00:00
Lucy Davies 0754b58cc2 Source the new mixin file, and call the mixins in place of including the former gems.jade 2015-01-01 23:58:28 +00:00
Lucy Davies 153e0db71d And of course convert this into a mixin 2015-01-01 23:57:08 +00:00
Lucy Davies 6f3ee14842 Move views/shared/gems.jade -> views/shared/mixins.jade 2015-01-01 23:50:38 +00:00
Negue b3ccdc2859 change markdown ngModel to text attribute 2015-01-01 20:57:57 +01:00
Blade Barringer 5d958b1456 Adjusted styles for snowball and spookDust so they would align like the coins 2014-12-31 09:31:56 -06:00
Sabe Jones ccfe48099f fix(NYE): fix cards 
Improve random messages and have Bailey give instruction on where to find cards.
 2014-12-30 23:25:34 -06:00
Sabe Jones 438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06:00
Sabe Jones 230482c578 chore(news): Bailey 2014-12-30 21:58:15 -06:00
Tyler Renelle edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones e35722865a fix(NYE): I18N for random text 2014-12-30 20:52:06 -06:00
Sabe Jones d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Blade Barringer 0ddbbc93a3 Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop 2014-12-29 18:33:14 -06:00
Blade Barringer efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-29 15:44:06 -06:00
Blade Barringer b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 2014-12-29 15:43:20 -06:00
Melissa Mcewen 8bdc0d55b9 Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:53:15 -06:00
Melissa Mcewen c4e62fc79b Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:51:37 -06:00
Verabird 9b10081117 Removed useless comment in task.jade 2014-12-26 16:07:54 -05:00
Verabird 7297429888 Make it possible to choose between MM/dd and dd/MM date format 2014-12-26 15:52:42 -05:00
Verabird e391fc04f0 Add variables for medium-length date display 2014-12-26 15:52:42 -05:00
Verabird 13be267efb added variable for date display and checking line ending issue 2014-12-26 15:52:41 -05:00
Lucy Davies 33ed0794b9 Remove the onClick action of this file is included in the Buy Gems popup 2014-12-26 01:06:30 +00:00
Lucy Davies c65fe65d4e Remove the + icon if this file is included in the Buy Gems popup 2014-12-26 00:34:48 +00:00
Lucy Davies d29971695e Define the variable to control display of the + icon and the onClick functionality 2014-12-26 00:17:03 +00:00
Sabe Jones 597793e3ca feat(event): Quests and Bailey 2014-12-25 17:36:16 -06:00
Blade Barringer a8459c2f96 Changing button to a element fixed the delete on enter problem 2014-12-24 11:17:05 -06:00
Blade Barringer 0339bdf43f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-24 09:02:20 -06:00
Blade Barringer fdcc22bde9 Closes #4361 2014-12-24 09:02:03 -06:00