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

709 Commits

Author SHA1 Message Date
Blade Barringer 10bc7e4eac Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-16 10:44:52 -06:00
Tyler Renelle 35e8097b0c refactor(challenges): wrap group.challenges as $resources, so they're 
convenience functions $join/$leave/etc can be called directly
 2015-01-15 15:24:02 -07:00
Blade Barringer a72ae097d6 Corrected how count is calculated 2015-01-11 18:23:27 -06:00
Blade Barringer f6885427a8 Corrected Beast Master and Mount Master count so it would be accurate. 2015-01-11 17:24:01 -06:00
Blade Barringer 1e11947c9e Removed unnecessary comment 2015-01-10 09:52:51 -06:00
Blade Barringer 819ab0b6e1 Added updated mountCount to releaseBoth function 2015-01-10 09:52:09 -06:00
Blade Barringer 2b20c52a8d Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-10 09:25:18 -06:00
Blade Barringer 0f3d6bc751 Explicitly reset mountCount to 0. (Otherwise, will not reset until refresh) 2015-01-10 09:24:30 -06:00
Blade Barringer a5d6c9de3f Force update of mountCount after feedling 2015-01-10 09:22:53 -06:00
Blade Barringer c6ef4b52ab The inventory controllers watch on mounts was creating an inaccurate count (was counting quest and special mounts) 2015-01-10 09:03:59 -06:00
Sabe Jones 689b13ecb6 fix(world-boss): Justin not stressed yet 2015-01-09 10:00:16 -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
Blade Barringer 0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
Blade Barringer eca252a269 Corrected moment code to use new format instead of depreciating format 2015-01-07 10:28:46 -06: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
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 b69182f777 Added mountCount variable for easy access 2015-01-02 14:10:52 -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 7f2648eafb Renamed release scripts 2015-01-02 12:43:40 -06:00
Blade Barringer 6807368c5c Removed comment 2015-01-01 21:29:27 -06:00
Blade Barringer 71a2ef91ca Fixed modals from not popping up when beastMaster and mountMaster 
achieved
 2015-01-01 20:52:55 -06:00
Melissa Mcewen 9d6d375663 Salt spell d 
oesn't check to see if you have enough Gold #4454 adjusting check
 2015-01-01 14:31:11 -06:00
Melissa Mcewen cf40ef8a72 Salt spell doesn't check to see if you have enough Gold #4454 check if spell uses gold 2014-12-31 20:37:54 -06:00
Melissa Mcewen 37a6091638 Salt spell doesn't check to see if you have enough Gold #4454 2014-12-31 19:29:08 -06:00
Blade Barringer 0fd3f290b8 Merge branch 'develop' into mountmaster 2014-12-31 13:14:11 -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
Tyler Renelle edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones 51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -06:00
Blade Barringer 33e5802333 Added image to stripe checkout 2014-12-29 20:35:07 -06:00
Blade Barringer ffa8072800 Made name field HabitRPG so sms will be correct. Uncomented description 
and put the old name field
 2014-12-29 20:31:59 -06:00
Sabe Jones 53fff0dbc6 feat(seasonal): Implement Snowball 
Adds the snowball from Winter 2014 to the Seasonal Shop.
 2014-12-29 19:40:11 -06:00
Blade Barringer ae8542eaf1 Removed extraneous console logs left while testing 2014-12-29 15:50:44 -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
Matteo Pagliazzi 756fa83418 fix(date): typo 2014-12-29 22:26:12 +01:00
Matteo Pagliazzi cb13b5ac26 fix(date): add YYYY/MM/DD format 2014-12-29 22:16:58 +01:00
Matteo Pagliazzi 3105b61cb5 Merge branch 'Verabird-dateformat' into develop 2014-12-29 21:24:44 +01:00
Matteo Pagliazzi 4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Blade Barringer 4e1b298a42 Corrected spelling error in comment 2014-12-29 14:16:25 -06:00
Matteo Pagliazzi 752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Negue a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Blade Barringer 2bb1e5cf7f Merge branch 'confirm-delete' into develop 2014-12-26 21:04:48 -06:00
Blade Barringer 695c463b40 Added confirmation dialog before deleting message 2014-12-26 21:04:22 -06:00
Alice Harris af7e68259d Merge pull request #4404 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:29:04 +10:00
Verabird 8852ad61b2 Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed 2014-12-26 15:52:42 -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
Sabe Jones 0e28f04c90 feat(event): Implement Seasonal Shop 2014-12-25 14:33:11 -06:00