Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,208 Commits 64 Branches 1,256 Tags
4f36ecb8d162681b64bcebb7af3765d8a76e6e29
Commit Graph

10208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sabe Jones 4f36ecb8d1 fix(legal): TOS and privacy tweaks 
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
 2015-07-27 15:26:31 -05:00
Blade Barringer e72543641c Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed 
Closes #5668
 2015-07-25 23:22:35 -05:00
Alys f5c66e51d1 refactor cron process for todos and dailys to give them separate code 2015-07-26 11:27:00 +10:00
Blade Barringer f31d1b4b1b Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix 2015-07-24 22:16:57 -05:00
Blade Barringer f749d1a3cb Make todos selectable with vimium 2015-07-24 22:08:13 -05:00
Blade Barringer 7c43f87858 Add test for discard method 2015-07-24 17:30:48 -05:00
Blade Barringer 60ee0c911f Add test for edit 2015-07-24 17:30:48 -05:00
Blade Barringer 6aae668b8c Rework gem adjustment so it actually makes sense 2015-07-24 17:30:47 -05:00
Blade Barringer 68f9a78aac Write tests for creating challenges 2015-07-24 17:30:47 -05:00
Blade Barringer 9e25c29e04 Correct maxPrize calculation 2015-07-24 17:30:47 -05:00
Blade Barringer 099beb5e8d Add task manipulation tests for challenges 2015-07-24 17:30:46 -05:00
Blade Barringer aea1ceafe5 Move test 2015-07-24 17:30:46 -05:00
Blade Barringer 875f30bece Add tests for filtering groups 2015-07-24 17:30:46 -05:00
Blade Barringer e37c60e0f2 Expand functions to make them readable 2015-07-24 17:30:45 -05:00
Blade Barringer 800c270944 Add tests for leave functions 2015-07-24 17:30:45 -05:00
Blade Barringer d3da391f6e Add challenge join test 2015-07-24 17:30:45 -05:00
Blade Barringer 0b85dc3e27 Correct getChallenges name 2015-07-24 17:30:44 -05:00
Blade Barringer 12e0bda8a2 Use specHelper to create mock challenges 2015-07-24 17:30:44 -05:00
Blade Barringer 32ebc8734e Set default prize for challenge at 0 2015-07-24 17:30:44 -05:00
Blade Barringer f9cc9a87ee Add challenge factory to karma specs 2015-07-24 17:30:44 -05:00
Blade Barringer 2722116b40 Organize challenge controllers specs 2015-07-24 17:30:43 -05:00
Blade Barringer 61d0172567 Add mising semi colons and line breaks 2015-07-24 17:30:43 -05:00
Blade Barringer 95131f276b Add tests for save function 2015-07-24 17:30:43 -05:00
Blade Barringer a89b612bbe Impliment challenge controller changes in view 2015-07-24 17:30:42 -05:00
Blade Barringer bac979ca4d Eliminate unused variable 2015-07-24 17:30:42 -05:00
Blade Barringer 2441f6363e Consolidate transition code 2015-07-24 17:30:42 -05:00
Blade Barringer 5cd42e85c7 bail out and alert user if prize is too high 2015-07-24 17:30:41 -05:00
Blade Barringer 7c4486e001 Use gem calc functions 2015-07-24 17:30:41 -05:00
Blade Barringer c92678008b Write functions to check if user has balance for challenge creation 2015-07-24 17:30:41 -05:00
Blade Barringer cb27c3dc44 Correct indentation and equality checks on shuldShowChallenge 2015-07-24 17:30:40 -05:00
Blade Barringer eea01216d7 Move backToChallenges to private functions section 2015-07-24 17:30:40 -05:00
Blade Barringer fb6a34c2ed Set default group to tavern if no default group is found 2015-07-24 17:30:40 -05:00
Blade Barringer fe2fb6deba Remove out of context comment 2015-07-24 17:30:40 -05:00
Blade Barringer f8e2e74336 Move getChallenges private method to bottom of file 2015-07-24 17:30:39 -05:00
Blade Barringer 061e6dbfa5 Add test for shouldShow function 2015-07-24 17:30:39 -05:00
Blade Barringer 26b3ab1f9a Add pending tests 2015-07-24 17:30:39 -05:00
Blade Barringer 59e19d98ca Remove misplaced challenge spec 2015-07-24 17:30:38 -05:00
Blade Barringer bcb128f4b6 Adjust wording for tavern challenge popover 2015-07-24 17:30:38 -05:00
Blade Barringer 791e2f0c16 Add method to get user balance in gems 2015-07-24 17:30:38 -05:00
TheHollidayInn 061e381abf Updated broken test to mimic other save test 2015-07-24 17:30:37 -05:00
TheHollidayInn 79101f5eb8 Added and fixed hasEnoughGems test 2015-07-24 17:30:37 -05:00
TheHollidayInn ef9dfac087 Create new function to check for enough gems, added @crookedneighbor 's tests, and added tests to check for enoughGems when user creates a habitrpg challenge 2015-07-24 17:30:37 -05:00
TheHollidayInn 53c21b07a3 Reset enough gems variable if user selects group other than habitrpg 2015-07-24 17:30:36 -05:00
TheHollidayInn fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -05:00
Sabe Jones 63a8bf63cb Merge pull request #5664 from HabitRPG/sabrecat/death-modal 
Kinder, gentler death
 2015-07-24 14:36:33 -07:00
Sabe Jones 3adb315184 feat(death): Release candidate 
Version to push live for end user feedback. (Pardon the merge conflict garbage included in prior commit; rerunning spritesmith sorted it out!)
 2015-07-24 16:24:14 -05:00
Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-07-24 16:11:51 -05:00
Blade Barringer 4c316cab72 Merge pull request #5591 from crookedneighbor/analytics-service-server-side 
Analytics service - server side
 2015-07-24 15:28:24 -05:00
Blade Barringer fca6f91f13 Merge branch 'develop' into analytics-service-server-side 2015-07-24 15:19:31 -05:00
Sabe Jones dc26e1680c Merge pull request #5661 from HabitRPG/sabrecat/mystery 
July 2015 subscriber goodies
 2015-07-24 12:29:07 -07:00