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

172 Commits

Author SHA1 Message Date
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 695b00b6bb chore(i18n): update locales 2015-03-26 17:14:28 -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
Sabe Jones 4f89f68797 fix(mounts): Eggy eggy basket 2015-03-25 22:10:51 -05:00
Sabe Jones 77cc05a668 fix(pets): Eggy eggy feed 2015-03-25 22:01:42 -05:00
Sabe Jones 354872decb feat(March): Eggy eggy cont'd 2015-03-25 20:46:27 -05:00
Sabe Jones b24dbe9b86 feat(March): Eggy eggy mystery 2015-03-25 19:53:07 -05:00
Matteo Pagliazzi 488cd8852b move invites to quest to batch mode 2015-03-25 18:11:21 +01:00
Matteo Pagliazzi 6e4818cf62 chore(i18n): update locales 2015-03-25 16:53:56 +01:00
Alys e7c0c370ee Merge pull request #4909 from TheHollidayInn/notify-user-empty-task 
Added tooltip for when a task is empty
 2015-03-25 17:59:20 +10: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
Tyler Renelle 10ce0a622b fix(tour): updated tour steps copy 2015-03-24 18:07:40 -06:00
Tyler Renelle 560d51b2e2 feat(tour): esc force closes, but puts justin head in toolbar. clicking 
justin head brings tour back.
 2015-03-24 15:41:44 -06:00
Matteo Pagliazzi 4c3ad2f705 chore(i18n): update locales 2015-03-24 22:09:48 +01:00
kholliday e5cd319ef5 Changed empty task messageand added style. 2015-03-23 20:18:14 -05:00
kholliday 9a157eea8c Added tooltip for when a task is empty 2015-03-23 19:36:37 -05:00
Alice Harris 160b19eb70 remove growl notification about party settings saved after changing party order (not needed now that avatars in head are resorted immediately) 2015-03-22 17:50:22 +10:00
Matteo Pagliazzi b756e8e462 chore(i18n): update locales 2015-03-21 11:07:13 +01:00
Sabe Jones 58db06c515 chore(grunt): Compile 2015-03-20 15:53:42 -05:00
Sabe Jones f065feb6cb fix(mouse): Missing ears 2015-03-20 15:50:22 -05:00
Sabe Jones ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00
Sabe Jones e2b1083088 fix(spring): Tweaks 2015-03-20 15:19:37 -05:00
Sabe Jones f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Matteo Pagliazzi fa2c44a9c7 chore(i18n): update locales 2015-03-20 17:13:53 +01:00
Sabe Jones 7065b400bc feat(surveys): Close out survey 2015-03-19 21:44:42 -05:00
Tyler Renelle 1e8265a9f1 feat(tour): add the other tour entries @lemoness 2015-03-19 15:53:12 -06:00
Alys 5198050cd2 Merge pull request #4863 from rdhammond/InstantPartySource 
Instant party source
 2015-03-20 06:46:38 +10:00
Tyler Renelle 152853a877 feat(tour): update habits step wording @lemoness 2015-03-19 14:28:05 -06:00
Matteo Pagliazzi 4c3e7f897e chore(i18n): update locales 2015-03-19 20:21:04 +01:00
Tyler Renelle 84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Alice Harris c880c525b4 add missing closing li and ul tag, remove excess b tags to make life easier for translators 2015-03-20 00:27:54 +10:00
Matteo Pagliazzi f243617ccf chore(i18n): update locales 2015-03-18 20:01:29 +01:00
Matteo Pagliazzi 0be58eb403 fix(i18n): remove empty strings as they break transifex 2015-03-18 19:57:00 +01:00
Matteo Pagliazzi 75d1a766e5 chore(i18n): update locales 2015-03-18 19:37:26 +01:00
Matteo Pagliazzi 9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi 0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
Matteo Pagliazzi 6d163ecb5d chore(i18n): update locales 2015-03-18 12:13:36 +01:00
Alice Harris 4868a6facb replace non-ascii punctuation with ascii versions (... and ' and -) 2015-03-18 19:30:00 +10: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
Sabe Jones 607286afa5 fix(quest): Typo 2015-03-17 21:59:08 -05:00
Sabe Jones 4c5f4377ff fix(quests): Alternate unlock strings 2015-03-17 21:48:22 -05:00
Sabe Jones b118d45bb3 fix(string): Missing comma 2015-03-17 21:28:50 -05:00
Sabe Jones 4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Alice Harris fcc0b67426 updated survey badge message (Leslie made a trello card to close the survey on the 19th) 2015-03-17 14:03:25 +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