Commit graph

  • e1eaefa943 Fix #4296 (Subscription "Update Card" message is cut off) breiste 2014-12-24 00:14:08 +0100
  • e33101b762 Fix #4296 (Subscription "Update Card" message is cut off) Steffen Breiler 2014-12-24 00:06:17 +0100
  • 635ebf626b fix(flag-email): correctly format date Matteo Pagliazzi 2014-12-23 18:54:56 +0100
  • c55ebf5c07 Merge pull request #4402 from HabitRPG/add-flag-to-chat Matteo Pagliazzi 2014-12-23 18:36:23 +0100
  • a7b648102b Merge pull request #407 from HabitRPG/add-flag-to-chat Matteo Pagliazzi 2014-12-23 18:35:55 +0100
  • 8e0358f7c7 Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat Blade Barringer 2014-12-23 10:08:01 -0600
  • 84db289957 Merge branch 'develop' into add-flag-to-chat Blade Barringer 2014-12-23 10:07:42 -0600
  • 0dfa770fe4 update winter 2013 to winter 2014 to satisfy new naming conventions thehindenburg 2014-12-22 21:13:59 -0800
  • 42cb93c673 Add variables for medium-length date display Verabird 2014-12-22 22:23:11 -0500
  • d34b116732 update formatting for gear style guidelines Alice Harris 2014-12-23 06:43:05 +1000
  • d6354007f1 update formatting for gear style guidelines Alice Harris 2014-12-23 06:42:10 +1000
  • 9d7bf26988 update formatting for gear style guidelines Alice Harris 2014-12-23 06:38:21 +1000
  • 36a552b4a3 update formatting for gear style guidelines Alice Harris 2014-12-23 06:34:57 +1000
  • e30ff2eebb create style guide for gear/equipment descriptions based on ShilohT's suggestions in https://github.com/HabitRPG/habitrpg-shared/pull/372 Alice Harris 2014-12-23 06:28:34 +1000
  • c4143c7805 added variable for date display and checking line ending issue Verabird 2014-12-22 15:19:53 -0500
  • 4c785e8459 fix(flag-chat): correct url for tavern flags Matteo Pagliazzi 2014-12-22 21:09:27 +0100
  • 6f410f59ce Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat Blade Barringer 2014-12-22 13:28:01 -0600
  • 37b9e5012a Added links to user modals Blade Barringer 2014-12-22 13:22:42 -0600
  • d079ebbee9 chore(i18n): update locales Matteo Pagliazzi 2014-12-22 20:09:45 +0100
  • 2d4c5e7b98 feat(flag-chat): fetch author and add some group variables Matteo Pagliazzi 2014-12-22 20:02:22 +0100
  • 7aff280a71 feat(flag-chat): add some variables Matteo Pagliazzi 2014-12-22 19:56:11 +0100
  • 652ce10e22 feat(flag-chat): start implemnting email Matteo Pagliazzi 2014-12-22 19:48:03 +0100
  • 07fbcbcb08 Revert "fix(phantom): downgrade to node 0.10.22 due to CERT error, see" Sabe Jones 2014-12-21 20:53:03 -0600
  • 883d472b94 Merge pull request #4395 from SabreCat/Bailey Sabe Jones 2014-12-21 15:47:51 -0600
  • be62f4bb7f Merge pull request #403 from SabreCat/Bailey Sabe Jones 2014-12-21 15:47:36 -0600
  • eb0d19fa29 chore(grunt): grunt full Sabe Jones 2014-12-21 15:45:13 -0600
  • 833ff90a59 chore(news): Wonderland Bailey 1 Sabe Jones 2014-12-21 15:41:32 -0600
  • 0ec9e5b1e1 feat(news): Promo images Sabe Jones 2014-12-21 15:40:07 -0600
  • ef02e059c7 chore(grunt): grunt full Sabe Jones 2014-12-21 15:24:55 -0600
  • 5979aa3b9a Merge pull request #4394 from SabreCat/hair Sabe Jones 2014-12-21 15:17:47 -0600
  • 649e207769 Merge pull request #402 from SabreCat/winter2015/hair Sabe Jones 2014-12-21 15:16:10 -0600
  • 1ff25dfd5b Merge pull request #401 from SabreCat/winter2015/gear Sabe Jones 2014-12-21 15:09:51 -0600
  • 784850f934 Merge pull request #400 from SabreCat/winter2015/npcs Sabe Jones 2014-12-21 15:08:46 -0600
  • bb89a10356 feat(event): Wintery Hair Colors Sabe Jones 2014-12-21 13:58:47 -0600
  • d0a97fb20f feat(event): Wintery Hair Colors Sabe Jones 2014-12-21 13:55:23 -0600
  • e62cb74ad0 fix(event): head, not helm Sabe Jones 2014-12-21 12:43:44 -0600
  • 8ec9f79188 feat(event): Winter Wonderland 2015 gear Sabe Jones 2014-12-21 12:37:37 -0600
  • 8d645bcafd chore(grunt): grunt full Sabe Jones 2014-12-21 10:57:02 -0600
  • c8aadf296e feat(event): Winter NPCs Sabe Jones 2014-12-21 10:44:08 -0600
  • 492260d74a refactor(coupons): coupons cleanup using async.auto Tyler Renelle 2014-12-20 17:58:00 -0700
  • b2bbfdfe09 Merge pull request #4392 from crookedneighbor/fix-moment-in-tests Matteo Pagliazzi 2014-12-20 17:15:19 +0100
  • 8b3c6f94bf fix(loggly): send more infos about cron errors Matteo Pagliazzi 2014-12-20 16:20:40 +0100
  • 4a7dcfc2bb merge changes for smash (Brutal Smash) from brandonjreid's PR https://github.com/HabitRPG/habitrpg-shared/pull/331 Alice Harris 2014-12-20 21:13:43 +1000
  • e9c8f66562 merge backStab change by brandonjreid from https://github.com/HabitRPG/habitrpg-shared/pull/331 Alice Harris 2014-12-20 16:03:37 +1000
  • fbc5a258f6 stop backStab and fireball (Burst of Flames) changing the task value Alice Harris 2014-12-20 13:35:10 +1000
  • 95951a4706 Updated moment calls to use number, period to fix the deprecation error Blade Barringer 2014-12-19 19:41:22 -0600
  • 44a7448a96 compiled dist/habitrpg-shared.js Alice Harris 2014-12-20 11:18:13 +1000
  • 9f77819d94 add pickpocket change from PR by brandonjreid: https://github.com/HabitRPG/habitrpg-shared/pull/331/files#diff-652dbbf3d459e90a3de1a122c063bb6bL502 Alice Harris 2014-12-20 11:07:47 +1000
  • afef118200 Merge toolsOfTrade changes from 'ShilohT-skillbalancing' into rebalancing-2014-12 Alice Harris 2014-12-20 09:46:30 +1000
  • 621615a6f9 Merge fireball (Burst of Flames) changes from 'ShilohT-skillbalancing' into rebalancing-2014-12 Alice Harris 2014-12-20 09:36:49 +1000
  • 6961e3608a Merge branch 'skillbalancing' of https://github.com/ShilohT/habitrpg-shared into ShilohT-skillbalancing Alice Harris 2014-12-20 09:29:52 +1000
  • 95a6aa5586 Merge branch 'rebalancing-2014-12' of https://github.com/HabitRPG/habitrpg-shared into rebalancing-2014-12 Alice Harris 2014-12-20 08:48:21 +1000
  • 739d8885a3 fix(emails): remove unused variable Matteo Pagliazzi 2014-12-19 19:59:12 +0100
  • 7c0b25d58a pass base_url to emails as variable Matteo Pagliazzi 2014-12-19 19:46:05 +0100
  • be37e88dc3 Corrected example for send gift to be correct Blade Barringer 2014-12-19 11:05:24 -0600
  • d358236f42 Corrected example for show private message so it would result in a valid call Blade Barringer 2014-12-19 10:44:55 -0600
  • a078636416 Fixed get members so it can be used on static/api page Blade Barringer 2014-12-19 10:43:15 -0600
  • 18288ed016 Merge pull request #4390 from thehindenburg/seasonShop Blade Barringer 2014-12-19 10:03:49 -0600
  • 1675bb26b2 change link in gala page to gala wiki thehindenburg 2014-12-19 07:47:28 -0800
  • 9406b3cf70 Removed unnecessary console.log Blade Barringer 2014-12-18 22:36:52 -0600
  • eeff8a80d6 Brought in groups.json from original branch Blade Barringer 2014-12-18 22:01:52 -0600
  • be831d864a Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat Blade Barringer 2014-12-18 21:58:06 -0600
  • 7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat Blade Barringer 2014-12-18 21:55:50 -0600
  • 486d8a9bbf chore(i18n): update locales Matteo Pagliazzi 2014-12-18 22:56:34 +0100
  • 1fe3664731 ran grunt to compile coffeescript Blade Barringer 2014-12-18 13:59:52 -0600
  • e1d44cc54f HabitRPG/habitrpg#3260 Buttonless habit full width Ben Lind 2014-07-22 16:57:38 -0400
  • 7db273c0be Merge pull request #3773 from benlind/buttonless_habits_full_space Blade Barringer 2014-12-18 13:52:01 -0600
  • 4f5e813fcf Merge pull request #396 from jamesleonis/develop Alice Harris 2014-12-18 19:48:46 +1000
  • c308f6cf9f Incorrect grammar in Vice 2 quest notes James Leonis 2014-12-18 01:01:18 -0800
  • dc18569e78 fix(phantom): downgrade to node 0.10.22 due to CERT error, see https://github.com/Medium/phantomjs/issues/262 (cc @sabrecat) Tyler Renelle 2014-12-17 22:07:49 -0700
  • 30e5e2096a grunt full Tyler Renelle 2014-12-17 21:53:27 -0700
  • 09ba5384f8 Merge pull request #395 from SabreCat/seasonal Sabe Jones 2014-12-17 18:38:32 -0600
  • c7da56cc00 Merge pull request #4387 from SabreCat/seasonal Sabe Jones 2014-12-17 18:38:16 -0600
  • 8ff0a4a4a4 fix(seasonal): Leslie link Sabe Jones 2014-12-17 18:27:37 -0600
  • 6e77392e7a fix(seasonal): Leslie link Sabe Jones 2014-12-17 18:26:52 -0600
  • cbfd043b2c Merge pull request #394 from SabreCat/seasonal Sabe Jones 2014-12-16 21:52:28 -0600
  • eadedd5897 Merge pull request #4383 from SabreCat/seasonal Sabe Jones 2014-12-16 21:51:02 -0600
  • dbe608bc3a fix(news): correct link and awkward image Sabe Jones 2014-12-16 20:24:04 -0600
  • 58957118c0 chore(news): Bailey for Seasonal Shop Sabe Jones 2014-12-16 20:18:55 -0600
  • d91d9e1eb3 refactor(facebook): use async.auto to collect multiple vars, cleaner than waterfall Tyler Renelle 2014-12-16 16:30:51 -0700
  • 2822ce233f fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231 Tyler Renelle 2014-12-16 14:17:38 -0700
  • 059f719461 Merge pull request #231 from wc8/patch-1 Tyler Renelle 2014-12-16 14:16:26 -0700
  • 709fb2b706 Revert "refactor(iap): use env var for google IAP". orders are being left in "Chargeable - Delivered" for some reason. Tyler Renelle 2014-12-16 13:05:39 -0700
  • 43961a5ab9 refactor(iap): use env var for google IAP, intead of key file. See cb31043281 cc @negue Tyler Renelle 2014-12-16 11:43:58 -0700
  • d56eb1eeeb Added last guild link, corrected hall links Blade Barringer 2014-12-14 20:10:42 -0600
  • 63c2248b38 Corrected guild links Blade Barringer 2014-12-14 20:07:46 -0600
  • 9cdbca8c2b Reverted routing for groups back Blade Barringer 2014-12-14 20:05:01 -0600
  • d1b1a866ac Fixed when routing. Closes #4371 Blade Barringer 2014-12-14 19:01:52 -0600
  • 071ac02ec2 chore(git): Resolve merge conflict Sabe Jones 2014-12-14 14:55:37 -0600
  • a9fa8ed038 Merge pull request #4382 from SabreCat/timetravel Blade Barringer 2014-12-14 14:34:43 -0600
  • 19930226c7 chore(grunt): grunt Sabe Jones 2014-12-14 14:24:37 -0600
  • 9f46e14cd6 fix(seasonal): missing bang Sabe Jones 2014-12-14 14:18:57 -0600
  • 867f50b514 fix(seasonal): Add menu item Sabe Jones 2014-12-14 14:12:20 -0600
  • 8cd1ea48db fix(I18N): Remove more hardcoded text Sabe Jones 2014-12-14 14:10:39 -0600
  • 6dcbd329a5 fix(seasonal): Typo in string resource Sabe Jones 2014-12-14 14:05:43 -0600
  • 7988dfcf82 fix(seasonal): Corrections for Shop Sabe Jones 2014-12-14 14:01:25 -0600
  • 29f693cd24 fix(I18N): Remove hardcoded text Sabe Jones 2014-12-14 13:55:40 -0600
  • 506c396baf fix(I18N): Translate TT in menu Sabe Jones 2014-12-14 13:53:00 -0600
  • a98a685971 feat(seasonal): Seasonal Shop Sabe Jones 2014-12-14 13:37:32 -0600
  • c7ee171ee4 feat(seasonal): Seasonal shop Sabe Jones 2014-12-14 13:33:10 -0600