Commit graph

  • ab7c1996b2 Merge pull request #4381 from SabreCat/timetravel Blade Barringer 2014-12-14 13:28:03 -0600
  • 0352adfd47 Merge pull request #393 from SabreCat/timetravel Blade Barringer 2014-12-14 13:27:48 -0600
  • 35b02cfdd8 fix(I18N): Make Time Travel translatable Sabe Jones 2014-12-14 12:59:45 -0600
  • 8d042745be fix(I18N): Translate Time Travelers Sabe Jones 2014-12-14 12:57:36 -0600
  • c287441cd9 Merge pull request #4378 from SabreCat/purchases Sabe Jones 2014-12-14 12:42:11 -0600
  • dde3f5ffef Adjusted tooltip wrapping so it would only affect long titles Blade Barringer 2014-12-14 12:18:59 -0600
  • a961d6b342 Added wrapping rule for user tooltip in chat messages closes #4367 Blade Barringer 2014-12-09 07:00:24 -0600
  • fd3cbf481d Merge pull request #390 from lacrimae/develop Blade Barringer 2014-12-14 11:02:45 -0600
  • 396176f14f Quest completion screen floats to right on everything but xs Blade Barringer 2014-12-14 08:32:05 -0600
  • d0df9e46d6 Added helper classes for floats at various screen sizes Blade Barringer 2014-12-14 08:31:40 -0600
  • 41e1f4c75f Conditionally allow completed quest image to be centered if no completion text is present Blade Barringer 2014-12-14 08:13:50 -0600
  • 195a8a5ca3 Merge pull request #4375 from thehindenburg/questimage Blade Barringer 2014-12-14 07:39:16 -0600
  • ff8a508860 Streamlined "Confers no benefit" placements lacrimae 2014-12-14 13:32:44 +0100
  • e4df3435e1 fix(avatar): Correct "Facial Hair" text Sabe Jones 2014-12-13 16:07:58 -0600
  • 4ded747b88 fix(purchases): Correct hair path Sabe Jones 2014-12-13 15:53:39 -0600
  • 4adf95feb6 fix(purchases): Hide "2/locked" as appropriate Sabe Jones 2014-12-13 12:05:17 -0600
  • 61ae5c7420 fix(loggly): enable only manually Matteo Pagliazzi 2014-12-13 15:01:38 +0100
  • 012e579cfe fix(loggly): typo Matteo Pagliazzi 2014-12-13 14:57:05 +0100
  • dac2fc682d feat(loggly): change tag based on base_url, logs internal server errors Matteo Pagliazzi 2014-12-13 14:48:14 +0100
  • 5368d3b760 Merge pull request #389 from lacrimae/develop Alice Harris 2014-12-13 10:31:50 +1000
  • 9d6caaa138 feat(iap): ignore keys/ directory. upload any keys/iap-sandbox iap-live etc on a private branch Tyler Renelle 2014-12-12 16:18:33 -0700
  • 118a5432e5 Merge branch 'develop' of https://github.com/lacrimae/habitrpg-shared into develop lacrimae 2014-12-13 00:16:24 +0100
  • a15c57c275 Accidentally a dash lacrimae 2014-12-08 01:02:14 +0100
  • 63263bbf3a Spells now mention which attribute they affect lacrimae 2014-12-08 01:01:06 +0100
  • e98243e3d8 refactor(env): small cleanup Tyler Renelle 2014-12-12 11:57:55 -0700
  • 60d03dd17f Merge pull request #387 from SabreCat/rebalancing Alice Harris 2014-12-13 05:27:00 +1000
  • 8935538b53 feat(loggly): enable json loggin and start loggin errors during cron Matteo Pagliazzi 2014-12-12 20:05:37 +0100
  • 7c6d8d4dc2 Update quests.styl thehindenburg 2014-12-12 11:02:55 -0800
  • 670542f3ce cleaning up white space thehindenburg 2014-12-12 10:44:06 -0800
  • e1ea1a24c8 feat(challenges): optional checkbox on group create/edit: restrict challenge-creation to leader. Commented-out code for similar setup for member invites, shouldn't be hard Tyler Renelle 2014-12-12 11:35:51 -0700
  • 2db80c6841 changed to style sheet thehindenburg 2014-12-12 10:26:55 -0800
  • 45d30ffef5 fix(footerCtrl.js): disable addThis hover benmanley 2014-12-12 17:41:26 +0000
  • 0943a229ec fix(avatar.styl): improve label layout benmanley 2014-12-12 17:38:17 +0000
  • 375253fb84 changing the reward text to clear the image thehindenburg 2014-12-12 09:38:13 -0800
  • b10d4606f5 fix(loggly): typo and remove testing Matteo Pagliazzi 2014-12-12 13:09:21 +0100
  • af1ff6d740 feat(loggly): add test log, use only in production and add sample config Matteo Pagliazzi 2014-12-12 12:17:48 +0100
  • 7356e0bafe feat(loggly): add loggly Matteo Pagliazzi 2014-12-12 12:11:26 +0100
  • 948d5762cd fix(flag-message): small refactor Matteo Pagliazzi 2014-12-12 11:39:22 +0100
  • ac34332582 Made reset flag count button red Blade Barringer 2014-12-11 21:49:42 -0600
  • 5b17b8b382 Made flag number more helpful Blade Barringer 2014-12-11 21:47:06 -0600
  • 35675e3f28 Admin can see flag on own message Blade Barringer 2014-12-11 21:44:58 -0600
  • 7d38eb3b59 Allow admin to reflag a message they've flagged and unflagged previously Blade Barringer 2014-12-11 21:43:01 -0600
  • 595ac1c03e Made it impossible to flag own message in inbox Blade Barringer 2014-12-11 21:42:39 -0600
  • c737729470 Changed transparent class for admin to only appear if it is hidden Blade Barringer 2014-12-11 21:40:25 -0600
  • 5f49031c5e Adjusted spacing of chat buttons Blade Barringer 2014-12-11 17:41:54 -0600
  • b1600198be Added method for letting an admin unhide a flagged message Blade Barringer 2014-12-11 17:29:01 -0600
  • eb36a53f6e Moved ng-class so it would update transparent class in real time after flaggging Blade Barringer 2014-12-11 13:38:57 -0600
  • 6bb51c36e2 Admin flagging counts for more, automatically hides message Blade Barringer 2014-12-11 13:34:43 -0600
  • d6262efd3f Added note about how many flags a message has Blade Barringer 2014-12-11 13:12:50 -0600
  • dfd982cb04 Allow admin to see messages that have been flagged more than twice, but make them semi-transparent Blade Barringer 2014-12-11 13:09:00 -0600
  • d3d5430bf2 Always show message if admin Blade Barringer 2014-12-11 13:05:48 -0600
  • b056faeb34 Hide message if flag count is 2 or higher Blade Barringer 2014-12-11 13:01:50 -0600
  • 45b91b1251 Added flagCount variable Blade Barringer 2014-12-11 13:00:25 -0600
  • 27ebe1a0fe Converted sent transparency to ng-class instead of style Blade Barringer 2014-12-11 12:45:25 -0600
  • 3771d38d48 Added fallback for is message does not contain flags key. Added error for if message was already flagged by user Blade Barringer 2014-12-11 12:16:57 -0600
  • b6ae2302e8 User can only flag message after accepting community guidelines Blade Barringer 2014-12-11 10:29:12 -0600
  • 739106f13e Updated message preview on flag abuse modal to use markdown interpretation Blade Barringer 2014-12-11 10:23:29 -0600
  • e84880d3e8 feat(flag-message): add server methods Matteo Pagliazzi 2014-12-07 14:35:09 +0100
  • 6749109423 Added note for paglias Blade Barringer 2014-12-05 22:20:14 -0600
  • 1a59815cc8 Added todo for paglias Blade Barringer 2014-12-05 22:15:03 -0600
  • bbf94aac64 Added text of message to make sure user clicked the right flag Blade Barringer 2014-12-05 22:14:48 -0600
  • dd68e6a29d Converted heading to paragraph Blade Barringer 2014-12-05 22:09:56 -0600
  • 057a8b1a06 Prevent modal from popping up if already reported Blade Barringer 2014-12-05 07:43:38 -0600
  • 6d656d3713 Give flag text danger class and already reported message if already reproted Blade Barringer 2014-12-05 07:43:20 -0600
  • a22c3c5968 Error handling for if message already flagged Blade Barringer 2014-12-05 07:42:52 -0600
  • 3c62e0b862 Added some logic for adding flags Blade Barringer 2014-12-05 07:03:33 -0600
  • 50e8236008 Removed flag from system notifications Blade Barringer 2014-12-05 06:52:49 -0600
  • d5d83d67e9 Renamed flagChat to flagChatMessage Blade Barringer 2014-12-05 06:50:41 -0600
  • e2c0a41f88 Added a flags key to message object Blade Barringer 2014-12-05 06:47:04 -0600
  • 9fd4588b74 Added buttons to footer, cleaned up functions Blade Barringer 2014-12-05 06:41:40 -0600
  • 658046024e Corrected tooltip name Blade Barringer 2014-12-04 22:03:35 -0600
  • f50f40b77d Added text-danger span on username Blade Barringer 2014-12-04 22:02:34 -0600
  • ee9214396b Renamed everything from flag to abuseFlag Blade Barringer 2014-12-04 22:00:48 -0600
  • b3a56b6ded Added heading and body of flag modal Blade Barringer 2014-12-04 21:57:32 -0600
  • 1e3a07b8b5 Flag icon opens blank modal Blade Barringer 2014-12-04 21:42:41 -0600
  • d70de5972e added the image to the end screen and made adjustments to the line thehindenburg 2014-12-11 22:28:07 -0800
  • ae762837e2 refactor(challenges): cleanup challenge-creation. can use async.auto to keep variables around, no need to set parent closure vars Tyler Renelle 2014-12-11 21:20:22 -0700
  • 3027ccff83 fix(plans): fix fields which are NaN Tyler Renelle 2014-12-11 21:06:38 -0700
  • a95947b2dc Made reset flag count button red Blade Barringer 2014-12-11 21:49:42 -0600
  • dff7a74135 Made flag number more helpful Blade Barringer 2014-12-11 21:47:06 -0600
  • a0a4378465 Admin can see flag on own message Blade Barringer 2014-12-11 21:44:58 -0600
  • a021ab2896 Allow admin to reflag a message they've flagged and unflagged previously Blade Barringer 2014-12-11 21:43:01 -0600
  • 3c2319b63c Made it impossible to flag own message in inbox Blade Barringer 2014-12-11 21:42:39 -0600
  • c67da1804a Changed transparent class for admin to only appear if it is hidden Blade Barringer 2014-12-11 21:40:25 -0600
  • 96157068cf chore(grunt): grunt Sabe Jones 2014-12-11 19:58:14 -0600
  • 43dcded051 feat(quests): Boss damage from Habits Sabe Jones 2014-12-11 19:50:46 -0600
  • 6b8280ccbb Adjusted spacing of chat buttons Blade Barringer 2014-12-11 17:41:54 -0600
  • 38cd0e8de1 Added method for letting an admin unhide a flagged message Blade Barringer 2014-12-11 17:29:01 -0600
  • 14a38033f9 Merge branch 'negue-iap_verification' into develop Tyler Renelle 2014-12-11 14:51:31 -0700
  • f9c00003f3 Moved ng-class so it would update transparent class in real time after flaggging Blade Barringer 2014-12-11 13:38:57 -0600
  • 8ac3e312ed Admin flagging counts for more, automatically hides message Blade Barringer 2014-12-11 13:34:43 -0600
  • db1f24e7b4 Added note about how many flags a message has Blade Barringer 2014-12-11 13:12:50 -0600
  • c8c64a1b81 Allow admin to see messages that have been flagged more than twice, but make them semi-transparent Blade Barringer 2014-12-11 13:09:00 -0600
  • 1fb73b35ab Always show message if admin Blade Barringer 2014-12-11 13:05:48 -0600
  • 4718641d3e Hide message if flag count is 2 or higher Blade Barringer 2014-12-11 13:01:50 -0600
  • 6fb531234d Added flagCount variable Blade Barringer 2014-12-11 13:00:25 -0600
  • d24f6ad1ac Converted sent transparency to ng-class instead of style Blade Barringer 2014-12-11 12:45:25 -0600
  • d8515fc8de Added fallback for is message does not contain flags key. Added error for if message was already flagged by user Blade Barringer 2014-12-11 12:16:57 -0600
  • 564677340c User can only flag message after accepting community guidelines Blade Barringer 2014-12-11 10:29:12 -0600
  • 9bd0304223 Updated message preview on flag abuse modal to use markdown interpretation Blade Barringer 2014-12-11 10:23:29 -0600