From 983ea7c6c761ce2cdfb435eabb3057d01469e50d Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 29 Apr 2019 13:44:52 -0500 Subject: [PATCH 1/4] fix(strings): mixed-up armor notes --- website/common/locales/en/gear.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 5869557e2d..204afa3348 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -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", From 946147a4aa0cb136a73b2648009f5679b647fbde Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 29 Apr 2019 13:45:04 -0500 Subject: [PATCH 2/4] 4.93.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6036928e12..32c09fb876 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.93.0", + "version": "4.93.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3471e4402e..692bcf033d 100644 --- 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.93.0", + "version": "4.93.1", "main": "./website/server/index.js", "dependencies": { "@google-cloud/trace-agent": "^3.6.0", From 53515fd3f4b847efb6798cf47f41346498600f28 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 30 Apr 2019 14:17:05 -0500 Subject: [PATCH 3/4] chore(news): Bailey --- website/server/controllers/api-v3/news.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index ac80f2be43..a73aeb0146 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -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 = {

${res.t('newStuff')}

-

4/25/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

4/30/2019 - ${LAST_ANNOUNCEMENT_TITLE}

-

The April Subscriber Item Set has been revealed: the Opulent Opal Item Set! 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!

-

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.

+
+

Last Chance for Spring Fling Outfits, Customizations, Magic Hatching Potions, and Shiny Seeds

+

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.

+

Pastel Skins and Shimmer Hair colors will also vanish when the Gala ends, so be sure to grab them from User > Edit Avatar!

+

Rainbow, Celestial, and Garden Magic Hatching Potions are also disappearing from the Market when the Gala ends. Make sure you snag all the potions you need before they're gone!

+

Plus, the Seasonal Shop will be closing down, so now's the time to seize those final items and stock up on Shiny Seeds!

+
+

Last Chance for Opulent Opal Set

+

Reminder: this is the final day to subscribe and receive the Opulent Opal Set! Subscribing also lets you buy Gems with Gold. The longer your subscription, the more Gems you get!

+

Thanks so much for your support! You help keep Habitica running.

by Beffymaroo
`, From 792d5998b01daf9dc1ebd45b642db2bd377f87e4 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 30 Apr 2019 14:17:14 -0500 Subject: [PATCH 4/4] 4.93.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32c09fb876..66c685f46a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.93.1", + "version": "4.93.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 692bcf033d..c2cb74aa94 100644 --- 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.93.1", + "version": "4.93.2", "main": "./website/server/index.js", "dependencies": { "@google-cloud/trace-agent": "^3.6.0",