mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-04-14 19:56:23 +00:00
Merge branch 'release' into develop
This commit is contained in:
Sabe Jones
commit
ce1bcdeee0
14 changed files with 53 additions and 48 deletions
|
|
@ -17,7 +17,7 @@ RUN npm install -g gulp-cli mocha
|
|||
# Clone Habitica repo and install dependencies
|
||||
RUN mkdir -p /usr/src/habitrpg
|
||||
WORKDIR /usr/src/habitrpg
|
||||
RUN git clone --branch v4.44.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
|
||||
RUN git clone --branch v4.44.2 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
|
||||
RUN npm install
|
||||
RUN gulp build:prod --force
|
||||
|
||||
|
|
|
|||
2
package-lock.json
generated
2
package-lock.json
generated
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "habitica",
|
||||
"version": "4.44.2",
|
||||
"version": "4.44.3",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "habitica",
|
||||
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
|
||||
"version": "4.44.2",
|
||||
"version": "4.44.3",
|
||||
"main": "./website/server/index.js",
|
||||
"dependencies": {
|
||||
"@slack/client": "^3.8.1",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}
|
||||
.promo_earrings_headbands {
|
||||
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -565px -223px;
|
||||
background-position: -142px -534px;
|
||||
width: 297px;
|
||||
height: 147px;
|
||||
}
|
||||
|
|
@ -36,9 +36,9 @@
|
|||
}
|
||||
.promo_take_this {
|
||||
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -716px -371px;
|
||||
width: 114px;
|
||||
height: 87px;
|
||||
background-position: -326px -348px;
|
||||
width: 96px;
|
||||
height: 69px;
|
||||
}
|
||||
.scene_casting_spells {
|
||||
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
|
|
@ -46,9 +46,15 @@
|
|||
width: 312px;
|
||||
height: 222px;
|
||||
}
|
||||
.scene_hiking {
|
||||
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -565px -223px;
|
||||
width: 258px;
|
||||
height: 258px;
|
||||
}
|
||||
.scene_meditation {
|
||||
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
|
||||
background-position: -565px -371px;
|
||||
background-position: -326px -197px;
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 113 KiB |
|
|
@ -126,7 +126,7 @@
|
|||
"send": "Изпращане",
|
||||
"messageSentAlert": "Съобщението е изпратено",
|
||||
"pmHeading": "Лично съобщение до <%= name %>",
|
||||
"pmsMarkedRead": "Your Private Messages have been marked as read",
|
||||
"pmsMarkedRead": "Личните Ви съобщения бяха отбелязани като прочетени",
|
||||
"possessiveParty": "Групата на <%= name %>",
|
||||
"clearAll": "Изтриване на всички съобщения",
|
||||
"confirmDeleteAllMessages": "Наистина ли искате да изтриете всички съобщения от входящата поща? Другите потребители ще виждат изпратените от Вас съобщения.",
|
||||
|
|
@ -134,12 +134,12 @@
|
|||
"PMPlaceholderDescription": "Изберете разговор отляво",
|
||||
"PMPlaceholderTitleRevoked": "Привилегиите Ви в чата Ви бяха отнети",
|
||||
"PMPlaceholderDescriptionRevoked": "Не можете да изпращате лични съобщения, тъй като привилегиите Ви в чата Ви бяха отнети. Ако имате въпроси или притеснения относно това, моля, пишете на <a href=\"mailto:admin@habitica.com\">admin@habitica.com</a>, за да ги обсъдите с екипа.",
|
||||
"PMEnable": "Enable Private Messages",
|
||||
"PMDisable": "Disable Private Messages",
|
||||
"PMEnabledOptPopoverText": "When Private Messages are disabled, you still can send messages, but no one can send them to you.",
|
||||
"PMDisabledOptPopoverText": "Enable this option to be able to receive messages.",
|
||||
"PMDisabledCaptionTitle": "Private Messages are disabled",
|
||||
"PMDisabledCaptionText": "You still can send messages, but no one can send them to you.",
|
||||
"PMEnable": "Разрешаване на личните съобщения",
|
||||
"PMDisable": "Забраняване на личните съобщения",
|
||||
"PMEnabledOptPopoverText": "Ако личните съобщения са забранени, Вие ще можете да изпращате съобщения, но никой няма да може да изпраща на Вас.",
|
||||
"PMDisabledOptPopoverText": "Включете това, за да можете да получавате съобщения.",
|
||||
"PMDisabledCaptionTitle": "Личните съобщения са забранени",
|
||||
"PMDisabledCaptionText": "Вие можете да изпращате съобщения, но никой няма да може да изпраща на Вас.",
|
||||
"block": "Блокиране",
|
||||
"unblock": "Отблокиране",
|
||||
"pm-reply": "Изпращане на отговор",
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
"send": "Enviar",
|
||||
"messageSentAlert": "Mensagem enviada",
|
||||
"pmHeading": "Mensagem privada para <%= name %>",
|
||||
"pmsMarkedRead": "Your Private Messages have been marked as read",
|
||||
"pmsMarkedRead": "Suas Mensagens Privadas foram marcadas como lidas",
|
||||
"possessiveParty": "Grupo de <%= name %>",
|
||||
"clearAll": "Deletar Todas as Mensagens",
|
||||
"confirmDeleteAllMessages": "Tem certeza que deseja deletar todas as mensagens na sua caixa de entrada? Outros usuários ainda irão ver as mensagens que você enviou para eles.",
|
||||
|
|
@ -134,12 +134,12 @@
|
|||
"PMPlaceholderDescription": "Selecione uma conversa à esquerda",
|
||||
"PMPlaceholderTitleRevoked": "Seus privilégios do chat foram revogados",
|
||||
"PMPlaceholderDescriptionRevoked": "Você não pode enviar mensagens pois seus privilégios do chat foram revogados. Se tiver alguma pergunta ou preocupação quanto a isso, por favor envie um email para <a href=\"mailto:admin@habitica.com\">admin@habitica.com</a> para argumentar com a Equipe.",
|
||||
"PMEnable": "Enable Private Messages",
|
||||
"PMDisable": "Disable Private Messages",
|
||||
"PMEnabledOptPopoverText": "When Private Messages are disabled, you still can send messages, but no one can send them to you.",
|
||||
"PMDisabledOptPopoverText": "Enable this option to be able to receive messages.",
|
||||
"PMDisabledCaptionTitle": "Private Messages are disabled",
|
||||
"PMDisabledCaptionText": "You still can send messages, but no one can send them to you.",
|
||||
"PMEnable": "Habilitar Mensagens Privadas",
|
||||
"PMDisable": "Desabilitar Mensagens Privadas",
|
||||
"PMEnabledOptPopoverText": "Quando as Mensagens Privadas estiverem desabilitadas, você ainda pode enviar mensagens, mas ninguém poderá lhe enviar.",
|
||||
"PMDisabledOptPopoverText": "Habilite esta opção para poder receber mensagens.",
|
||||
"PMDisabledCaptionTitle": "Mensagens Privadas estão desabilitadas",
|
||||
"PMDisabledCaptionText": "Você ainda pode enviar mensagens, mas ninguém pode lhe enviar.",
|
||||
"block": "Bloquear",
|
||||
"unblock": "Desbloquear",
|
||||
"pm-reply": "Enviar uma resposta",
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
"communityReddit": "Reddit",
|
||||
"companyAbout": "Як це пряцює",
|
||||
"companyBlog": "Блоґ",
|
||||
"devBlog": "Developer Blog",
|
||||
"devBlog": "Блог розробника",
|
||||
"companyContribute": "Contribute",
|
||||
"companyDonate": "Пожертвувати",
|
||||
"companyPrivacy": "Політика конфіденційности",
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
"forgotPasswordSteps": "Введіть електронну пошту на яку ви реєстрували ваш аккаунт.",
|
||||
"sendLink": "Відправити посилання",
|
||||
"evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks [Habitica]!",
|
||||
"examplesHeading": "Players use Habitica to manage...",
|
||||
"featureAchievementByline": "Do something totally awesome? Get a badge and show it off!",
|
||||
"examplesHeading": "Гравці користуються сайтом Habitica щоб керувати ...",
|
||||
"featureAchievementByline": "Зробили щось надзвичайне? Отримайте значок та хизуйтесь ним!",
|
||||
"featureAchievementHeading": "Значки досягнень",
|
||||
"featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!",
|
||||
"featureEquipHeading": "Equipment and extras",
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
"featureSocialHeading": "Social play",
|
||||
"featuredIn": "Featured in",
|
||||
"featuresHeading": "We also feature...",
|
||||
"footerDevs": "Developers",
|
||||
"footerDevs": "Розробники",
|
||||
"footerCommunity": "Спільнота",
|
||||
"footerCompany": "Компанія",
|
||||
"footerMobile": "Мобільник",
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
"goalSample2": "Work on article for publication",
|
||||
"goalSample3": "Work on blog post",
|
||||
"goalSample4": "Japanese lesson on Duolingo",
|
||||
"goalSample5": "Read an Informative Article",
|
||||
"goalSample5": "Прочитати інформативну Статтю",
|
||||
"goals": "Цілі",
|
||||
"guidanceForBlacksmiths": "Guidance for Blacksmiths",
|
||||
"wellness": "Health",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"merch" : "Merchandise",
|
||||
"merch" : "Товари",
|
||||
"merchandiseDescription": "Looking for t-shirts, mugs, or stickers to show off your Habitica pride? Click here!",
|
||||
|
||||
"merch-teespring-summary" : "Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
|
||||
"merch-teespring-goto" : "Get a Habitica T-shirt",
|
||||
"merch-teespring-goto" : "Отримати футболку Habitica",
|
||||
|
||||
"merch-teespring-mug-summary" : "Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
|
||||
"merch-teespring-mug-goto" : "Get a Habitica Mug",
|
||||
"merch-teespring-mug-goto" : "Отримати кружку Habitica",
|
||||
|
||||
"merch-teespring-eu-summary" : "EUROPEAN VERSION : Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
|
||||
"merch-teespring-eu-goto" : "Get a Habitica T-shirt (EU)",
|
||||
|
|
@ -15,6 +15,6 @@
|
|||
"merch-teespring-mug-eu-goto" : "Get a Habitica Mug (EU)",
|
||||
|
||||
"merch-stickermule-summary" : "Stick proud Melior wherever you (or someone else) need a reminder of both present and future accomplishments!",
|
||||
"merch-stickermule-goto" : "Get Habitica stickers"
|
||||
"merch-stickermule-goto" : "Отримайте наклейки Habitica"
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,10 +33,6 @@ const featuredItems = {
|
|||
type: 'quests',
|
||||
path: 'quests.butterfly',
|
||||
},
|
||||
{
|
||||
type: 'bundles',
|
||||
path: 'bundles.cuddleBuddies',
|
||||
},
|
||||
],
|
||||
seasonal: '',
|
||||
timeTravelers: [
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 1.5 KiB |
BIN
website/raw_sprites/spritesmith_large/scene_hiking.png
Normal file
BIN
website/raw_sprites/spritesmith_large/scene_hiking.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -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 = 'LAST CHANCE FOR FAIRY POTIONS AND PEACOCK SET';
|
||||
const LAST_ANNOUNCEMENT_TITLE = 'JUNE 2018 RESOLUTION SUCCESS CHALLENGE AND TAKE THIS CHALLENGE';
|
||||
const worldDmg = { // @TODO
|
||||
bailey: false,
|
||||
};
|
||||
|
|
@ -32,21 +32,24 @@ api.getNews = {
|
|||
<h1 class="align-self-center">${res.t('newStuff')}</h1>
|
||||
</div>
|
||||
</div>
|
||||
<h2>5/31/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
|
||||
<h2>6/1/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
|
||||
<hr/>
|
||||
<div class="media align-items-center">
|
||||
<div class="media">
|
||||
<div class="media-body">
|
||||
<h3>Last Chance for Phenomenal Peacock Set</h3>
|
||||
<p>Reminder: this is the final day to <a href='/user/settings/subscription' target='_blank'>subscribe</a> and receive the Phenomenal Peacock Set! Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems you get!</p>
|
||||
<p>The Habitica team has launched a special official Challenge series hosted in the <a href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99' target='_blank'>Official New Year's Resolution Guild</a>. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses. For this month's Challenge, <a href='/challenges/07f492bc-3d0a-460e-a525-165dd219a91d' target='_blank'>Mark Your Journey</a>, we're reflecting on your achievements since January and looking ahead to the rest of the year! It has a 15 Gem prize, which will be awarded to five lucky winners on July 2nd.</p>
|
||||
<p>Congratulations to the winners of the May Challenge, RubberSoul, Carolee, MyNameIsNotRyn, Rapunculus IV, and notunremarkable!</p>
|
||||
</div>
|
||||
<div class="promo_mystery_201805"></div>
|
||||
<div class="scene_hiking ml-3"></div>
|
||||
</div>
|
||||
<p>Thanks so much for your support! You help keep Habitica running.</p>
|
||||
<div class="small mb-3">by Beffymaroo</div>
|
||||
<h3>Last Chance for Fairy Hatching Potions</h3>
|
||||
<p>Reminder: this is the final day to <a href='/shops/market' target='_blank'>buy Fairy Hatching Potions</a>! If they come back, it won't be until next year at the earliest, so don't delay!</p>
|
||||
<div class="small mb-3">by Edge</div>
|
||||
<div class="promo_fairy_potions center-block"></div>
|
||||
<p>The next Take This Challenge has also launched, <a href='/challenges/f0481f95-1dde-4ae7-a876-d19502a45d61' target='_blank'>Hero's Triumph!</a>, with a focus on volunteer efforts. Be sure to check it out to earn additional pieces of the Take This armor set!</p>
|
||||
<div class="media">
|
||||
<div class="promo_take_this mr-3 mb-3"></div>
|
||||
<div class="media-body">
|
||||
<p><a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.</p>
|
||||
</div>
|
||||
</div>
|
||||
<p>Congratulations to the winners of the last Take This Challenge, "Keep Calm and Carry On!": grand prize winner Betsy, and runners-up Caiwan (Sári Péter), tebrilas, Christopher, eeyoregirl, and Serenity. Plus, all participants in that Challenge have received a piece of the <a href='http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set' target='_blank'>Take This item set</a> if they hadn't collected all the pieces already. It is located in your Rewards column. Enjoy!</p>
|
||||
<div class="small mb-3">by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat</div>
|
||||
</div>
|
||||
`,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ schema.methods.sendMessage = async function sendMessage (userToReceiveMessage, o
|
|||
sender.markModified('inbox.messages');
|
||||
|
||||
if (saveUsers) {
|
||||
await Promise.all(userToReceiveMessage.save(), sender.save());
|
||||
await Promise.all([userToReceiveMessage.save(), sender.save()]);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue