Commit graph

  • 29382d18f7 fix(reset-password): use array for variables Matteo Pagliazzi 2014-12-11 17:05:31 +0100
  • 1761752240 use email server for reset-password Matteo Pagliazzi 2014-12-11 16:51:39 +0100
  • 324077566b Merge branch 'mountmaster' of https://github.com/taldin/habitrpg-shared into taldin-mountmaster Blade Barringer 2014-12-11 08:31:19 -0600
  • cea2879539 Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster Blade Barringer 2014-12-11 08:15:18 -0600
  • af01065da6 Merge pull request #385 from SabreCat/rebalancing Alice Harris 2014-12-11 14:06:06 +1000
  • 11ec69674c chore(grunt): grunt Sabe Jones 2014-12-10 21:49:40 -0600
  • 2fc0cb8fa1 fix(scoring): move gainMP into score Sabe Jones 2014-12-10 21:45:51 -0600
  • 7b22244f01 feat(scoring): MP gain from Habits and Dailies Sabe Jones 2014-12-10 21:21:09 -0600
  • e79126bf59 Merge pull request #4372 from thehindenburg/optoutspace Blade Barringer 2014-12-10 15:51:38 -0600
  • f9cc2adda5 fix(iap): iap verification fixes Tyler Renelle 2014-12-10 14:25:00 -0700
  • bb37c163cf fix spacing Negue 2014-12-08 22:21:32 +0100
  • d92832bfb2 Hopefully a working IOS Verification Negue 2014-11-28 23:44:42 +0100
  • ecf20f423c IAP Verification for Android Negue 2014-11-27 21:25:15 +0100
  • b59a70f128 more dummy controller, just for iap data Negue 2014-11-24 20:20:10 +0100
  • cc4812712a dummy iap verify routes Negue 2014-11-23 01:50:03 +0100
  • 2ea12d5c71 Add in-app-purchase Package Negue 2014-11-22 20:40:18 +0100
  • 799934c31b added space in Jade to the arrow and opt out text in the inbox thehindenburg 2014-12-10 12:31:09 -0800
  • 7fb1e69927 Changed inbox text to use an env.t var Blade Barringer 2014-12-10 10:47:05 -0600
  • d2e5f60dd4 Added inbox as a env.t var Blade Barringer 2014-12-10 10:46:36 -0600
  • 4af70a2a0f Made invite button for guild invitations part of an input-group Blade Barringer 2014-12-10 09:47:34 -0600
  • 842289ffdf Merge pull request #384 from SabreCat/penguin Sabe Jones 2014-12-09 21:23:19 -0600
  • fdf25611fb Merge pull request #4370 from SabreCat/penguin Sabe Jones 2014-12-09 21:22:45 -0600
  • ac2ce59873 chore(grunt): grunt Sabe Jones 2014-12-09 21:16:00 -0600
  • c6d3d72e00 fix(sprites): Move penguins 3px Sabe Jones 2014-12-09 21:08:13 -0600
  • 5cd6c02e8a fix(quest): Dapper to perspicacious Sabe Jones 2014-12-09 20:56:38 -0600
  • dc034e4ab5 fix(quest): Add penguin to shop Sabe Jones 2014-12-09 20:48:08 -0600
  • 7fd4cebbdc fix(quest): Penguin corrections Sabe Jones 2014-12-09 20:44:10 -0600
  • d25455fa5a feat(quest): Implement Penguin pet quest Sabe Jones 2014-12-09 20:21:20 -0600
  • 2d9d8fe209 chore(Bailey): Announce Penguin Sabe Jones 2014-12-09 20:20:17 -0600
  • 935dc2cd2e Merge pull request #383 from betaveros/cap-crit-multiplier-cp Alice Harris 2014-12-10 12:06:39 +1000
  • af130a701c Diminish critical hit bonus towards 450% Brian Chen 2014-11-09 10:35:03 +0800
  • ce73a75133 feat(email): add new image for subscription email Matteo Pagliazzi 2014-12-09 17:34:28 +0100
  • 1511002a08 Fixed styling of invitation to guild page Blade Barringer 2014-12-08 17:03:11 -0600
  • 5230883015 Adjusted styling of select box used for ordering party Blade Barringer 2014-12-08 16:57:37 -0600
  • 2a3bd8a9cb No longer displays an extra popover that says true. Closes #4362 Blade Barringer 2014-12-08 10:35:39 -0600
  • 3d2c7e8854 Fixed a grammar error in the Golden Knight 2 quest Paul Klipp 2014-12-08 18:34:49 +0100
  • 5ac7f479d3 Added some spacing between icons and text on challenge/guild buttons Blade Barringer 2014-12-07 21:03:09 -0600
  • 05c01ebd3c Made glyphicons white on for challenge/guild join/leave buttons Blade Barringer 2014-12-07 21:01:40 -0600
  • 72fbe6a8a7 Removed yellow background from join public guild page Blade Barringer 2014-12-07 20:58:42 -0600
  • bd21c93b36 Fixed weirdness on create guild page. Elements were overflowing out of their boxes Blade Barringer 2014-12-07 20:52:49 -0600
  • 46cb38660e Fixed padding on challenges filter box Blade Barringer 2014-12-07 20:20:42 -0600
  • 9a60fc7ca8 Accidentally a dash lacrimae 2014-12-08 01:02:14 +0100
  • d27dc29607 Spells now mention which attribute they affect lacrimae 2014-12-08 01:01:06 +0100
  • ae6e0255c6 feat(flag-message): add server methods Matteo Pagliazzi 2014-12-07 14:35:09 +0100
  • e49e8f5765 Added note for paglias Blade Barringer 2014-12-05 22:20:14 -0600
  • 5acde1e609 Added todo for paglias Blade Barringer 2014-12-05 22:15:03 -0600
  • aafda2dad1 Added text of message to make sure user clicked the right flag Blade Barringer 2014-12-05 22:14:48 -0600
  • 8537c96eb6 Converted heading to paragraph Blade Barringer 2014-12-05 22:09:56 -0600
  • 7a7c13ff6d Prevent modal from popping up if already reported Blade Barringer 2014-12-05 07:43:38 -0600
  • 2f506ce0e0 Give flag text danger class and already reported message if already reproted Blade Barringer 2014-12-05 07:43:20 -0600
  • e9cffe6206 Error handling for if message already flagged Blade Barringer 2014-12-05 07:42:52 -0600
  • 5a6c9fbf84 Added some logic for adding flags Blade Barringer 2014-12-05 07:03:33 -0600
  • 74b94e6764 Removed flag from system notifications Blade Barringer 2014-12-05 06:52:49 -0600
  • c44c607ae7 Renamed flagChat to flagChatMessage Blade Barringer 2014-12-05 06:50:41 -0600
  • a2cf14324c Added a flags key to message object Blade Barringer 2014-12-05 06:47:04 -0600
  • 62d92db332 Added buttons to footer, cleaned up functions Blade Barringer 2014-12-05 06:41:40 -0600
  • c90ea166d4 Corrected tooltip name Blade Barringer 2014-12-04 22:03:35 -0600
  • 01c0ce1722 Added text-danger span on username Blade Barringer 2014-12-04 22:02:34 -0600
  • 6fcf1846b3 Renamed everything from flag to abuseFlag Blade Barringer 2014-12-04 22:00:48 -0600
  • 00abb168a1 Added heading and body of flag modal Blade Barringer 2014-12-04 21:57:32 -0600
  • 5e1e1b2c13 Flag icon opens blank modal Blade Barringer 2014-12-04 21:42:41 -0600
  • d0cf285468 Merge pull request #4358 from andymantell/feature/linking-timetravellers-names Blade Barringer 2014-12-06 16:48:09 -0600
  • 6739ec25a3 Merge pull request #379 from andymantell/feature/linking-timetravellers-names Blade Barringer 2014-12-06 16:48:00 -0600
  • 8ba6bcddde Merge pull request #4354 from crookedneighbor/markdown-lists-in-tasks Blade Barringer 2014-12-06 16:42:31 -0600
  • 60f3e0032e Adjusted margin for markdown list in tast-text. Closes #2721 Blade Barringer 2014-12-05 17:14:16 -0600
  • 3de86f35cb fix(plans): attempted fix for: Cast to number failed for value "NaN" at path "purchased.plan.consecutive.count", see https://github.com/HabitRPG/habitrpg/issues/4317 Tyler Renelle 2014-12-06 12:47:51 -0700
  • 17f9d4de72 fix(i18n): fix english string Matteo Pagliazzi 2014-12-06 19:18:28 +0100
  • cb9083d9ba fix(webhooks): don't send webhooks if not valid url (also if not enabled), fixes #4357 Tyler Renelle 2014-12-06 10:25:07 -0700
  • 82cea43e07 Link for Tyler and Vicky's names Andy Mantell 2014-12-06 15:42:32 +0000
  • 58359f1e89 Link for Tyler and Vicky's names #4351 Andy Mantell 2014-12-06 15:42:12 +0000
  • b23a76f8c8 Merge pull request #365 from crookedneighbor/fix-moment-deprication-warnings-on-tests Blade Barringer 2014-12-06 00:56:16 -0600
  • 66f913e833 closes #4353. If time on chat would break onto new line, just puts whole time statment on new line Blade Barringer 2014-12-05 23:51:07 -0600
  • 024e606f5c Merge pull request #4348 from crookedneighbor/fix-transparent-challenge-buttons Blade Barringer 2014-12-05 22:17:38 -0600
  • 2018cc84ab fix(gem-cap) use customerId in gem purchase Tyler Renelle 2014-12-05 15:11:27 -0700
  • 7ab5456c2a Merge pull request #4352 from crookedneighbor/show-gem-purchases-with-customer-id Tyler Renelle 2014-12-05 14:56:41 -0700
  • ae62a04497 Converted planId to customerId on whether or not gems can be purchased. Closes #4340 Blade Barringer 2014-12-05 15:53:53 -0600
  • ea869a4487 Adjust trasnparent class of challenge buttons. Closes #4346 Blade Barringer 2014-12-05 15:13:34 -0600
  • f010bd7ad9 chore(i18n): update locales Matteo Pagliazzi 2014-12-05 16:21:13 +0100
  • 6380584f46 Merge pull request #4343 from HabitRPG/revert-4342-revert-4329-tranlsate-mystic-items Matteo Pagliazzi 2014-12-05 16:07:33 +0100
  • 0450e2b924 Revert "Revert "Tranlsate mystic items"" Matteo Pagliazzi 2014-12-05 16:07:27 +0100
  • 09aeaf2812 Merge branch 'crookedneighbor-translate-mystic-items' into develop Matteo Pagliazzi 2014-12-05 16:06:51 +0100
  • 198d41d5e8 fix(pr): conflicts Matteo Pagliazzi 2014-12-05 16:06:15 +0100
  • 6ad4f5004d Merge pull request #4342 from HabitRPG/revert-4329-tranlsate-mystic-items Matteo Pagliazzi 2014-12-05 16:03:50 +0100
  • 1d1de38956 Revert "Tranlsate mystic items" Matteo Pagliazzi 2014-12-05 16:03:41 +0100
  • a1075a5193 Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items Matteo Pagliazzi 2014-12-05 16:02:34 +0100
  • 4aacc103db Merge pull request #377 from SabreCat/gems Sabe Jones 2014-12-04 20:31:45 -0600
  • aa346c9271 Merge pull request #4328 from SabreCat/gems Sabe Jones 2014-12-04 20:30:46 -0600
  • 7dd16a06e6 Revert "fix(style): Make pet key a SPAN" Sabe Jones 2014-12-04 20:26:50 -0600
  • a0434e67a6 Revert "fix(style): Pet key margins like sub gems" Sabe Jones 2014-12-04 20:26:27 -0600
  • d584e998ba fix(style): Pet key margins like sub gems Sabe Jones 2014-12-04 20:14:16 -0600
  • 63ea851fdb fix(style): Make pet key a SPAN Sabe Jones 2014-12-04 20:13:26 -0600
  • 5986643f1e Corrected strings so they only use one variable Blade Barringer 2014-12-04 20:03:31 -0600
  • 6dac81f850 Corrected strings so they only used on variable Blade Barringer 2014-12-04 20:03:17 -0600
  • 532f5d1c53 Converted strings to be able to use links Blade Barringer 2014-12-03 22:46:16 -0600
  • 21ca49345d Moved time travelers and hourglass strings to shared Blade Barringer 2014-12-03 22:19:57 -0600
  • f2c6c07ff8 fix(Gems): Clarify badge count Sabe Jones 2014-12-04 19:04:47 -0600
  • 6369934ca3 feat(Gems): Add strings for Market gem Sabe Jones 2014-12-04 19:04:07 -0600
  • efcf9099f4 Adjusted count for remaining gem count Blade Barringer 2014-12-04 17:48:01 -0600
  • f3fc6644b8 refactor(paypal): some plan debugging cleanup Tyler Renelle 2014-12-04 15:27:44 -0700
  • c9b0898499 fix(style): help emoji line up with task text Sabe Jones 2014-12-04 16:32:00 -0600