Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,832 Commits 64 Branches 1,256 Tags
616a7d96500dbdff27573a855500a0dfd9c0fcdc
Commit Graph

39 Commits

Author SHA1 Message Date
Alys e134c36ca2 prevent user.stats.points from being negative e.g., after dropping level with Fix Character Values (still need to remove allocated points then) 2015-04-05 09:04:59 +10:00
Alys 8033b129ff Merge pull request #4915 from gisikw/free_100_key_to_the_kennels 
Make Key to the Kennels free for Triad Bingoers.
 2015-04-04 10:48:15 +10:00
Sabe Jones ad15351ce0 chore(grunt): compile sprites 2015-04-01 23:48:09 -05:00
Alice Harris ed0caee149 remove test code 2015-03-28 05:42:00 +10:00
Alice Harris 7a220bee47 update Egg Hunt quest completion message with new content from Leslie 2015-03-28 05:37:42 +10:00
Tyler Renelle 0638e36492 feat(analytics): new "play" variants 2015-03-27 12:52:38 -06:00
Kevin Gisi ca87a46b04 Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement 2015-03-26 18:30:56 -04:00
Kevin Gisi 334393d33b Make Key to the Kennels free for Triad Bingoers. 
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
  achievement in lieu of gems.

* Removed Gem cost on inventory page if user has achievement.

* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
  achievement.

* Removed Gem costs from buttons if user has achievement.

* Added new copy for Key to the Kennels modal that omits gem prices if the user
  has the achievement.
 2015-03-26 18:30:56 -04:00
Matteo Pagliazzi bfebf5d917 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-03-26 17:13:43 -04:00
Tyler Renelle e46789c303 feat(analytics): track cron count 2015-03-26 17:11:33 -04:00
Alys 20726e3c0f Merge pull request #4873 from gisikw/repair_broken_test_suite 
Repair Broken Test Suite - Full Passing Tests
 2015-03-26 14:49:28 +10:00
Sabe Jones 75ab7427fc chore(grunt): Eggy eggy sprites 2015-03-25 22:12:55 -05:00
Matteo Pagliazzi 488cd8852b move invites to quest to batch mode 2015-03-25 18:11:21 +01:00
Kevin Gisi f41933b7a1 Repair Broken Test Suite - Full Passing Tests 
* Repair broken e2e test introduced in 8d03cfc (copywriting change was not
  reflected in the spec)

* Updated i18n.coffee code to be more cautious (it expected the 'en' locale
  would always be available, but provides appropriate error handling as-is).

* Extended timeout duration for protractor, as registration was slightly above
  30s.

* Added karma-mocha-reporter as a dev dependency to ensure test visibility.
 2015-03-24 21:39:03 -04:00
Sabe Jones 58db06c515 chore(grunt): Compile 2015-03-20 15:53:42 -05:00
Tyler Renelle 84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Matteo Pagliazzi 9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Alice Harris 833ba9ec4a change Gully3 to Gully as requested by Gully in the Tavern and as confirmed by Lemoness 2015-03-18 19:13:39 +10:00
Alice Harris c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
Matteo Pagliazzi b0b6864f1c chore(i18n): update locales 2015-03-16 19:56:35 +01:00
Tyler Renelle 812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
Blade Barringer 9e6c268a97 chore(grunt compile:sprites) 2015-03-09 13:42:35 -05:00
Sabe Jones 27446da338 chore(grunt): compile sprites 2015-03-03 21:49:07 -06:00
Sabe Jones 3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Blade Barringer 016e359690 Fixes #4749 2015-02-24 16:58:48 -06:00
Blade Barringer 5aa4015249 Refactored pet display name changes 2015-02-22 12:12:38 -05:00
Bill Parrott 789575d6fb Merge branch 'develop' into task-difficulty-context-classes 2015-02-17 22:31:27 -06:00
Sabe Jones 87b13d5fc8 chore(grunt): compile sprites 2015-02-17 20:46:40 -06:00
Bill Parrott 9cf4d9086b be more explicit about priority value vs context class 2015-02-16 15:49:31 -06:00
Bill Parrott 812599cb77 add difficulty context class to task list items 2015-02-16 15:02:04 -06:00
Matteo Pagliazzi 34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +01:00
Blade Barringer e605acffbe Corrected paths or nodemonignore 2015-02-12 21:45:37 -06:00
Blade Barringer cb7f382a85 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
 2015-02-12 15:40:12 -06:00
Blade Barringer 51b90afb34 Compiled everything 2015-02-12 13:49:34 -06:00
Blade Barringer 9ddb5e35fb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
	common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
 2015-02-12 13:42:11 -06:00
Blade Barringer df5ff3d5a1 Downgraded coffeescript module to 1.6 2015-02-12 13:31:21 -06:00
Blade Barringer 557ccc7ec0 Added sprites build to build:prod task 2015-02-09 23:07:28 -06:00
Blade Barringer 45d1fb4c6e Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
 2015-02-09 22:18:22 -06:00
Blade Barringer c8124f28ed Set it so compiled js and sprites are not ignored 2015-02-09 16:04:25 -06:00