Merge branch 'api-v3' into api-v3-groups

2025-12-19 15:48:04 +01:00 · 2016-01-16 19:46:47 -06:00
parent 2a6241d549 a44cf5e0fc
commit 965c5dbaa7
144 changed files with 6397 additions and 6175 deletions
--- a/website/public/css/tasks.styl
+++ b/website/public/css/tasks.styl
@@ -146,6 +146,10 @@ for $stage in $stages
    padding: 0
    font-weight: 300

+  .option-box .glyphicon
+    zoom: 1.5
+    vertical-align: -webkit-baseline-middle
+
 .task-column.preview
  padding: 0
  background: transparent
--- a/website/views/index.jade
+++ b/website/views/index.jade
@@ -6,6 +6,7 @@ html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":a
    // ?v=1 needed to force refresh
    link(rel='shortcut icon', sizes="32x32", href='#{env.getBuildUrl("favicon.ico")}?v=4')
    link(rel='shortcut icon', sizes="144x144", href='#{env.getBuildUrl("favicon_192x192.png")}?v=4')
+    link(rel='mask-icon', href='#{env.getBuildUrl("favicon.ico")}?v=4')

    meta(charset='utf-8')
    meta(name='viewport', content='width=device-width, initial-scale=1.0')
--- a/website/views/options/social/chat-box.jade
+++ b/website/views/options/social/chat-box.jade
@@ -23,5 +23,5 @@ form.chat-form(ng-if='user.flags.communityGuidelinesAccepted' ng-submit='postCha
      .checkbox
        label
          input(type='checkbox', ng-model='user.preferences.reverseChatOrder', ng-change='set({"preferences.reverseChatOrder": user.preferences.reverseChatOrder?true: false})')
-          span.hint(popover-trigger='mouseenter', popover-placement='top', popover=env.t('reverseChatOrderPop'))=env.t('reverseChatOrder')
+          span=env.t('reverseChatOrder')

--- a/website/views/options/social/index.jade
+++ b/website/views/options/social/index.jade
@@ -21,7 +21,7 @@ script(type='text/ng-template', id='partials/options.social.inbox.html')
            label
              input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})')
              | &nbsp;
-              span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOut')
+              span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOutOfPMs')
        +chatMessages('inbox')

 script(type='text/ng-template', id='partials/options.social.tavern.html')
--- a/website/views/shared/modals/classes.jade
+++ b/website/views/shared/modals/classes.jade
@@ -1,4 +1,4 @@
-script(type='text/ng-template', id='modals/chooseClass.html')  
+script(type='text/ng-template', id='modals/chooseClass.html')
  .modal-header
    h4=env.t('chooseClassHeading')
  .modal-body.select-class
@@ -67,7 +67,7 @@ script(type='text/ng-template', id='modals/chooseClass.html')
      .well(ng-show='selectedClass=="healer"')=env.t('healerText')

  .modal-footer
-    span(popover-placement='left', popover-trigger='mouseenter', popover=env.t('optOutText'))
-      button.btn.btn-danger(ng-click='user.ops.disableClasses({}); $close()')=env.t('optOut')
+    span(popover-placement='left', popover-trigger='mouseenter', popover=env.t('optOutOfClassesText'))
+      button.btn.btn-danger(ng-click='user.ops.disableClasses({}); $close()')=env.t('optOutOfClasses')
    button.btn.btn-primary(ng-disabled='!selectedClass' ng-click='changeClass(selectedClass); $close()')=env.t('select')
    .pull-left!=env.t('chooseClassLearn')
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,21 +1,46 @@
-h2 1/8/2016 - HABITICA VIDEO AND CHALLENGE, PLUS WINTERY HAIR COLORS!
+h2 1/13/2016 - JANUARY PET QUEST, CHAT REVERSAL OPTION, MERCHANDISE PAGE, AND BEEMINDER GUEST POST
  hr
  tr
    td
-      h3 Habitica Video
-      p We're excited to reveal <a href='https://youtu.be/hgdeJnSili0' target='_blank'>our first-ever Habitica video!</a> Check it out and let us know what you think. There's also a <a href='/#/options/groups/challenges/2d589b68-d5d1-4dbb-a047-7e29bb833a5f'>Challenge</a> for people who share the video on social media with a 25 Gem prize, so if you like the video enough to pass it along, be sure to enter the Challenge for a chance to win!
-      p.small.muted by redphoenix, Lemoness, and Blank Canvas Entertainment, LLC
+      span.Mount_Body_Sabretooth-Base.pull-right
+        span.Mount_Head_Sabretooth-Base.pull-right(style='margin:0')
+      h3 January Pet Quest: Sabretooth Tigers
+      p There's a new Pet Quest available to <a href='/#/options/inventory/quests'>buy in the Quest Shop</a>!  An undead sabretooth tiger has broken out from the ice of the Stoikalm Steppes. Can you defeat the Zombie Sabre Cat? If so, you'll earn some sabretooth eggs!
+      p.small.muted by SabreCat and Lemoness
+      p.small.muted Art by Fandekasp, Inventrix, and icefelis
+      p.small.muted Writing by Daniel the Bard, Flutter Bee, and SabreCat
  tr
    td
