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

10185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Blade Barringer 4ea5e0c71a Update newGroup spec helper 2015-07-24 14:03:44 -05:00
Blade Barringer f6bc929ddd Refacor how spec factory overrides works 2015-07-24 11:38:52 -05:00
Sabe Jones 65c2f5c9d5 fix(death): Gentler wording 2015-07-23 17:08:00 -05:00
Sabe Jones c8982b3513 fix(analytics): Track intro tour steps 1-2 2015-07-23 15:07:37 -05:00
Sabe Jones d32d05e873 feat(mystery): July 2015 goodies 
Also makes the mystery box opening notification translatable and adds item graphics to it.
 2015-07-23 12:05:13 -05:00
Blade Barringer bfd56b35e1 Revert armoire counting code back to old system 
@TODO: work out why it's hpapening and unpend test for new system
 2015-07-23 08:43:08 -05:00
Alys c3e2b92546 add all the files I forgot to add for https://github.com/HabitRPG/habitrpg/commit/02cccb01ef1ade15b4eba816148314726e2efb30 (blank placeholder image for collection quests, partial fix for #4936) 2015-07-23 13:58:38 +10:00
Blade Barringer 36a082f4ef chore(i18n): update locales 2015-07-22 21:51:17 -05:00
Blade Barringer d8434a5512 chore(i18n): update locales 2015-07-22 21:24:10 -05:00
Blade Barringer 8a363efc43 Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel 2015-07-22 17:59:50 -05:00
Blade Barringer f876988cb9 Merge pull request #5642 from crookedneighbor/refactor_member_modal_and_stats_page 
Refactor member modal and stats page
 2015-07-22 17:46:57 -05:00
Blade Barringer c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Blade Barringer 7b9102c88c Move gear counting to counting script 2015-07-22 17:37:35 -05:00
Blade Barringer f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
Sabe Jones 0f1c92184c chore(news): iOS update Bailey 2015-07-22 15:42:35 -05:00
TheHollidayInn c61eccaaba Removed if statements and fixed style issues 2015-07-22 15:38:17 -05:00
Sabe Jones 7d622792a8 Merge pull request #5635 from HabitRPG/sabrecat/quests-page 
Improve quest drop notification
 2015-07-22 10:28:16 -07:00