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

6224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sabe Jones 41d073d181 fix(world-boss): Achievement badge 2015-01-08 15:47:48 -06:00
Sabe Jones ee339fba4a feat(event): World boss 
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:22:42 -06:00
Tyler Renelle cba232ef83 feat(presskit): add presskit page cc @lemoness 2015-01-08 13:41:23 -07:00
Tyler Renelle 6626103d06 chore(cores): allow cores==0 to not use cluster at all (even w/ single 
core). Good for running debugger. If cores==1, it will use cluster to
restart the single node on error
 2015-01-08 13:19:11 -07:00
Blade Barringer 0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
Tyler Renelle 0b28f6df55 fix(plans): when gifting subscription, set plan.dateUpdated so it can 
roll gemCapExtra next month. Fixes #4480
 2015-01-07 14:59:38 -07:00
Blade Barringer c96ae618db Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-07 10:32:58 -06:00
Blade Barringer eca252a269 Corrected moment code to use new format instead of depreciating format 2015-01-07 10:28:46 -06:00
Matteo Pagliazzi 193b92c16b fix(cds): max hour is 23 not 24 2015-01-06 23:12:03 +01: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
Matteo Pagliazzi b854663b92 fix(loggly): do not pass apiKey 2015-01-06 09:05:30 +01: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 aa6b1e3f81 add remove-watch to markdown-directive 2015-01-05 22:19:05 +01: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
Blade Barringer f3676fcbf4 Added spaces between quantity and gem symbol 2015-01-05 13:33:43 -06:00
Blade Barringer a72faa5d92 Added ctrl+cmd enter command to pms 2015-01-05 13:21:23 -06:00
Blade Barringer 5deb72c457 Added ability to send chat via cmd/ctrl + enter 2015-01-05 13:17:23 -06:00
Alice Harris dc7c6f8625 Merge pull request #4476 from jdpopkin/stat_tooltips_3223 
Add tooltip with exact health/exp/mana
 2015-01-05 18:06:57 +10:00
Jackson Popkin b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Blade Barringer ff3d942696 Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try 2015-01-04 16:11:22 -06:00
Tyler Renelle fe1672e82d Merge pull request #4441 from crookedneighbor/stripe-name-error 
Stripe name error
 2015-01-03 15:25:29 -07:00
negue d5eb5bbfe0 fix(content): Cannot call 'toString' of undefined 2015-01-03 23:20:16 +01:00
Tyler Renelle a98f73dd8d tmp(newrelic) remove newrelic until #4471 fixed 2015-01-03 13:59:56 -07:00
Sabe Jones 09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Blade Barringer 6441888d3f Moved mountMaster watch to feeding function 2015-01-02 19:09:50 -06:00
Blade Barringer 9b82da064f Moved the beastMaster modal alert from notifications to inside the hatching function 2015-01-02 18:52:25 -06:00
Blade Barringer e1494b3860 Added Shared as one of the injections 2015-01-02 18:51:51 -06:00
Blade Barringer 19fc403b2f Clarified comments in user model 2015-01-02 15:26:16 -06:00
Blade Barringer 45c045e853 Corrected which string was being used in achievements 2015-01-02 14:16:40 -06:00
Blade Barringer 68e613c3fc Simplified count checks in keys to the kennel modal. Adjusted balance for releaseBoth to be correct 2015-01-02 14:11:59 -06:00
Blade Barringer 3c3bbcafb9 Simplified count in stable 2015-01-02 14:11:04 -06:00
Blade Barringer b69182f777 Added mountCount variable for easy access 2015-01-02 14:10:52 -06:00
Blade Barringer 87d78618d8 Changed keys of the kennel npc to Matt 2015-01-02 13:46:21 -06:00
Blade Barringer 406edcb761 Added releaseBoth script and refactored keys to the kennel modal 2015-01-02 13:33:41 -06:00
Blade Barringer 1049e5e152 Key shows up when you have either 90 pets or 90 mounts. Opens lg modal 2015-01-02 13:08:45 -06:00
Blade Barringer 7f2648eafb Renamed release scripts 2015-01-02 12:43:40 -06:00
Matteo Pagliazzi 3e0118a25a Merge pull request #4463 from negue/contentTranslation 
maybe fixes the multilingual content result
 2015-01-02 15:23:23 +01:00
Blade Barringer 914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-01 23:23:08 -06:00
Blade Barringer 33abd30217 Adjusted look of gem wallet in modal 2015-01-01 23:22:40 -06:00
Sabe Jones 3a0de8f9c4 chore(January): news and deactivate cards 2015-01-01 23:20:59 -06:00