Merge branch 'release' into develop

2025-12-18 15:17:25 +01:00 · 2017-12-13 22:16:30 +00:00
parent 566716e2fe 6c01db8d81
commit b0ebdfeb65
13 changed files with 16 additions and 28 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.13.3",
+  "version": "4.13.4",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.13.3",
+  "version": "4.13.4",
  "main": "./website/server/index.js",
  "dependencies": {
    "@slack/client": "^3.8.1",
--- a/webpack/webpack.base.conf.js
+++ b/webpack/webpack.base.conf.js
@@ -11,7 +11,7 @@ const IS_PROD = process.env.NODE_ENV === 'production';

 const baseConfig = {
  entry: {
-    app: './website/client/main.js',
+    app: ['babel-polyfill', './website/client/main.js'],
  },
  output: {
    path: config.build.assetsRoot,
--- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,18 +1,12 @@
-.promo_armoire_backgrounds_201712 {
-  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -352px;
-  width: 141px;
-  height: 441px;
-}
 .promo_take_this {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -142px -352px;
+  background-position: -437px 0px;
  width: 114px;
  height: 87px;
 }
-.scene_bug {
+.scene_calendar {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px 0px;
-  width: 477px;
-  height: 351px;
+  width: 436px;
+  height: 368px;
 }
--- a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png
+++ b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png
--- a/website/client/components/static/newStuff.vue
+++ b/website/client/components/static/newStuff.vue
@@ -4,16 +4,11 @@
      .align-self-center.right-margin(:class='baileyClass')
      .media-body
        h1.align-self-center(v-markdown='$t("newStuff")')
-    h2 12/12/2017 - BATTLE FOR THE NET: HELP PROTECT HABITICA
+    h2 12/13/2017 - BLOG POST: THE HABITICA PLANNER
    hr
-    .scene_bug.center-block
-    p What would you do if you couldn't access your favorite websites, including Habitica, without paying an exorbitant amount to your internet service provider? In the United States, where Habitica is based, that is now a very real danger.
-    p The USA's Federal Communications Commission (FCC) is about to vote on its plan to kill net neutrality, which will let internet service providers charge extra fees, throttle internet speeds, and block access to websites like this one. This could kill a small company like Habitica.
-    p.strong Congress can stop them, but only if US citizens flood them with calls right now, asking them to defend net neutrality by stopping the FCC's vote BEFORE December 14th. Help keep Habitica free to access for everybody!
-    p(v-markdown='"**US Habiticans can call Congress using the phone numbers found [here](https://www.callmycongress.com). You can also learn more at https://www.battleforthenet.com.** Non-US Habiticans can still help us by spreading the word."')
-    p Thank you for helping protect Habitica.
-    p Warmly,
-    p Vicky, Leslie, Sabe, Phillip, Matteo, Keith, and Beth
+    p(v-markdown='"This month\'s [featured Wiki article](https://habitica.wordpress.com/2017/12/13/the-habitica-planner/) is about the Habitica Planner! We hope that it will help you as you find new ways to use Habitica for your task-management needs! Be sure to check it out, and let us know what you think by reaching out on [Twitter](https://twitter.com/habitica), [Tumblr](http://blog.habitrpg.com), and [Facebook](https://facebook.com/habitica)."')
+    .small by Beffymaroo and the Wiki Wizards
+    .scene_calendar.center-block
    br
 </template>

--- a/website/client/components/static/staticWrapper.vue
+++ b/website/client/components/static/staticWrapper.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 div
-  static-header(v-if='showContentWrap', :class='{"home-header": $route.name === "home"}')
+  static-header(v-if='showContentWrap', :class='{"home-header": ["home", "front"].indexOf($route.name) !== -1}')

  .static-wrapper
    router-view
--- a/website/client/index.html
+++ b/website/client/index.html
@@ -3,7 +3,9 @@
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Habitica</title>
+    <title>Habitica - Gamify Your Life</title>
+    <meta name="description" content="Habitica is a free habit and productivity app that treats your real life like a game. Habitica can help you achieve your goals to become healthy and happy.">
+    <meta name="keywords" content="Habits,Goals,Todo,Gamification,Health,Fitness,School,Work">
    <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,400i,700,700i|Roboto:400,400i,700,700i" rel="stylesheet">
    <link rel="shortcut icon" sizes="48x48" href="/static/icons/favicon.ico">
    <link rel="shortcut icon" sizes="192x192" href="/static/icons/favicon_192x192.png">
--- a/website/client/main.js
+++ b/website/client/main.js
@@ -1,7 +1,3 @@
-// TODO verify if it's needed, added because Axios require Promise in the global scope
-// and babel-runtime doesn't affect external libraries
-require('babel-polyfill');
-
 import Vue from 'vue';
 import AppComponent from './app';
 import {
--- a/website/client/router.js
+++ b/website/client/router.js
@@ -258,6 +258,7 @@ const router = new VueRouter({
        { name: 'features', path: 'features', component: FeaturesPage, meta: {requiresLogin: false}},
        { name: 'groupPlans', path: 'group-plans', component: GroupPlansPage, meta: {requiresLogin: false}},
        { name: 'home', path: 'home', component: HomePage, meta: {requiresLogin: false} },
+        { name: 'front', path: 'front', component: HomePage, meta: {requiresLogin: false} },
        { name: 'merch', path: 'merch', component: MerchPage, meta: {requiresLogin: false}},
        { name: 'news', path: 'new-stuff', component: NewsPage, meta: {requiresLogin: false}},
        { name: 'overview', path: 'overview', component: OverviewPage, meta: {requiresLogin: false}},
--- a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201712.png
+++ b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201712.png
--- a/website/raw_sprites/spritesmith_large/scene_bug.png
+++ b/website/raw_sprites/spritesmith_large/scene_bug.png
--- a/website/raw_sprites/spritesmith_large/scene_calendar.png
+++ b/website/raw_sprites/spritesmith_large/scene_calendar.png