mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-07-14 02:02:19 +00:00
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 commit842fbe42a8) * chore(i18n): update locales (cherry picked from commitb2225f05e5) * Merge branch 'stripe-webhook' into develop (cherry picked from commit30f514e46f) * 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 commit4846bc5769) * stripe webhook for unpaid subs: add 3 days of remaining time (cherry picked from commit1d7b733759) * 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 commit03088f1d9f) * chore(sprites): compile (cherry picked from commit831b122ce2) * chore(i18n): update locales (cherry picked from commitbe1754ab07) * chore(public-docs): Community Guidelines update Also Bailey announcement (cherry picked from commit565d50dd99) * chore(i18n): update locales (cherry picked from commitd4198f8913) * 3.83.0 (cherry picked from commitea18489991) * chore(news): Bailey * rebuild shrinkwrap (cherry picked from commit96ce948e1a) * stripe webhook: fix handling of automatic requests (cherry picked from commitc4463f991b) * 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
This commit is contained in:
parent
c23062f87e
commit
7c516b7cbb
3 changed files with 30 additions and 15 deletions
2
npm-shrinkwrap.json
generated
2
npm-shrinkwrap.json
generated
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "habitica",
|
||||
"version": "3.83.0",
|
||||
"version": "3.83.5",
|
||||
"dependencies": {
|
||||
"@gulp-sourcemaps/map-sources": {
|
||||
"version": "1.0.0",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 <a href='/#/options/settings/subscription'>subscribe</a> 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 <a href='/#/options/groups/challenges/f55bbda3-f14c-407e-b238-8f82b85f126f'>the official Challenge</a> 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 <a href='/#/options/settings/subscription'>subscribe</a> 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue