Merge branch 'develop' into api-v3

.eslintignore

@@ -17,7 +17,8 @@ common/script/public/**/*.js
 website/src/**/api-v2/**/*.js
 website/src/routes/payments.js
 website/src/routes/pages.js
-website/src/middlewares/
+website/src/middlewares/apiThrottle.js
+website/src/middlewares/forceRefresh.js
 website/src/controllers/payments/
 
 debug-scripts/*

common/locales/en/character.json

@@ -1,4 +1,5 @@
 {
+    "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the <a href='https://habitica.com/static/community-guidelines' target='_blank'>Community Guidelines</a> (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email <a href='mailto:leslie@habitica.com' target='blank'>leslie@habitica.com</a>!",
     "statsAch": "Stats & Achievements",
     "profile": "Profile",
     "avatar": "Customize Avatar",

common/locales/en/pets.json

@@ -19,7 +19,7 @@
     "orca": "Orca",
     "royalPurpleGryphon": "Royal Purple Gryphon",
     "phoenix": "Phoenix",
-    "bumblebee": "Magical Bee",
+    "magicalBee": "Magical Bee",
     "rarePetPop1": "Click the gold paw to learn more about how you can obtain this rare pet through contributing to Habitica!",
     "rarePetPop2": "How to Get this Pet!",
     "potion": "<%= potionType %> Potion",

common/locales/en/settings.json

@@ -66,6 +66,14 @@
     "API": "API",
     "APIText": "Copy these for use in third party applications. However, think of your API Token like a password, and do not share it publicly. You may occasionally be asked for your User ID, but never post your API Token where others can see it, including on Github.",
     "APIToken": "API Token (this is a password - see warning above!)",
+    "thirdPartyApps": "Third Party Apps",
+    "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.",
+    "beeminder": "Beeminder",
+    "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)",
+    "chromeChatExtension": "Chrome Chat Extension",
+    "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.",
+    "otherExtensions": "<a target='blank' href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations'>Other Extensions</a>",
+    "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.",
     "resetDo": "Do it, reset my account!",
     "fixValues": "Fix Values",
     "fixValuesText1": "If you've encountered a bug or made a mistake that unfairly changed your character (damage you shouldn't have taken, Gold you didn't really earn, etc.), you can manually correct your numbers here. Yes, this makes it possible to cheat: use this feature wisely, or you'll sabotage your own habit-building!",

common/script/content/index.js

@@ -418,7 +418,7 @@ api.specialPets = {
   'Tiger-Veteran': 'veteranTiger',
   'Phoenix-Base': 'phoenix',
   'Turkey-Gilded': 'gildedTurkey',
-  'Bumblebee-Base': 'bumblebee',
+  'MagicalBee-Base': 'magicalBee',
 };
 
 api.specialMounts = {
@@ -431,7 +431,7 @@ api.specialMounts = {
   'Gryphon-RoyalPurple': 'royalPurpleGryphon',
   'Phoenix-Base': 'phoenix',
   'JackOLantern-Base': 'jackolantern',
-  'Bumblebee-Base': 'bumblebee',
+  'MagicalBee-Base': 'magicalBee',
 };
 
 api.timeTravelStable = {

vagrant_scripts/vagrant.sh

@@ -38,7 +38,7 @@ apt-get update -qq
 echo Installing Unix build tools - needed for node-gyp to use make...
 apt-get install -qq build-essential
 
-echo Installing python sofrware properties...
+echo Installing python software properties...
 apt-get install -qq python-software-properties
 
 echo Installing sprite dependencies...
@@ -57,7 +57,7 @@ echo Installing curl...
 apt-get install -qq curl
 
 echo Installing test dependencies...
-/vagrant/vagrant_scripts/install_gcc.sh
+/vagrant/vagrant_scripts/install_test_dependencies.sh
 
 echo Installing ntp...
 apt-get install -qq ntp

website/views/options/profile.jade

@@ -256,8 +256,9 @@ script(id='partials/options.profile.profile.html', type='text/ng-template')
         //{{profile.profile.blurb | linky:'_blank'}}
 
       form.col-md-4(ng-show='_editing.profile', ng-submit='save()')
+        .alert.alert-info.alert-sm
+          !=env.t("communityGuidelinesWarning")
         input.btn.btn-primary(type='submit', value=env.t('save'))
-
         // TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak
         .form-group
           label=env.t('displayName')

website/views/options/settings.jade

@@ -232,6 +232,25 @@ script(type='text/ng-template', id='partials/options.settings.api.html')
         pre.prettyprint {{user.apiToken}}
         h6=env.t('qrCode')
         img.img-rendering-auto(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7B%22address%22%3A%22https%3A%2F%2Fhabitrpg.com%22%2C%22user%22%3A%22{{user.id}}%22%2C%22key%22%3A%22{{user.apiToken}}%22%7D&choe=UTF-8&chld=L', alt='qrcode')
+        br
+        h3=env.t('thirdPartyApps')
+        ul
+          li
+            a(target='_blank' href='https://www.beeminder.com/habitica')=env.t('beeminder')
+            br
+            =env.t('beeminderDesc')
+          li
+            a(target='_blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb')=env.t('chromeChatExtension')
+            br
+            =env.t('chromeChatExtensionDesc')
+          li
+            a(target='_blank' ng-href='http://data.habitrpg.com?uuid={{user._id}}')=env.t('dataTool')
+            br
+            =env.t('dataToolDesc')
+          li
+            !=env.t('otherExtensions')
+            br
+            =env.t('otherDesc')
 
         hr
 

website/views/shared/new-stuff.jade

@@ -1,5 +1,43 @@
-h2 4/14/2016 - ANDROID APP UPDATES!
+h2 4/15/2016 - iOS AND ANDROID UPDATES, AND ANOTHER BEGUILEMENT STRIKE!
   hr
+  tr
+    td
+      h3 iOS Update: Fixes Galore
+      p We've released <a href='https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8'>a new iOS update</a> focusing on stability and bug fixes!
+      br
+      p It includes multiple crash fixes, most notably for iOS 7 and for quests with rage bars, and clears up frustrating bugs such as the issues with timezones, the duplicating items bug, and the fact that completed to-dos used to still cause reminders. Be sure to download it now for a better Habitica experience!
+      br
+      p Thank you very much for your patience! If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! Also, old reviews get hidden, but if you go to the review section you can re-post it again with a single tap. We hope you enjoy the update!
+      p.small.muted by viirus, schrockblock, a-ayyash, and nivl4
+  tr
+    td
+      .Pet-Wolf-Base.pull-left.slight-right-margin
+      h3 Android App Update: Pets, Enchanted Armoire, and More!
+      p In case you missed it, yesterday we updated <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica'>the Android app</a> to include a ton of features, including:
+      br
+      ul
+        li Pets and Mounts! Now you can use the app to hatch pets, feed them, and equip pets and mounts.
+        li The World Boss! Now you can view the World Boss Battle from the Tavern on the app!
+        li The Enchanted Armoire! Tap right from the app for a chance at equipment, Experience, or food.
+        li Edit Task Attributes! Assign attributes to tasks for use with task-based point allocation.
+        li Crash and Bug Fixes! Including fixes for incorrectly-locked backgrounds, date display, editing task attribution allocation, and more.
+      br
+      p If you like what we're doing with the app, please consider leaving a review! It means a lot to us.
+      p.small.muted by viirus, saranlert, schrockblock, ablx and jeubank12
+  tr
+    td
+      .npc_matt_broken.pull-right
+      h3 World Boss: Second Beguilement Strike!
+      p In more frightening news, the Be-Wilder has used another Beguilement Strike!
+      br
+      p Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction!
+
+if menuItem !== 'oldNews'
+  hr
+  a(href='/static/old-news', target='_blank') Read older news
+
+mixin oldNews
+  h2 4/14/2016 - ANDROID APP UPDATES!
     tr
       td
         .Pet-Wolf-Base.pull-left.slight-right-margin
@@ -9,18 +47,12 @@ h2 4/14/2016 - ANDROID APP UPDATES!
         ul
           li Pets and Mounts! Now you can use the app to hatch pets, feed them, and equip pets and mounts.
           li The World Boss! Now you can view the World Boss Battle from the Tavern on the app!
-        li The Enchanted Armoire! Tap right from the app for a chance at Equipment, experience, or food.
-        li Edit Attribute Points! Control how Attribute Points are assigned directly from the app.
+          li The Enchanted Armoire! Tap right from the app for a chance at equipment, Experience, or food.
+          li Edit Task Attributes! Assign attributes to tasks for use with task-based point allocation.
           li Crash and Bug Fixes! Including fixes for incorrectly-locked backgrounds, date display, editing task attribution allocation, and more.
         br
         p If you like what we're doing with the app, please consider leaving a review! It means a lot to us.
         p.small.muted by viirus, saranlert, schrockblock, ablx and jeubank12
-
-if menuItem !== 'oldNews'
-  hr
-  a(href='/static/old-news', target='_blank') Read older news
-
-mixin oldNews
   h2 4/12/2016 - APRIL PET QUEST: FALCON!
     tr
       td