-      .promo_winteryhair.pull-right
-      h3 Wintery Hair Colors
-      p The Seasonal Edition Wintery Hair Colors are now available for purchase from the <a href='/#/options/profile/avatar'>avatar customizations page</a>! Now you can dye your avatar's hair Snowy, Peppermint, Holly Green, Aurora, Winter Star, or Festive.
+      h3 Chat Reversal Option
+      p We've now implemented the option to reverse the order of chat in parties, Guilds, and the Tavern! This will make it easier for those Habiticans who use screen readers to catch up on chat. To reverse the order, simply click the checkbox under the Send Chat / Fetch Recent Messages buttons that says "Show chat messages in reverse order."
+      p.small.muted by GeorgeSG
+  tr
+    td
+      h3 Merchandise Page
+      p Now our awesome Habitica merchandise is gathered in <a href='https://habitica.com/static/merch' target='_blank'>one easy-to-access page</a>! If you want to get our stickers or preorder the next batch of Habitica T-shirts, head on over and check it out.
+      p.small.muted by Camenni
+  tr
+    td
+      h3 Beeminder Guest Post
+      p We've written a guest post for the Beeminder blog! <a href='http://blog.beeminder.com/habitica/' target='_blank'>Check it out</a> to read about how Habitica's rewards can work well with Beeminder's extra punishment.
+      p.small.muted by Lemoness

 if menuItem !== 'oldNews'
  hr
  a(href='/static/old-news', target='_blank') Read older news

 mixin oldNews
+  h2 1/8/2016 - HABITICA VIDEO AND CHALLENGE, PLUS WINTERY HAIR COLORS!
+    tr
+      td
+        h3 Habitica Video
+        p We're excited to reveal <a href='https://youtu.be/hgdeJnSili0' target='_blank'>our first-ever Habitica video!</a> Check it out and let us know what you think. There's also a <a href='/#/options/groups/challenges/2d589b68-d5d1-4dbb-a047-7e29bb833a5f'>Challenge</a> for people who share the video on social media with a 25 Gem prize, so if you like the video enough to pass it along, be sure to enter the Challenge for a chance to win!
+        p.small.muted by redphoenix, Lemoness, and Blank Canvas Entertainment, LLC
+    tr
+      td
+        .promo_winteryhair.pull-right
+        h3 Wintery Hair Colors
+        p The Seasonal Edition Wintery Hair Colors are now available for purchase from the <a href='/#/options/profile/avatar'>avatar customizations page</a>! Now you can dye your avatar's hair Snowy, Peppermint, Holly Green, Aurora, Winter Star, or Festive.
  h2 1/6/2016 - JANUARY BACKGROUNDS AND ARMOIRE ITEMS REVEALED! PLUS, IMPORTANT HISTORY COMPRESSION UPDATE
    tr
      td
--- a/website/views/shared/tasks/task_view/graph.jade
+++ b/website/views/shared/tasks/task_view/graph.jade
@@ -6,4 +6,4 @@ span.option-box.pull-right(ng-if='::main')
    span.glyphicon.glyphicon-calendar
  // <a href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}" rel=tooltip title="Google Calendar"><i class=icon-calendar></i></a>
  a.option-action(ng-click='list.help=!list.help', tooltip=env.t('clickForHelp'))
-    span.glyphicon.glyphicon-question-sign(style={'zoom':1.5,'vertical-align':'-webkit-baseline-middle'})
+    span.glyphicon.glyphicon-question-sign
--- a/website/views/social/layout.jade
+++ b/website/views/social/layout.jade
@@ -24,6 +24,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
    meta(name='apple-itunes-app' content='app-id=994882113')
    link(rel='canonical', href='', type='text/html')
    link(rel='shortcut icon', href='/favicon.ico')
+    link(rel='mask-icon', href='/favicon.ico')

    link(href='//fonts.googleapis.com/css?family=Lato:400,700', rel='stylesheet', type='text/css')
    link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css')
--- a/website/views/static/front.jade
+++ b/website/views/static/front.jade
@@ -25,6 +25,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
    link(rel='canonical', href='', type='text/html')
    link(rel='shortcut icon', sizes="32x32", href='/favicon.ico')
    link(rel='shortcut icon', sizes="192x192", href='/favicon_192x192.png')
+    link(rel='mask-icon', href='/favicon.ico')

    link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css')

--- a/website/views/static/layout.jade
+++ b/website/views/static/layout.jade
@@ -21,6 +21,7 @@ html(ng-app='habitrpg')

    link(rel='shortcut icon', sizes="32x32", href='#{env.getBuildUrl("favicon.ico")}?v=4')
    link(rel='shortcut icon', sizes="192x192", href='#{env.getBuildUrl("favicon_192x192.png")}?v=4')
+    link(rel='mask-icon', href='#{env.getBuildUrl("favicon.ico")}?v=4')

    meta(charset='utf-8')
    meta(name='viewport', content='width=device-width, initial-scale=1.0')
--- a/website/views/static/new-stuff.jade
+++ b/website/views/static/new-stuff.jade
@@ -11,6 +11,7 @@ html(ng-app='habitrpg')

    link(rel='shortcut icon', sizes="32x32", href='#{env.getBuildUrl("favicon.ico")}?v=4')
    link(rel='shortcut icon', sizes="192x192", href='#{env.getBuildUrl("favicon_192x192.png")}?v=4')
+    link(rel='mask-icon', href='#{env.getBuildUrl("favicon.ico")}?v=4')

    meta(charset='utf-8')
    meta(name='viewport', content='width=device-width, initial-scale=1.0')