Commit graph

66 commits

Author SHA1 Message Date
Blade Barringer
cad47dc2c0 Fixes #5123 2015-05-02 09:28:55 -05:00
Sabe Jones
74877f0653 chore(grunt): compile sprites 2015-05-01 19:22:09 -05:00
Sabe Jones
286eed95a2 chore(grunt): compile sprites 2015-04-21 21:34:39 -05:00
Sabe Jones
55324e8fa5 chore(grunt): compile sprites 2015-04-15 18:56:51 -05:00
Blade Barringer
c19ec1387a chore(grunt): compile sprites 2015-04-14 22:18:37 -05:00
TheHollidayInn
ab2390e8c9 Updated fotify potion art 2015-04-09 09:15:32 -05:00
Blade Barringer
a24383c1a2 Removed lingering shared file 2015-04-08 13:58:45 -05:00
Blade Barringer
0f9ce179df Merge branch 'develop' into Alys-ignore-compiled-js-2015-04-04
Conflicts:
	common/dist/scripts/habitrpg-shared.js
2015-04-08 13:57:49 -05:00
Matteo Pagliazzi
e58521f416 Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page
WIP Emails unsubscription page
2015-04-08 19:12:28 +02:00
Sabe Jones
9d3a14b734 chore(grunt): compile sprites 2015-04-07 19:08:00 -05:00
Matteo Pagliazzi
71108ee935 feat(email): WIP start implementing unsubscription page and related features 2015-04-07 14:04:03 +02:00
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
a02c957c59 ignore habitrpg-shared.js (add to .gitignore, delete from repo) 2015-04-04 13:53:36 +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
Sabe Jones
bed404cf47 chore(flowers): COMPILE FLOWERS
Required root access.
2015-03-31 19:01:04 -05:00
Sabe Jones
15c72b2ea8 chore(grunt): compile sprites 2015-03-29 16:44:50 -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
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
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
Sabe Jones
6aedfa7209 chore(grunt): compile sprites 2015-03-14 11:18:36 -05: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
9c43a7da22 chore(grunt compile:sprites) 2015-03-09 16:34:55 -05: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
6eeff5a0af Changed matt back to brown hair version 2015-02-24 13:37:14 -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
Sabe Jones
e0cbeaadc5 chore(grunt): compile sprites 2015-02-16 18:31:00 -06:00
Blade Barringer
6d26d3e053 Added original user achievement badge 2015-02-16 17:55:18 -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