Commit graph

  • 176b39a1a0 fix(typo) Matteo Pagliazzi 2014-08-03 12:55:17 +0200
  • a30ee4368a fix(notifications): fix drop notifications Matteo Pagliazzi 2014-08-03 12:28:29 +0200
  • 9d2723b418 fix(newMessages): ad migration Matteo Pagliazzi 2014-08-03 10:53:48 +0200
  • e340d584cd split hairstyles into Base (free) and Set 1 (gems) https://github.com/HabitRPG/habitrpg/issues/1529 Alice Harris 2014-08-03 15:56:44 +1000
  • 24833de3a7 Merge pull request #3834 from Alys/develop Alice Harris 2014-08-03 14:19:05 +1000
  • 2c013ca73a de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529 Alice Harris 2014-08-03 13:20:51 +1000
  • a44272c7c8 Merge pull request #268 from Alys/defaultAvatar Alice Harris 2014-08-03 08:22:35 +1000
  • 09dd0663e7 rename Head section, add title for new Hairstyle subsection https://github.com/HabitRPG/habitrpg/issues/1529 Jeremy Lee 2014-08-03 08:16:38 +1000
  • 7e059fe496 Fetch each member to get correct data Joby Walker 2014-08-02 14:20:42 -0700
  • 937920c5a5 Pets are set to 5 not true. Joby Walker 2014-08-02 14:19:30 -0700
  • a8c64a4524 Use explicit get for 'quest' Joby Walker 2014-08-02 14:18:39 -0700
  • d1860c3ffc chore(i18n): update locales Matteo Pagliazzi 2014-08-02 10:29:09 +0200
  • 8dafc72b7d Merge pull request #249 from Alys/questWarning Alice Harris 2014-08-02 13:10:08 +1000
  • 46dbb0b78a Merge pull request #3799 from Alys/avatarNameContribColour Alice Harris 2014-08-02 13:08:20 +1000
  • 2c70c25028 Merge pull request #3792 from Alys/showMoreBackground Alice Harris 2014-08-02 13:06:07 +1000
  • bb9899b7ce Merge pull request #266 from Alys/modsColours Alice Harris 2014-08-02 12:57:39 +1000
  • 140c75760a Merge pull request #3825 from Alys/modsColours Alice Harris 2014-08-02 12:56:08 +1000
  • d574e99ef4 Merge pull request #3826 from Alys/playerTiers Alice Harris 2014-08-02 12:55:03 +1000
  • ba42b3e805 Merge pull request #267 from Alys/playerTiers Alice Harris 2014-08-02 12:54:18 +1000
  • 26741773c9 split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users) Jeremy Lee 2014-08-02 10:46:16 +1000
  • ddb669834b add texts for new mdoerator/guardian level, and related stuff Jeremy Lee 2014-08-02 10:45:16 +1000
  • 1acbde6e3a remove redundant color message now that correct styling is on moderator names above Tavern chat Jeremy Lee 2014-08-02 07:29:16 +1000
  • 79bd088589 add correct styling to moderator names in message above Tavern chat Jeremy Lee 2014-08-02 07:28:29 +1000
  • 42dc537f6d Merge pull request #258 from jobywalker/candycane-perception Tyler Renelle 2014-08-01 15:26:23 -0600
  • 2a28b208d9 Merge pull request #254 from Alys/chillingFrostDailiesHurt Alice Harris 2014-08-02 07:04:45 +1000
  • 0da3654bf5 Merge pull request #264 from jobywalker/fix-freeRebirth-assignment deilann 2014-08-01 13:28:11 -0700
  • aa4bd944c9 Fix assignment in freeRebirth test Joby Walker 2014-08-01 13:20:13 -0700
  • b3fd859cad chore(npcs): back to normal npcs Tyler Renelle 2014-08-01 14:06:41 -0600
  • 326952538d Merge pull request #263 from jobywalker/fix-no-value-quest-ok deilann 2014-08-01 13:00:58 -0700
  • a590969078 Merge pull request #262 from jobywalker/fix-freeRebirth deilann 2014-08-01 13:00:39 -0700
  • 04f1459cca bailey(dilatory): forgot announcement on drag'on defeat Tyler Renelle 2014-08-01 13:44:43 -0600
  • a2d851db23 Fix: OK for unpurchaseable quest to have no value Joby Walker 2014-08-01 10:19:19 -0700
  • 24e0f705b2 Fix freeRebirth flag Joby Walker 2014-08-01 01:35:07 -0700
  • 4d6562b86b Merge pull request #261 from Alys/modsColours Alice Harris 2014-08-01 18:16:39 +1000
  • 095472fb92 change description of colors used for moderators and staff Alice Harris 2014-08-01 18:02:19 +1000
  • 3d440fac8f Merge pull request #260 from jobywalker/fix-user-reset Tyler Renelle 2014-07-31 22:27:46 -0600
  • 6a4897b27f Fix User Reset Joby Walker 2014-07-31 20:56:00 -0700
  • 050b6fc1f4 chore(spritesmith): bump sheets from 4 to 6, fixes for android 2.3 - may for other users too Tyler Renelle 2014-07-31 20:27:04 -0600
  • 0bd3743392 feat(box): Tyler Renelle 2014-07-31 17:39:19 -0600
  • 38f64c71c2 bailey(august): Tyler Renelle 2014-07-31 17:37:18 -0600
  • 745d330ce7 fix(bower): pin angular @beta-11, that ~ was upgrading to beta-17 which doesn't play well with jQuery right now Tyler Renelle 2014-07-31 16:28:40 -0600
  • 0b01ff2201 Don't display chart if history is empty. Collin Styles 2014-07-31 14:56:52 -0700
  • ec39634458 fix(spritesmith): split spritesheets in to multiple files to remove the blurry iOS issue. Fixes https://github.com/HabitRPG/habitrpg/issues/2510, see http://goo.gl/IwxdI4 . Note, this commit isn't smart/dynamic, there's commented-out code for handling dynamic splitting, but I couldn't get it working - static 4 sheets for now Tyler Renelle 2014-07-31 15:44:22 -0600
  • 2d2c2d27a1 Change newPassSent to reflect 'Reset Password' not failing on non-existent email 3onyc 2014-07-31 22:25:55 +0200
  • 28838d6a1c Candy Cane text boosts Perception not Strength Joby Walker 2014-07-31 13:11:35 -0700
  • e10c04c9bc feat(contribs): start for #3801, update to new badge colors Tyler Renelle 2014-07-31 12:09:11 -0600
  • 072881f986 Merge pull request #3793 from Alys/backgroundOrder Tyler Renelle 2014-07-30 23:08:12 -0600
  • 0811f3ddc8 Merge branch 'lemoness-develop' into develop Tyler Renelle 2014-07-30 17:18:03 -0600
  • 9efda1d955 fix(bailey): small tweaks to 7/31 (spacing, remove project files) Tyler Renelle 2014-07-30 17:15:51 -0600
  • 983aaf9682 7/31 Bailey Announcement Lemoness 2014-07-30 16:08:55 -0700
  • 4f5b450b38 Bailey reminder - 7/31 Lemoness 2014-07-30 15:55:17 -0700
  • da87767c48 grunt(store-icons): re: #257 (before I forget) Tyler Renelle 2014-07-29 15:31:28 -0600
  • 8381ebb5e5 Merge pull request #257 from lemoness/develop Tyler Renelle 2014-07-29 15:26:46 -0600
  • 92396ca1b9 Summer Outfit Icons Lemoness 2014-07-29 14:23:01 -0700
  • 603da697c1 Merge pull request #256 from lemoness/develop Tyler Renelle 2014-07-29 14:40:39 -0600
  • 982b29b443 Snowball and June Item Icon Lemoness 2014-07-29 13:36:24 -0700
  • a2df27d7f2 fix(forgot-password): allow aliases (x+y@z.com) in email lookup, fixes #3805 Tyler Renelle 2014-07-29 12:58:31 -0600
  • c8f45b8be6 explains that Chilling Frost does not stop dailies from hurting you Alice Harris 2014-07-29 13:01:17 +1000
  • a87b651caf apply contributor tier color to avatar name Alice Harris 2014-07-29 08:53:23 +1000
  • 2fb4d2652d Merge pull request #253 from lemoness/develop Tyler Renelle 2014-07-28 16:06:04 -0600
  • dfacae9b3f gaymerx helm icon 2x Lemoness 2014-07-28 15:04:49 -0700
  • 8f6673a19b Merge pull request #252 from lemoness/develop Tyler Renelle 2014-07-28 16:02:58 -0600
  • 0711b2ee85 test - icon gaymerx armor Lemoness 2014-07-28 15:00:00 -0700
  • fc910d70a8 Merge pull request #3752 from crookedneighbor/develop Tyler Renelle 2014-07-28 13:12:56 -0600
  • 4f5f479dc8 chore(i18n): update locales Matteo Pagliazzi 2014-07-28 16:03:15 +0200
  • 6b8f2b10e1 Merge pull request #3789 from Alys/vagrantChanges James Hsiao 2014-07-28 09:54:53 -0400
  • d7351932aa Merge branch 'develop' of git://github.com/HabitRPG/habitrpg into develop Blade Barringer 2014-07-27 19:56:09 -0500
  • a7502e10ea display backgrounds in reverse chronological order (most recent at top) Alice Harris 2014-07-27 14:54:17 +1000
  • 1e797a0b05 show more avatar background (remove Lvl, hide avatar name) Alice Harris 2014-07-27 08:41:33 +1000
  • 12a9adcfcd make experimental changes to try to make vagrant install work better vagrant 2014-07-24 08:34:27 +0000
  • a4ae9332bb feat(block-user): show "blocked" status in an alert, log the user out Tyler Renelle 2014-07-25 12:13:26 -0600
  • 6e29facb98 feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness Tyler Renelle 2014-07-23 14:54:32 -0600
  • 75eb860650 feat(mystery): july mystery items Tyler Renelle 2014-07-21 14:21:07 -0600
  • 1808dea9ec bailey(mystery): july mystery item Tyler Renelle 2014-07-21 14:20:22 -0600
  • 5c309444e0 fix(coupons): fix to limit Tyler Renelle 2014-07-22 18:35:55 -0600
  • fe04f37118 Fixes #3260: Buttonless habits full width Ben Lind 2014-07-22 16:55:50 -0400
  • ca31d46e0e tmp(coupons): just export c._id to csv Tyler Renelle 2014-07-21 22:39:36 -0600
  • 439828d2b1 feat(coupons): update wording @veeeeeee Tyler Renelle 2014-07-21 22:27:25 -0600
  • 9d5ac44e6a change quest warning to match current behaviour Alice Harris 2014-07-22 11:26:00 +1000
  • bf29a19d33 chore(errors): allow disabling error emails (getting too many VersionError, which maxes our limit and people can't use "Forgot Password" feature) Tyler Renelle 2014-07-21 19:08:16 -0600
  • dbd8fddf9d Merge pull request #3769 from thedavemarshall/fix_ci_karma_deps Tyler Renelle 2014-07-21 14:57:48 -0600
  • a1f2375b9d feat(subscription): disable "update card" for paypal subscribers Tyler Renelle 2014-07-21 14:55:36 -0600
  • 3bbb4e6966 Exactly request karma-mocha 0.1.3, cause tilda was loading 0.1.6 on CI David Marshall 2014-07-21 13:52:03 -0700
  • dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop Tyler Renelle 2014-07-21 14:48:17 -0600
  • 1361b71b6c Pin karma-mocha to 0.1.3, fixes CI David Marshall 2014-07-21 13:40:05 -0700
  • 5a03c6f7ce Merge pull request #248 from Omnomnobot/patch-2 Tyler Renelle 2014-07-21 13:07:08 -0600
  • 695832f62c Fixed a typo (chose --> choose) Omnomnobot 2014-07-21 16:08:17 +0200
  • 5cc4c60329 Edit stripe cc subscriptions David Marshall 2014-07-14 01:56:42 -0700
  • e0764e02a6 Merge pull request #3760 from Skyyrunner/develop deilann 2014-07-20 02:21:02 -0700
  • 3ed977dad6 Fixed #3756? Skyrunner 2014-07-20 16:54:18 +0900
  • 490b0d1b1b Corrected gap in filters style Blade Barringer 2014-07-19 18:19:50 -0500
  • 9c50eb8b06 Merge pull request #226 from 3onyc/feature/username-change Tyler Renelle 2014-07-19 16:48:24 -0600
  • acc874c60d Merge pull request #3597 from 3onyc/feature/username-change Tyler Renelle 2014-07-19 16:48:20 -0600
  • 327a337a26 Merge pull request #234 from HabitRPG/sabe/crits Tyler Renelle 2014-07-18 16:59:02 -0600
  • c3eb23612d Merge pull request #3754 from vIiRuS/patch-3 Tyler Renelle 2014-07-18 09:37:36 -0600
  • a4b4063b8d remove beta from api call examples Phillip Thelen 2014-07-18 11:58:25 +0200
  • b946338184 feat(dilatory): add dilatory achievement Tyler Renelle 2014-07-17 18:37:09 -0600
  • c96ef70428 feat(dilatory): add dilatory achievement Tyler Renelle 2014-07-17 18:36:50 -0600
  • 34236536df feat(admin): allow admins to update user's items (restoring lost items, granting quest scrolls, etc). @deilann :) Tyler Renelle 2014-07-17 14:09:39 -0600
  • f1db2bf1d5 refactor(dotSet): move dotSet & dotGet to exports Tyler Renelle 2014-07-17 12:55:45 -0600