From 7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 3 Apr 2017 16:34:37 -0500 Subject: [PATCH] Release Mergeback (#8644) * Remove email addresses from translatable strings (#8448) * Fix User > Profile showing {getProgressDisplay()} * Remove bad nextRewardAt check * 1st iteration of issue #8385 - more pending * #8385 config and jade fixes, tests pending * #8385 fixing lint errors * Fix faqs string and test * Fix faq.jade and add workaround for faq.js * Fixing accidental checking for faq.js * fix emails in faq.js * fetch emails once in auth.js * Fixing community manager email in auth.js (cherry picked from commit 842fbe42a8ada502d09ad5754755bb7c40e64af9) * chore(i18n): update locales (cherry picked from commit b2225f05e52b026d6c476b999943bc9b8094f270) * Merge branch 'stripe-webhook' into develop (cherry picked from commit 30f514e46fb8cc79ca7203c442d72c345ff3a22c) * add recent Grand Gala seasonal special equipment names (#8606) This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop. (cherry picked from commit 4846bc57692a8fc709a5cf86098053db4347edf2) * stripe webhook for unpaid subs: add 3 days of remaining time (cherry picked from commit 1d7b7337591b49c8a1c3de87490b3068309662d6) * New default background (#8597) * feat(bgs): new default background * feat(bgs): backfill migration * fix(migration): extraneous imports, bad paths * fix(bgs): address comments * fix(test): assert equality (cherry picked from commit 03088f1d9f1d18e74aa6a02e27203dd36ed1c967) * chore(sprites): compile (cherry picked from commit 831b122ce2f9978f0b0db2212eb6ab504799118c) * chore(i18n): update locales (cherry picked from commit be1754ab073653fdec3b243de66a18b992f1163e) * chore(public-docs): Community Guidelines update Also Bailey announcement (cherry picked from commit 565d50dd99ba277403e839cde67a7dcc3d088ba0) * chore(i18n): update locales (cherry picked from commit d4198f8913f241bfc928efee4dd44678b81ac788) * 3.83.0 (cherry picked from commit ea184899913e1ba7636c3618e3a0ed660e33abf3) * chore(news): Bailey * rebuild shrinkwrap (cherry picked from commit 96ce948e1a941cda4ee921095d3c072191348541) * stripe webhook: fix handling of automatic requests (cherry picked from commit c4463f991b8a6e7c46a40a43151cdd6aa9cf808b) * 3.83.1 * v3.83.2 - April Fools 2017 (#8632) * feat(event): April Fools 2017 * feat(event): NPCs and Bailey * fix(event): tweak NPCs, add challenge link * chore(sprites): compile * 3.83.2 * v3.83.3 Fooling Fix (#8633) * fix(fooling): add logic to party and member modals * 3.83.3 * v3.83.4 Export fooling (#8634) * fix(fooling): allow export * 3.83.4 * v3.83.5 End Fooling (#8638) * chore(event): no more foolin * chore(sprites): compile * 3.83.5 * fix(merge-conflict): prefer develop for config.json.example * fix(merge-conflict): fewer istanbul deps --- npm-shrinkwrap.json | 2 +- package.json | 2 +- website/views/shared/new-stuff.jade | 41 ++++++++++++++++++++--------- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a12e65d1e2..a232dccd70 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "3.83.0", + "version": "3.83.5", "dependencies": { "@gulp-sourcemaps/map-sources": { "version": "1.0.0", diff --git a/package.json b/package.json index 1fbd0b3cc7..201e42ef6d 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": "3.83.0", + "version": "3.83.5", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index bd6889b324..acf5b4b5db 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,28 +1,43 @@ -h2 3/30/2017 - LAST CHANCE FOR SHIMMER ARMOR SET, AND... WHAT IS THE APRIL FOOL UP TO? +h2 4/1/2017 - THE APRIL FOOL'S DISTRACTION DISCOTHEQUE AND DAZZLE DANCE EMPORIUM hr tr td - .npc_aprilFool.pull-right - h3 Be on the Lookout for Weekend Shenanigans... - p The April Fool has been looking awfully cheerful recently. TOO cheerful... He promises that he's not planning any shenanigans at the turn of the month, but we suspect that this masterful Rogue may have some tricks up his sleeves. - br - p "Nonsense!" he says. "Me, interfere on April Fool's Day? Why, you won't even see me." - br - p Perhaps you should check back over the weekend, just in case... + h3 Welcome to the Distraction Discotheque and Dazzle Dance Emporium! + p "It's a marvelous day, and I, Bailey the Town DJ, would like to warmly welcome you to the Distraction Discotheque and Dazzle Dance Emporium! This festive location was set up by the dashing, brilliant, and humble April Fool. It's entirely devoted to sparkly diversion -- and avoiding productivity at all costs! tr td - .promo_mystery_201703.pull-left.slight-right-margin - h3 Last Chance for Shimmer Armor Set - p Reminder: this is the final day to subscribe and receive the Shimmer Armor Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get! + h3 Rad New NPCs! + p Be sure to check out all your favorite places on Habitica today to visit the Non-Player Characters, a set of ENTIRELY unique individuals, as I... er, they... have a grand time and dance the day away! + tr + td + h3 Party with the April Fool and Win Gems! + p You're going to have a wonderful time, not least of all because the April Fool, in his endless magnanimity, is making the time to party with every single one of you -- take a peek at your avatar! br - p Thanks so much for your support! You help keep Habitica running. - p.small.muted by Lemoness + p For even more fun, check out the official Challenge posted especially for today! Share your avatar featuring that fantastic Fool on social media, and you'll have a chance to win gems. Now go boogie!" if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 3/30/2017 - LAST CHANCE FOR SHIMMER ARMOR SET, AND... WHAT IS THE APRIL FOOL UP TO? + tr + td + .npc_aprilFool.pull-right + h3 Be on the Lookout for Weekend Shenanigans... + p The April Fool has been looking awfully cheerful recently. TOO cheerful... He promises that he's not planning any shenanigans at the turn of the month, but we suspect that this masterful Rogue may have some tricks up his sleeves. + br + p "Nonsense!" he says. "Me, interfere on April Fool's Day? Why, you won't even see me." + br + p Perhaps you should check back over the weekend, just in case... + tr + td + .promo_mystery_201703.pull-left.slight-right-margin + h3 Last Chance for Shimmer Armor Set + p Reminder: this is the final day to subscribe and receive the Shimmer Armor Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get! + br + p Thanks so much for your support! You help keep Habitica running. + p.small.muted by Lemoness h2 3/28/2017 - DEWINES CONTRIBUTOR SPOTLIGHT, ECO-FRIENDLY GUILD SPOTLIGHT, AND COMMUNITY GUIDELINES UPDATES tr td