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

6101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Blade Barringer 6807368c5c Removed comment 2015-01-01 21:29:27 -06:00
Blade Barringer e2403c52ad Converted more ng-shows to ng-ifs 2015-01-01 21:24:21 -06:00
Blade Barringer f2d62784f4 Converted ng-show to ng-if 2015-01-01 21:23:39 -06:00
Blade Barringer e219c0d110 Corrected mountmasterProgress variable name 2015-01-01 21:23:05 -06:00
Blade Barringer 08d13660fb Hid mounts area in stats until dropx enabled 2015-01-01 21:21:53 -06:00
Blade Barringer 04a12542e5 Corrected the achievemnts page to show the right medal for mountmaster 2015-01-01 21:17:58 -06:00
Blade Barringer 71a2ef91ca Fixed modals from not popping up when beastMaster and mountMaster 
achieved
 2015-01-01 20:52:55 -06:00
Negue 1051c0d50e maybe fixes the multilingual content result 2015-01-02 02:22:22 +01: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