krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2019-04-30 14:17:32 -05:00
parent 1135ab946e 792d5998b0
commit 9a3e208c9b
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.93.0",
"version": "4.93.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.93.0",
"version": "4.93.2",
"main": "./website/server/index.js",
"dependencies": {
"@google-cloud/trace-agent": "^3.6.0",

4
website/common/locales/en/gear.json
View File

@@ -798,9 +798,9 @@
"armorMystery201810Text": "Dark Forest Robes",
"armorMystery201810Notes": "These robes are extra warm to protect you from the ghastly cold of haunted realms. Confers no benefit. October 2018 Subscriber Item.",
"armorMystery201903Text": "Shell-ebration Armor",
"armorMystery201903Notes": "This shining garment has opals sewn into the front panel to grant you arcane powers and a fabulous look. Confers no benefit. April 2019 Subscriber Item.",
"armorMystery201903Notes": "People are dye-ing to know where you got this egg-cellent outfit! Confers no benefit. March 2019 Subscriber Item.",
"armorMystery201904Text": "Opalescent Outfit",
"armorMystery201904Notes": "People are dye-ing to know where you got this egg-cellent outfit! Confers no benefit. March 2019 Subscriber Item.",
"armorMystery201904Notes": "This shining garment has opals sewn into the front panel to grant you arcane powers and a fabulous look. Confers no benefit. April 2019 Subscriber Item.",
"armorMystery301404Text": "Steampunk Suit",
"armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
"armorMystery301703Text": "Steampunk Peacock Gown",

16
website/server/controllers/api-v3/news.js
View File

@@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
let api = {};
// @TODO export this const, cannot export it from here because only routes are exported from controllers
const LAST_ANNOUNCEMENT_TITLE = 'APRIL SUBSCRIBER ITEMS!';
const LAST_ANNOUNCEMENT_TITLE = 'LAST CHANCE FOR APRIL GOODIES!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -30,12 +30,20 @@ api.getNews = {
<div class="mr-3 ${baileyClass}"></div>
<div class="media-body">
<h1 class="align-self-center">${res.t('newStuff')}</h1>
<h2>4/25/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
<h2>4/30/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
</div>
</div>
<hr/>
<p>The April Subscriber Item Set has been revealed: <a href='/user/settings/subscription'>the Opulent Opal Item Set</a>! You only have until April 30 to receive the item set when you subscribe. If you're already an active subscriber, reload the site and then head to Inventory > Items to claim your gear!</p>
<p>Subscribers also receive the ability to buy Gems for Gold -- the longer you subscribe, the more gems you can buy per month! There are other perks as well, such as longer access to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep Habitica running. Thank you very much for your support -- it means a lot to us.</p>
<div class="promo_classes_spring2019 center-block"></div>
<h3>Last Chance for Spring Fling Outfits, Customizations, Magic Hatching Potions, and Shiny Seeds</h3>
<p>Today is the final day of the Spring Fling Festival, so if you still have any remaining Spring Fling Items that you want to buy, you'd better do it now! The special Spring Fling Equipment will not return for at least one year and will be available for gems instead of gold when it returns.</p>
<p>Pastel Skins and Shimmer Hair colors will also vanish when the Gala ends, so be sure to grab them from User > Edit Avatar!</p>
<p>Rainbow, Celestial, and Garden Magic Hatching Potions are also disappearing from the <a href='/shops/market'>Market</a> when the Gala ends. Make sure you snag all the potions you need before they're gone!</p>
<p>Plus, the <a href='/shops/seasonal'>Seasonal Shop</a> will be closing down, so now's the time to seize those final items and stock up on Shiny Seeds!</p>
<div class="promo_mystery_201904 center-block"></div>
<h3>Last Chance for Opulent Opal Set</h3>
<p>Reminder: this is the final day to <a href='/user/settings/subscription'>subscribe</a> and receive the Opulent Opal Set! Subscribing also lets you buy Gems with Gold. The longer your subscription, the more Gems you get!</p>
<p>Thanks so much for your support! You help keep Habitica running.</p>
<div class="small mb-3">by Beffymaroo</div>
</div>
`,