Commit graph

  • 76373ed816 Merge pull request #447 from HabitRPG/bailey-20150120 Blade Barringer 2015-01-20 17:06:02 -0600
  • c73fb9eb31 Added in missing p tag Blade Barringer 2015-01-20 16:44:49 -0600
  • d4ab70b174 Removed errant comma Blade Barringer 2015-01-20 16:41:36 -0600
  • e95b238041 Gave credit to badge creators Blade Barringer 2015-01-20 16:33:18 -0600
  • cc65ea1346 Lemoness removed from items she didn't work on Blade Barringer 2015-01-20 16:32:30 -0600
  • de1c0240f6 Restored changelog Blade Barringer 2015-01-20 16:22:29 -0600
  • b0bb3adf53 removed quest line text Blade Barringer 2015-01-20 16:09:43 -0600
  • 7842bbe22e Added stressbeast strike news Blade Barringer 2015-01-20 15:58:00 -0600
  • ebd5bbd19b Added new info to Bailey announcement Blade Barringer 2015-01-20 14:37:17 -0600
  • 925bfe8af4 fix(emails): parse json Matteo Pagliazzi 2015-01-20 20:59:43 +0100
  • 9d22e65e19 fix(flags-emails): allow arrays in FLAG_REPORT_EMAIL Matteo Pagliazzi 2015-01-20 18:33:49 +0100
  • 065227fa8c fix(flags-emails): allow arrays in tnxEmails Matteo Pagliazzi 2015-01-20 18:29:46 +0100
  • cb566a9679 Merge pull request #441 from negue/markdown negue 2015-01-20 17:57:23 +0100
  • cc6cb3785e Merge branch 'mountmaster' into bailey-20150120 Blade Barringer 2015-01-20 10:39:45 -0600
  • 07fec4a205 Merge branch 'mountmaster' into bailey-20150120 Blade Barringer 2015-01-20 10:30:40 -0600
  • f0d4135d54 Merge pull request #4546 from SabreCat/stressbeast Sabe Jones 2015-01-19 23:17:32 -0600
  • 6a6a4e5924 Merge pull request #446 from SabreCat/stressbeast Sabe Jones 2015-01-19 23:17:26 -0600
  • da2d59734c fix(world-boss): simplify desperation stats Sabe Jones 2015-01-19 23:00:00 -0600
  • 0137dd7209 fix(world-boss): Need markModified Sabe Jones 2015-01-19 22:36:10 -0600
  • 0a0a3f78cf fix(world-boss): Desperation logic Sabe Jones 2015-01-19 22:14:09 -0600
  • 3189ab92af Wrote error message for when trying to send gems to self from balance Blade Barringer 2015-01-19 22:13:21 -0600
  • 3ee965d8d2 feat(world-boss): Desperation move Sabe Jones 2015-01-19 21:48:58 -0600
  • 7925935ff5 feat(world-boss): Desperation move Sabe Jones 2015-01-19 21:47:27 -0600
  • 42e1020c60 Added back in showCompleted=false to display tags Blade Barringer 2015-01-19 18:50:54 -0600
  • 899de5fc25 grunt Tyler Renelle 2015-01-19 16:14:21 -0700
  • c3c144223a Merge branch 'develop' into mountmaster Blade Barringer 2015-01-19 14:47:17 -0600
  • b26d5ee732 Merge pull request #4540 from crookedneighbor/add-ngsanitize Matteo Pagliazzi 2015-01-19 21:37:43 +0100
  • 753cac236b Added ng-sanitize Blade Barringer 2015-01-19 14:17:43 -0600
  • c7ccc5c21d Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 Alice Harris 2015-01-20 06:01:09 +1000
  • 3a95db0b0d Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop benmanley 2015-01-19 17:06:27 +0000
  • f93e0ba6b9 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop benmanley 2015-01-19 17:06:19 +0000
  • e40ea3032a chore(news): Stress Strike 2 Bailey Sabe Jones 2015-01-19 10:51:07 -0600
  • 2c88be85cf fix(tasks): vertically align habit buttons benmanley 2015-01-19 16:41:01 +0000
  • fa8ead20c4 Merge pull request #4208 from Alys/todos-dated-tab-2014-11-01 Alice Harris 2015-01-19 18:16:22 +1000
  • 64cd6eac25 Merge pull request #350 from Alys/todos-dated-tab-2014-11-01 Alice Harris 2015-01-19 18:16:17 +1000
  • da1a11b62d Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 Alice Harris 2015-01-19 17:53:48 +1000
  • 57637d4271 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 Alice Harris 2015-01-19 17:52:54 +1000
  • 1318d0de38 Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting Blade Barringer 2015-01-18 23:08:40 -0600
  • 62d7505233 Merge pull request #423 from crookedneighbor/vIiRuS-groupSorting Blade Barringer 2015-01-18 23:08:34 -0600
  • 5d572c2a40 Merge pull request #4501 from crookedneighbor/fix-day-start Blade Barringer 2015-01-18 22:57:23 -0600
  • b73518af5f Removed $root from view Blade Barringer 2015-01-18 22:54:07 -0600
  • 055db157f6 Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell Blade Barringer 2015-01-18 22:50:26 -0600
  • 6a7d84b842 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop Blade Barringer 2015-01-18 21:24:28 -0600
  • 8b864e114b Compiled spritesheets Blade Barringer 2015-01-18 21:11:49 -0600
  • 86c7203170 Added rock mounts Blade Barringer 2015-01-18 21:11:41 -0600
  • 511b4a1b0b Added pet rocks Blade Barringer 2015-01-18 20:34:12 -0600
  • 9b9b70b7d4 change "level" to "tier"; remove incorrect number of gems Alice Harris 2015-01-19 11:24:42 +1000
  • 5a11dea855 Merge pull request #4529 from HabitRPG/triad-bingo Blade Barringer 2015-01-18 19:12:28 -0600
  • e22269fd61 Merge pull request #442 from HabitRPG/triad-bingo Blade Barringer 2015-01-18 19:12:18 -0600
  • 69c9c12969 Updated keys to kennel info for triad bingo Blade Barringer 2015-01-18 19:10:50 -0600
  • 418f54a32d Added rock pet egg Blade Barringer 2015-01-18 18:38:56 -0600
  • 0bb9aa9f56 Added rock quest boss Blade Barringer 2015-01-18 18:30:54 -0600
  • 3bed7d8153 Added january mystery items Blade Barringer 2015-01-18 18:25:25 -0600
  • c13f6b15a1 Added feb background images Blade Barringer 2015-01-18 18:12:45 -0600
  • bb78b121da revert part of a053486, angular is madeningly inconsistent with this bug Tyler Renelle 2015-01-18 16:38:31 -0700
  • 7c10d27c04 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2015-01-18 15:56:11 -0600
  • 505a0c4ce9 Merge branch 'scribblypanda-issue4468' into develop Blade Barringer 2015-01-18 15:55:49 -0600
  • 137ff71bc8 Added one way binding for email Blade Barringer 2015-01-18 15:51:00 -0600
  • 13e89f1947 Added sync after changing username so username would update Blade Barringer 2015-01-18 15:50:43 -0600
  • e0a081b0ff Adjusted spacing and line breaks Blade Barringer 2015-01-18 15:39:45 -0600
  • cdad6e36da Adjusted some spacing and line breaks Blade Barringer 2015-01-18 15:38:16 -0600
  • 4a5fe1867d Removed target="_blank" attribute from mailto link Blade Barringer 2015-01-18 15:33:58 -0600
  • b3c9371d9f changed links to relative, corrected mailto link scribblypanda 2015-01-15 08:23:23 -0500
  • 1c151f57c2 applied .muted to text so less cluttered looking scribblypanda 2015-01-14 22:38:02 -0500
  • b978852e11 added description of login name and link to page to edit display name scribblypanda 2015-01-11 20:30:25 -0500
  • ae90889dec added description of display name and link to page to edit login name scribblypanda 2015-01-11 20:17:05 -0500
  • 18317f3346 fixed emailChange message, displays properly on localhost scribblypanda 2015-01-11 13:18:00 -0500
  • 5a4ebda187 plain text to translatable strings scribblypanda 2015-01-11 10:36:14 -0500
  • c4113994e6 plain text to translatable strings scribblypanda 2015-01-11 10:22:24 -0500
  • 330a9191a5 added new translatable string emailChange scribblypanda 2015-01-11 03:20:22 -0500
  • 7c990ba109 changed Username to Login Name scribblypanda 2015-01-11 01:18:37 -0500
  • a44e0f7c31 fix(avatar-sharing): screw it, 1.3.3 backwards compat isn't working at the router level anyway. Besides, avatar sharing hasn't worked via addthis for a while, so we don't need this Tyler Renelle 2015-01-18 14:53:18 -0700
  • a053486fcd fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x bug. Also, anon wasn't able to view avatar shares! Tyler Renelle 2015-01-18 14:51:40 -0700
  • 5026e67ead Added one way binding for email Blade Barringer 2015-01-18 15:51:00 -0600
  • 62c9aafb7d Added sync after changing username so username would update Blade Barringer 2015-01-18 15:50:43 -0600
  • c4c2c6a1dc Adjusted spacing and line breaks Blade Barringer 2015-01-18 15:39:45 -0600
  • ad612a9c36 Adjusted some spacing and line breaks Blade Barringer 2015-01-18 15:38:16 -0600
  • 801a5a957a Removed target="_blank" attribute from mailto link Blade Barringer 2015-01-18 15:33:58 -0600
  • e7cb3f58e9 Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg-shared into scribblypanda-issue4468 Blade Barringer 2015-01-18 15:24:48 -0600
  • a2d6ed83a1 Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg into scribblypanda-issue4468 Blade Barringer 2015-01-18 15:23:52 -0600
  • 6c9c2a5ec1 Merge pull request #445 from j-wilkins/patch-1 Blade Barringer 2015-01-18 12:00:15 -0600
  • d6a7fa0d2c s/migraring/migrating Jake Wilkins 2015-01-18 10:35:03 -0700
  • 8401790017 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 Alice Harris 2015-01-18 15:46:25 +1000
  • 7b753e7543 Merge pull request #4533 from HabitRPG/lefnire/one-module Tyler Renelle 2015-01-17 19:08:41 -0700
  • 436e8b5622 Merge pull request #444 from HabitRPG/lefnire/one-module Tyler Renelle 2015-01-17 19:08:21 -0700
  • 503fd9ff51 refactor(services): remove un-used authService, cleanup authCtrl Tyler Renelle 2015-01-17 18:54:03 -0700
  • 2306b7c572 refactor(services): move to a single "habitrpg" module for services / directives / filters Tyler Renelle 2015-01-17 18:43:37 -0700
  • 81bdb2481c refactor(services): move to a single "habitrpg" module for services / directives / filters Tyler Renelle 2015-01-17 18:42:01 -0700
  • f64bc5b2ed Removed if that would hide the triad bingo achievement until mount master attained Blade Barringer 2015-01-17 09:54:16 -0600
  • 373d5a5b64 Merge branch 'mountmaster' into triad-bingo Blade Barringer 2015-01-17 09:53:56 -0600
  • 3d904f18b9 Allowed mountMaster achievement to always be shown Blade Barringer 2015-01-17 09:53:28 -0600
  • 6a5210d3ad fix(plans): when gifting subscription, set plan.dateUpdated so it can roll gemCapExtra next month. Fixes #4480. Removes datedUpdated from previous version of fix. Alice Harris 2015-01-17 16:45:55 +1000
  • 2efadf7381 Removed white space on t-rex iamges closes #4531 Blade Barringer 2015-01-16 22:33:06 -0600
  • f5e9568cef Consolidated calcTriadBingo function Blade Barringer 2015-01-16 21:33:58 -0600
  • 465bfe4df9 Merge pull request #443 from HabitRPG/lefnire/httpinterceptor Tyler Renelle 2015-01-16 18:32:52 -0700
  • f71737a84c Merge pull request #4530 from HabitRPG/lefnire/httpinterceptor Tyler Renelle 2015-01-16 18:32:45 -0700
  • dbeb6f8c1e refactor(config): add mobile Tyler Renelle 2015-01-16 18:16:56 -0700
  • 90c7142da5 refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js. Tyler Renelle 2015-01-16 16:48:53 -0700
  • 6b6802a27a refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js. Will merge in mobile soon Tyler Renelle 2015-01-16 16:47:57 -0700
  • 75971b0f40 Added triad bingo check to releaseBoth function Blade Barringer 2015-01-16 17:01:01 -0600