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

730 Commits

Author SHA1 Message Date
Blade Barringer c3c144223a Merge branch 'develop' into mountmaster 2015-01-19 14:47:17 -06:00
Blade Barringer 753cac236b Added ng-sanitize 2015-01-19 14:17:43 -06:00
Alice Harris 57637d4271 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 
ally if it merges an updated upstream into a topic branch.
 2015-01-19 17:52:54 +10:00
Blade Barringer 1318d0de38 Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting 
Group Sorting
 2015-01-18 23:08:40 -06:00
Blade Barringer 7c10d27c04 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-18 15:56:11 -06:00
Blade Barringer 13e89f1947 Added sync after changing username so username would update 2015-01-18 15:55:39 -06:00
Tyler Renelle a44e0f7c31 fix(avatar-sharing): screw it, 1.3.3 backwards compat isn't working at 
the router level anyway. Besides, avatar sharing hasn't worked via
addthis for a while, so we don't need this
 2015-01-18 14:53:18 -07:00
Tyler Renelle a053486fcd fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x 
bug. Also, anon wasn't able to view avatar shares!
 2015-01-18 14:51:40 -07:00
Tyler Renelle 503fd9ff51 refactor(services): remove un-used authService, cleanup authCtrl 2015-01-17 18:59:28 -07:00
Tyler Renelle 2306b7c572 refactor(services): move to a single "habitrpg" module for services / 
directives / filters
 2015-01-17 18:43:37 -07:00
Blade Barringer f5e9568cef Consolidated calcTriadBingo function 2015-01-16 21:33:58 -06:00
Tyler Renelle 90c7142da5 refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js. 2015-01-16 16:48:53 -07:00
Blade Barringer e25472759a Added triad bingo achievment 2015-01-16 16:43:48 -06:00
Blade Barringer e5b6e64a98 Added preliminary logic for opening triadBingo modal 2015-01-16 11:47:07 -06:00
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
Alice Harris 7660141365 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 
Conflicts:
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2015-01-11 14:15:55 +10: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 a8888a0a53 Added last logged in choice for sorting 2014-12-30 13:05:55 -06:00
Blade Barringer b4975bb8a4 Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting 
Conflicts:
	public/js/controllers/headerCtrl.js
	views/options/social/group.jade
 2014-12-30 12:57:32 -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