Fix: Remove password reset token after successful reset (#248)

Signed-off-by: Knut Ahlers <knut@ahlers.me>

Signed-off-by: Knut Ahlers <knut@ahlers.me>

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 
 # build audiowaveform from source
 
-RUN apk add git make cmake gcc g++ libmad-dev libid3tag-dev libsndfile-dev gd-dev boost-dev libgd libpng-dev zlib-dev
+RUN apk add git make cmake gcc g++ libmad-dev libid3tag-dev libsndfile-dev gd-dev boost-dev libgd libpng-dev zlib-dev opus-dev
 RUN apk add zlib-static libpng-static boost-static
 
 RUN apk add autoconf automake libtool gettext

docs/email_setup.md

@@ -0,0 +1,32 @@
+# Configuring Emails
+
+There are several configuration options in `config/default.json`
+
+## Email Relay Configuration
+- mail_provider:
+  * `console`
+  * `smtp`
+- mail_smtp_host:
+  * the IP address or FQDN of your SMTP email relay
+- mail_smtp_port:
+  * the port used to connect to the email relay
+- mail_smtp_secure: true
+  * whether to use TLS when connecting to the SMTP email relay
+- mail_smtp_require_tls:
+  * `true`: attempt to use TLS even if the email relay doesn't advertise it, don't send the email if TLS isn't supported
+  * `false`: permits emails to be sents without using TLS
+- mail_smtp_user:
+  * the username for the SMTP email relay.
+  * comment out this line for an email relay that doesn't use authentication
+- mail_smtp_pass
+  * the password for the SMTP email relay
+  * comment out this line for an email relay that doesn't use authentication
+
+## Content of Emails
+
+- teamname:
+  * the team name appears on the emails sent by your spacedeck
+- contact_email:
+  * the email address that appears on emails being sent by your spacedeck
+- endpoint:
+  * the URL that users click on in the emails being sent by your spacedeck

locales/cs.js

@@ -0,0 +1,332 @@
+{
+	"ok": "OK",
+	"cancel": "Storno",
+	"close": "Zavřít",
+	"open": "Otevřít",
+	"folder": "Složka",
+	"save": "Uložit",
+	"saved": "Uloženo",
+	"created": "vytvořeno",
+	"duplicate": "Zduplikovat",
+	"delete": "Smazat",
+	"remove": "Odebrat",
+	"set": "nastavit",
+	"reset": "resetovat",
+	"thanks": "Díky",
+	"share": "Sdílet",
+	"signup": "Zaregistrovat se",
+	"login": "Přihlásit se",
+	"logout": "Odhlásit se",
+	"email": "E-mailová adresa",
+	"password": "Heslo",
+	"forgot_password": "Zapomenuté heslo",
+	"width": "Šířka",
+	"height": "Výška",
+	"nick": "Název",
+	"role": "Role",
+	"members": "Členové",
+	"actions": "Akce",
+	"or": "nebo",
+	"you": "vy",
+	"via": "prostřednictvím",
+	"by": "od",
+	"zero": "Nula",
+	"page": "Stránka",
+	"new": "Nevé",
+	"copy": "Zkopírovat",
+	"home": "Domů",
+	"owner": "Vlastník",
+	"space": "Prostor",
+	"second": "Druhé",
+	"not_found": "Nenalezeno.",
+	"untitled_space": "Prostor bez názvu",
+	"untitled_folder": "Složka bez názvu",
+	"untitled": "bez názvu",
+	"sure": "Opravdu to chcete?",
+	"specify": "Zadejte prosím",
+	"confirm": "Potvrďte prosím",
+	"error_unknown_email": "Tato kombinace e-mail/heslo není známa.",
+	"error_password_confirmation": "Zadání hesla se neshodují.",
+	"error_domain_blocked": "Doména, ze které přistupujete, je blokována.",
+	"error_user_email_already_used": "Tato e-mailová adresa už je používána.",
+	"support": "Podpora pro Spacedeck",
+	"offline": "Bez připojení k Internetu. Pokud chcete získat další, klikněte.",
+	"error": "Je nám líto, ale něco se pokazilo. Obraťte se na support@spacedeck.com",
+	"welcome": "Vítejte",
+	"claim": "Vaše digitální tabule.",
+	"trynow": "Vyzkoušet nyní.",
+	"about": "O nás",
+	"terms": "Všeobecné podmínky",
+	"contact": "Kontakt",
+	"privacy": "Soukromí",
+	"business_adress": "Adresa firmy",
+	"post_adress": "Poštovní adresa",
+	"phone": "Telefon",
+	"ceo": "Generální ředitel",
+	"name": "Název",
+	"confirm_subject": "Potvrzení e-mailu pro Spacedeck",
+	"confirm_body": "Děkujeme, že jste se zaregistrovali u Spacedeck.\nPokud chcete potvrdit svou e-mailovou adresu, klikněte na následující odkaz.\n",
+	"confirm_action": "Potvrdit nyní",
+	"team_invite_membership_subject": "Pozvánka do týmu pro %s",
+	"team_invite_membership_body": "Byli jste pozváni do %s na Spacedeck. Pokud chcete pozvání přijmout, klikněte na následující odkaz.",
+	"team_invite_user_body": "Byli jste pozvání do %s na Spacedeck.\nVaše dočasné heslo je „%s“.\nPokud chcete pozvání přijmout, klikněte na následující odkaz.",
+	"team_invite_admin_body": "%s byl(a) pozván(a) do vašeho týmu: %s. Dočasné heslo je „%s“.",
+	"team_invite_membership_acction": "Přijmout",
+	"team_new_member_subject": "Nový člen týmu pro %s zaregistrován",
+	"team_new_member_body": "%s se právě přidal k týmu %s na Spacedeck.",
+	"space_invite_membership_subject": "%s vás pozval(a) do prostoru %s ",
+	"space_invite_membership_body": "Byli jste pozvání %s, abyste se připojili do prostoru %s na Spacedeck. Pokud chcete pozvání přijmout, klikněte na následující odkaz.",
+	"space_invite_membership_action": "Přijmout",
+	"folder_invite_membership_subject": "Prostor",
+	"folder_invite_membership_body": "Byli jste pozvání do týmu na Spacedeck. Pokud chcete pozvání přijmout, kliněte na následující odkaz.",
+	"folder_invite_membership_acction": "Přijmout",
+	"login_google": "Přihlásit se Google účtem",
+	"save_changes": "Uložit změny",
+	"upgrade": "Přejít na vyšší variantu",
+	"upgrade_now": "Přejí na vyšší variantu nyní",
+	"create_space": "Vytvořit prostor",
+	"create_folder": "Vytvořit složku",
+	"email_unconfirmed": "E-mail nepotvrzen",
+	"confirmation_sent": "E-mail odeslán",
+	"folder_filter": "Filtrovat",
+	"sort_by": "Seřadit podle",
+	"last_modified": "Naposledy změněno",
+	"last_opened": "Naposledy otevřeno",
+	"title": "Nadpis",
+	"edit_team": "Upravit tým",
+	"edit_account": "Upravit účet",
+	"log_out": "Odhlásit se",
+	"no_spaces_yet": "Vítejte! Prostory a složky zde můžete vytvářet pomocí tlačítek v levé horním rohu.",
+	"new_folder_title": "Nový název složky",
+	"folder_settings": "Nastavení složky",
+	"upload_cover_image": "Nahrát obrázek pro desky",
+	"spacedeck_pro_ad_folders": "Se Spacedeck Pro, je možné ve složkách organizovat neomezené množství prostorů a spravovat přístup pro každou ze složek. Chcete se dozvědět víc o funkcích této vyšší varianty?",
+	"spacedeck_pro_ad_versions": "Se Spacedeck Pro, je možné ukládat neomezený počet verzí každého prostoru a sledovat tak svůj postup nebo si tak ukládat průběžné  stavy. Chcete se dozvědět víc o funkcích této vyšší varianty?",
+	"spacedeck_pro_ad_pdf": "Se Spacedeck Pro, je možné exportovat vaše prostory jako PDF soubory pro účely archivace, odesílání e-mailem nebo tisk. Chcete se dozvědět víc o funkcích této vyšší varianty?",
+	"spacedeck_pro_ad_zip": "Se Spacedeck Pro, je možné exportovat obsah prostoru jako ZIP balíček. Chcete se dozvědět víc o funkcích této vyšší varianty?",
+	"spacedeck_pro_ad_colors": "Se Spacedeck Pro, je možné míchat své vlastní barvy pomocí profesionálního voliče barev.",
+	"profile_caption": "Profil",
+	"upload_avatar": "Nahrát profilový obrázek",
+	"uploading_avatar": "Nahrát profilový obrázek…",
+	"avatar_dimensions": "Doporučené rozměry: 200×200 pixelů.",
+	"profile_name": "Jméno",
+	"profile_email": "E-mailová adresa",
+	"send_again": "Poslat znovu",
+	"confirmation_sent_long": "E-mail s odkazem pro potvrzení odeslán. Podívejte se do své schránky.",
+	"confirmation_sent_another": "Odeslán další odkaz pro potvrzení.",
+	"confirmation_sent_dialog_text": "Poslali jsme vám e-mail vysvětlující jak potvrdit svou e-mailovou adresu.",
+	"payment_caption": "Platba",
+	"language_caption": "Jazyk",
+	"notifications_caption": "Upozornění",
+	"notifications_option_chat": "E-mailem mne informujte o nových komentářích",
+	"notifications_option_spaces": "Posílejte mi denní souhrn dění v mých prostorech a složkách",
+	"password_caption": "Heslo",
+	"current_password": "Stávající heslo",
+	"new_password": "Nové heslo",
+	"verify_password": "Ověřit si heslo",
+	"change_password": "Změnit si heslo",
+	"reset_password": "Resetovat heslo",
+	"terminate_caption": "Smazat účet",
+	"terminate_warning": "Pokud svůj účet smažete, budou veškeré prostory, složky a zprávy, včetně obsahu, který jste vy a další lidé vytvořili ve vašich prostorech ZLIKVIDOVÁNY.",
+	"terminate_warning2": "Toto už nepůjde napravit.",
+	"terminate_reason": "Zpráva",
+	"terminate_reason_caption": "Pomozte nám zlepšit se sdělením vašeho dúvodu pro zrušení.",
+	"terminate_terminate": "Ukončit",
+	"space_blank1": "Vítejte v novém prostoru!",
+	"space_blank2": "Přetáhněte sem soubory, vkládejte odkazy",
+	"space_blank3": "nebo použijte níže uvedené nástroje",
+	"space_blank4": "a zaplňte tento prostor obsahem.",
+	"draft": "Koncept",
+	"publish": "Zveřejnit",
+	"published": "Zveřejněno",
+	"save_version": "Uložit verzi",
+	"version_saved": "Verze uložena",
+	"post": "Odeslat zprávu",
+	"chat_invite_cta1": "Spolupráce je zábava!",
+	"chat_invite_cta2": "Proč ",
+	"chat_invite_cta3": "nepozvat nějaké lidi",
+	"chat_invite_cta4": "ke společné práci?",
+	"chat_message_placeholder": "Napiště zprávu od vás…",
+	"view": "Zobrazit",
+	"edit": "Upravit",
+	"present": "Přezentovat",
+	"chat": "Chat",
+	"meta": "Meta",
+	"tool_search": "Hledat",
+	"tool_upload": "Nahrát",
+	"tool_text": "Text",
+	"tool_shape": "Tvar",
+	"tool_zones": "Oblasti",
+	"tool_canvas": "Plátno",
+	"search_media": "Hledat média…",
+	"type_here": "Pište sem",
+	"text_formats": "Formáty",
+	"format_p": "Odstavec",
+	"format_bullets": "Seznam s odrážkami",
+	"format_numbers": "Číslovaný seznam",
+	"format_h1": "Nadpis 1",
+	"format_h2": "Nadpis 2",
+	"format_h3": "Nadpis 3",
+	"font_size": "Velikost písma",
+	"line_height": "Výška řádku",
+	"tool_align": "Zarovnat",
+	"tool_styles": "Styly",
+	"tool_bullets": "Odrážky",
+	"tool_numbers": "Čísla",
+	"tool_font": "Písmo",
+	"color_fill": "Vyplnit",
+	"color_stroke": "Čára",
+	"color_text": "Text",
+	"tool_type": "Typ",
+	"tool_box": "Box",
+	"tool_link": "Odkaz",
+	"tool_layout": "Rozvržení",
+	"tool_options": "Předvolby",
+	"tool_stroke": "Čára",
+	"tool_delete": "Smazat",
+	"tool_lock": "Uzamknout",
+	"tool_copy": "Zkopírovat",
+	"stack": "Na sebe",
+	"tool_circle": "Kruh",
+	"tool_hexagon": "Šestiúhelník",
+	"tool_square": "Čtverec",
+	"tool_diamond": "Diamant",
+	"tool_bubble": "Bublina",
+	"tool_cloud": "Mrak",
+	"tool_burst": "Dávka",
+	"tool_star": "Hvězda",
+	"tool_heart": "Srdce",
+	"tool_scribble": "Kreslení",
+	"tool_line": "Čára",
+	"tool_arrow": "Šipka",
+	"search_media_placeholder": "HLedat webová média…",
+	"add_zone": "Nová oblast",
+	"palette": "Paleta",
+	"picker": "Volič",
+	"background_image_caption": "Obrázek",
+	"background_color_caption": "Barva",
+	"upload_background_caption": "Obrázek pro pozadí nahrajete kliknutím",
+	"upload_background": "Nahrát pozadí",
+	"access_caption": "Přístup",
+	"versions_caption": "Verze",
+	"info_caption": "Informace",
+	"mode_private": "Soukromé: Upravovat mohou pouze členové",
+	"mode_public": "Veřejné: Zobrazit si může kdokoli, kdo má odkaz",
+	"invite_collaborators": "Pozvat spolupracovníky",
+	"revoke_access": "Zrušit přístup",
+	"invite": "Odeslat pozvánky",
+	"invitee_email_address": "E-mailová adresa nového člena",
+	"optional_message": "Volitelná zpráva",
+	"role_viewer": "Prohlížející si",
+	"role_editor": "Editor",
+	"role_admin": "Správce",
+	"new_space_title": "Nový název pro prostor",
+	"team": "Tým",
+	"search": "Hledat",
+	"search_no_results": "nic nenalezeno",
+	"search_clear": "vyčistit hledání",
+	"rename": "přejmenovat",
+	"mobile": "mobilní",
+	"image": "obrázek",
+	"tool_filter": "filtrovat",
+	"canel": "kanál",
+	"invite_membership_action": "akce pozvání člena",
+	"viewer": "prohlížející si",
+	"editor": "editor",
+	"admin": "správce",
+	"logging_in": "přihlašování se",
+	"password_confirmation": "Potvrzení hesla",
+	"confirm_again": "Poslali jsme vám e-mail vysvětlující jak potvrdit svou e-mailovou adresu.",
+	"confirmed": "Váš účet byl úspěšně potvrzen. Děkujeme.",
+	"signing_up": "Registrace",
+	"password_check_inbox": "Podívejte se do své schránky",
+	"new_space": "Nový prostor",
+	"tool_more": "Více",
+	"what_is_your_name": "Vítejte v %s! Zvolte si uživatelské jméno.",
+	"lang": "cs",
+	"landing_title": "Vaše tabule na webu.",
+	"landing_claim": "Spacedeck umožňuje snadno kombinovat všechny možné druhy virtuálních tabulí: textové poznámky, fotky, webové odkazy, dokonce video a zvukové nahrávky. ",
+	"landing_example": "Lidé Spacedeck používají pro uspořádávání si svých nápadů, v týmech pro zobrazení přehledu projektů, nebo na školách a univerzitách pro pestřejší, propojené zážitky z učení se.",
+	"spaces": "Mé prostory",
+	"access_editor_link": "Odkaz pro okamžité upravování",
+	"access_editor_link_desc": "Tento odkaz pošlete komukoli, kdo by měl být schopen tento prostor okamžitě upravovat, není zapotřebí žádný účet: ",
+	"access_editor_link_desc_slug": "Tento odkaz obsahuje také název prostoru. ",
+	"access_anonymous_edit_blocking": "Anonymní editoři mohou měnit pouze své vlastní položky",
+	"access_current_members": "Stávající členové",
+	"access_new_members": "Pozvat nové členy",
+	"access_no_members": "Členové tohoto prostoru se zobrazí zde.",
+	"comments": "komentáře",
+	"landing_customers": "Oblíbené u tisíců dalších uživatelů.",
+	"landing_features_title": "Snadno použitelné.",
+	"landing_features_text": "Nový Spacedeck 5 má zjednodušené, hezké uživatelské rozhraní, které usnadňuje a zpříjemňuje práci ještě více, než předtím – a přitom poskytuje ještě výkonnější funkce:",
+	"landing_features_1": "<b>Přetahujte sem</b> obrázky, videa a zvukové soubory ze svého počítače nebo webu",
+	"landing_features_2": "<b>Pište a formátujte text</b>t s úplnou kontrolou nad písmy, barvami a styly",
+	"landing_features_3": "<b>Kreslete, opatřujte poznámkami a zvýrazňujte</b> pomocí poskytovaných grafických tvarů",
+	"landing_features_4": "Udělejte ze své tabule <b>přezentaci s přibližováním</b>",
+	"landing_features_5": "<b>Spolupracujte a chatujte</b> v reálném čase s členy týmu, studenty nebo přáteli.",
+	"landing_features_6": "<b>Sdílejte prostory</b> prostřednictvím webu nebo e-mailu",
+	"landing_features_7": "<b>Exportujte svou práci</b> jako tisknutelné PDF nebo ZIP",
+	"landing_pricing": "Velmi levné.",
+	"landing_pricing_lite": "Zdarma / osobní použití",
+	"landing_pricing_lite_text": "Základní verze pro shromažďování obrázků a uchovávání poznámek.",
+	"landing_pricing_pro_features_list": "<ul><li>Neomezené prostory</li><li>Složky</li><li>Export do PDF a ZIP</li><li>Bez vodoznaků</li><li>Uživatelsky určená pozadí</li><li>Historie aktivit</li><li>20 GB úložiště</li><ul>",
+	"landing_pricing_pro": "4,90 € za uživatele a měsíc. <br><small>nebo 49,90 € za uživatele a rok</small>",
+	"landing_pricing_pro_text": "Nabité všemy schopnostmi, které očekáváte.",
+	"landing_pricing_pro_features": "Nabité všemy schopnostmi, které očekáváte.",
+	"welcome_subject": "Vítejte ve Spacedeck",
+	"welcome_body": "Zdravíme!\nDěkujeme, že jste se zaregistrovali ha Spacedeck.<br>Douváme, že se vám práce v prostorech bude líbit.<br>Pamatujte, že váš účet obsahuje neomezený počet spolupracovníků. Klidně sdílejte své prostory přátelům a kolegům po celém světě.",
+	"invite_emails": "E-mailové adresy (oddělované čárkou)",
+	"history_recently_updated": "Nedávno aktualizováno",
+	"history_recently_empty": "Doposud se nic nestalo.",
+	"parent_folder": "nadřazená složka",
+	"created_by": "Vytvořil(a)",
+	"last_updated": "Naposledy aktualizováno",
+	"feedback_sent": "Děkujeme za zpětnou vazbu!",
+	"role_member": "Člen",
+	"team_invite_membership_action": "Přijmout pozvání",
+	"space_message_subject": "Nová zpráva v prostoru %s",
+	"space_message_body": "%s napsal(a) v %s: \n",
+	"pro_ad_history_headline": "Pokud přejdete na Spacedeck Pro, uvidíte zde historii nedávných aktualizací napříš všemi vašimi (sdílenými) prostory.",
+	"password_reset_subject": "Reset Password for Spacedeck",
+	"password_reset_body": "Vyžádali jste si resetování vašeho hesla do Spacedeck.\nPokud chcete nastavit nové heslo, klikněte na následující odkaz.",
+	"password_reset_action": "Resetovat nyní",
+	"was_offline": "Spojení se Spacedeck bylo přerušeno. Pokud máte neuloženou práci, ponechte tento panel prohlížeče otevřený dokud nebude spojení znovu navázáno, pak znovu proveďte jakoukoli operaci na doposud neuložených objektech.",
+	"subscription_failed_user_subject": "Problém s vaší platbou za Spacedeck",
+	"subscription_failed_user_body": "Je nám líto, nepodařilo se nám zpracovat vaší platební metodu. V nastavení svého účtu můžete snadno vytvořit novou, včetně PayPal.",
+	"subscription_failed_team_subject": "Problém s vaší platbou za Spacedeck",
+	"subscription_failed_team_body": "Je nám líto, ale nepodařilo se zpracovat platební metodu pro váš týmový účet. Prosíme opravte svou platební metodu co možná nejdříve.",
+	"team_name": "Název týmu",
+	"subdomain": "Dílčí doména",
+	"team_adresses": "E-mailová adresa",
+	"add": "Přidat",
+	"invited": "pozván(a)",
+	"duplicate_destination": "Do které složky chcete tento prostor zduplikovat?",
+	"duplicate_confirm": "Zduplikovat %s do %s?",
+	"duplicate_success": "%s bylo zduplikováno do %s.",
+	"goto_space": "Přejít na prostor %s",
+	"goto_folder": "Přejít do složky %s",
+	"stay_here": "Zůstat zde",
+	"sharing": "Sdílení",
+	"list": "Exportovat seznam",
+	"link": "Odkaz",
+	"download_space": "Stáhnout si prostor",
+	"download_as_pdf": "Stáhnout si prostor jako PDF",
+	"type": "Typ",
+	"download": "Stáhnout si",
+	"Previous Zone": "Předchozí oblast",
+	"Next Zone": "Následující oblast",
+	"promote": "Povýšit",
+	"demote": "Degradovat",
+	"more": "Další",
+	"lock": "Zamknout",
+	"unlock": "Odemknout",
+	"follow_present": "Sledovat",
+	"mute_present": "Nesledovat",
+	"follow_present_help": "Pokud tento prostor přezentuje někdo další, ostatní členové automaticky sledují prezentaci. Tímto tlačítkem se toto sledování zapíná a vypíná.",
+	"export": "Export",
+	"media": "Média",
+	"tool_edit_text": "Upravit text",
+	"tool_space_help_part_one": "Pokud chcete přidat obsah, použijte lištu s nástroji.",
+	"tool_space_help_part_two": "Je možné sem přetáhnout také obrázky, zvukové a video soubory.",
+	"tool_delete_space": "Opravdu smazat „%s“?"
+}

locales/en.js

@@ -19,6 +19,7 @@
 	"logout": "Log out",
 	"email": "Email Address",
 	"password": "Password",
+	"forgot_password": "Forgot Password",
 	"width": "Width",
 	"height": "Height",
 	"nick": "Name",
@@ -324,5 +325,8 @@
 	"follow_present_help": "If someone else is presenting this Space, the other members automatically follow the presentation. Switch following on or off with this button.",
 	"export": "Export",
 	"media": "Media",
-	"tool_edit_text": "Edit Text"
+	"tool_edit_text": "Edit Text",
+	"tool_space_help_part_one": "Use the toolbar to add content.",
+	"tool_space_help_part_two": "You can also drop images or sound and video files.",
+	"tool_delete_space": "Really delete \"%s\"?"
 }

locales/fr.js

@@ -20,6 +20,7 @@
 	"logout": "Se déconnecter",
 	"email": "Adresse email",
 	"password": "Mot de passe",
+	"forgot_password": "Mot de passe oublié",
 	"width": "Largeur",
 	"height": "Hauteur",
 	"nick": "Nom",
@@ -39,9 +40,9 @@
 	"space": "Espace",
 	"second": "Seconde",
 	"not_found": "Pas trouvé.",
-	"untitled": "sans titre",
 	"untitled_space": "Espace sans titre",
 	"untitled_folder": "Dossier sans titre",
+	"untitled": "sans titre",
 	"sure": "Êtes-vous sûr ?",
 	"specify": "Veuillez préciser :",
 	"confirm": "Veuillez confirmer",
@@ -49,7 +50,7 @@
 	"error_unknown_email": "Combinaison inconnue de l'email et mot de passe.",
 	"error_password_confirmation": "Les deux mots de passe ne correspondent pas.",
 	"error_domain_blocked": "Ce domaine a été désactivé.",
-	"error_user_email_already_used": "Cette adresse email est déjà enregistré.",
+	"error_user_email_already_used": "Cette adresse email est déjà enregistrée.",
 	"support": "Aide Spacedeck",
 	"offline": "Désolé, mais les serveurs Spacedeck ne peuvent pas être atteint pour le moment. Plus d' informations ici.",
 	"error": "Désolé, une erreur s'est produite. Veuillez contacter support@spacedeck.com",
@@ -57,12 +58,12 @@
 	"claim": "Le tableau blanc partagé pour tout le monde",
 	"trynow": "Essayez-le gratuitement",
 	"about": "de nous",
-	"terms": "termes",
+	"terms": "Termes",
-	"contact": "contact",
+	"contact": "Contact",
-	"privacy": "sphère privée",
+	"privacy": "Sphère privée",
 	"business_adress": "Siège social",
 	"post_adress": "Adresse courrier",
-	"phone": "téléphone",
+	"phone": "Téléphone",
 	"ceo": "Gestionnaire",
 	"name": "name",
 	"confirm_subject": "Confirmation de l'email Spacedeck",
@@ -75,11 +76,10 @@
 	"team_invite_membership_acction": "Accept",
 	"team_new_member_subject": "New Team Member",
 	"team_new_member_body": "%s just joined Team %s on Spacedeck.",
-	"invite_emails": "Entrer les adresses email (séparées pas des virgules)",
 	"optional_message": "Message personnel (facultatif)",
 	"space_invite_membership_subject": "Invitation Espace par %s: %s",
 	"space_invite_membership_body": "Vous avez été invité par %s à Espace \"%s\"",
-	"space_invite_membership_action": "Accepter L'invitation",
+	"space_invite_membership_action": "Accepter l'invitation",
 	"folder_invite_membership_subject": "Space",
 	"folder_invite_membership_body": "You have been invited to a Team on Spacedeck. Please click on the following link to accept the invitation.",
 	"folder_invite_membership_acction": "Accept",
@@ -99,7 +99,7 @@
 	"edit_team": "Modifier l'équipe",
 	"edit_account": "Modifier le compte",
 	"log_out": "Déconnecter",
-	"no_spaces_yet": "Vous ne avez pas encore créé d'espaces.",
+	"no_spaces_yet": "Vous n'avez pas encore créé d'espace.",
 	"new_folder_title": "Nouveau titre pour le dossier",
 	"folder_settings": "Paramètres du dossier",
 	"upload_cover_image": "Charger image de couverture",
@@ -109,10 +109,10 @@
 	"spacedeck_pro_ad_zip": "Avec Spacedeck Pro, vous pouvez exporter le contenu d'un espace comme un paquet ZIP. Voulez-vous en savoir plus sur les fonctionnalités Pro?",
 	"spacedeck_pro_ad_colors": "Avec Spacedeck Pro, vous pouvez mélanger vos propres couleurs en utilisant un sélecteur de couleur professionnelle.",
 	"profile_caption": "Profil",
-	"upload_avatar": "Télécharger l'image profil",
+	"upload_avatar": "Télécharger l'image de profil",
 	"uploading_avatar": "L'image de profil est téléchargée…",
 	"avatar_dimensions": "Format suggéré: 200×200 pixels.",
-	"profile_name": "Name",
+	"profile_name": "Nom",
 	"profile_email": "Email",
 	"send_again": "Renvoyer",
 	"confirmation_sent_long": "Lien de confirmation email envoyé. Se il vous plaît vérifier votre courrier.",
@@ -126,7 +126,7 @@
 	"password_caption": "Mot de passe",
 	"current_password": "Ancien mot de passe",
 	"new_password": "Nouveau mot de passe",
-	"verify_password": "Répéter mot de passe",
+	"verify_password": "Répéter le mot de passe",
 	"change_password": "Enregistrer",
 	"reset_password": "Mot de passe oublié ?",
 	"terminate_caption": "Supprimer le compte",
@@ -208,7 +208,7 @@
 	"picker": "Mélange",
 	"background_image_caption": "Image",
 	"background_color_caption": "Couleur",
-	"upload_background_caption": "Cliquez ici pour télécharger une image de fond.",
+	"upload_background_caption": "Cliquer ici pour télécharger une image de fond.",
 	"upload_background": "Télécharger",
 	"access_caption": "Accès",
 	"versions_caption": "Versions",
@@ -222,7 +222,7 @@
 	"role_editor": "Éditeur",
 	"role_admin": "Administrateur",
 	"new_space_title": "Nouveau titre pour l'espace",
-	"invitee_email_address": "Adresse e-mail de invitee",
+	"invitee_email_address": "Adresse e-mail de l'invité",
 	"viewer": "Spectateur",
 	"editor": "Éditeur",
 	"admin": "Administrateur",
@@ -237,7 +237,8 @@
 	"logging_in": "Connexion",
 	"password_confirmation": "Confirmation du mot de passe",
 	"confirm_again": "Veuillez consulter votre boîte pour confirmer votre email.",
-	"confirmed": "Adresse email confirmée avec succès. merci!",
+	"confirmed": "Adresse email confirmée avec succès. Merci !",
+	"signing_up": "Signing Up",
 	"password_check_inbox": "password_check_inbox",
 	"what_is_your_name": "Bonjour ! Choisir un nom d'utilisateur s'il vous plaît.",
 	"landing_title": "Le tableau blanc partagé pour tout le monde.",
@@ -271,16 +272,16 @@
 	"landing_pricing_pro_features": "Avec toute la puissance que vous attendez.",
 	"welcome_subject": "Bienvenue sur Spacedeck",
 	"welcome_body": "Merci pour votre inscription à Spacedeck.\nNous espérons que vous aurez plaisir à travailler dans les Espaces. <br> Rappelez-vous que votre compte comprend un nombre illimité de collaborateurs. <br> N''hésitez pas à partager vos espaces avec des amis et collègues du monde entier.",
+	"invite_emails": "Entrer les adresses email (séparées pas des virgules)",
+	"history_recently_updated": "Nouvelles",
+	"history_recently_empty": "Rien ne se passe",
 	"parent_folder": "Dossier origine",
 	"created_by": "Créé par",
 	"last_updated": "Mis à jour",
-	"history_recently_updated": "Nouvelles",
-	"history_recently_empty": "Rien ne se passe",
-	"signing_up": "Signing Up",
 	"feedback_sent": "Merci pour votre commentaire !",
+	"role_member": "role_member",
 	"space_message_subject": "A posté sur %s",
 	"space_message_body": "%s a commenté dans %s:\n",
-	"role_member": "role_member",
 	"password_reset_subject": "Réinitialiser le Mot de passe pour Spacedeck",
 	"password_reset_body": "Salut !<br><br>Vous avez demandé la réinitialisation de votre Mot de passe.<br>Veuillez cliquer sur le lien suivant pour définir un nouveau Mot de passe.<br>",
 	"password_reset_action": "Définir un nouveau Mot de passe",
@@ -301,21 +302,26 @@
 	"goto_space": "Aller à l'espace %s",
 	"goto_folder": "Aller au dossier %s",
 	"stay_here": "Reste ici",
-	"download_space": "télécharger un espace",
+	"sharing": "Partager",
-	"download_as_pdf": "télécharger un espace comme PDF",
+	"list": "Exporter la liste",
+	"link": "Link",
+	"download_space": "Télécharger un espace",
+	"download_as_pdf": "Télécharger un espace comme PDF",
 	"type": "Type",
+	"download": "Télécharger",
 	"Previous Zone": "Zone précédent",
 	"Next Zone": "Zone suivante",
-	"list": "liste",
+	"promote": "Promouvoir",
-	"promote": "promouvoir",
+	"demote": "Rétrograder",
-	"demote": "rétrograder",
+	"lock": "Bloquer",
-	"lock": "bloquer",
+	"unlock": "Déverrouiller",
-	"unlock": "déverrouillage",
-	"link": "link",
-	"download": "download",
 	"more": "plus",
 	"follow_present": "Suivre",
 	"mute_present": "Pas suivre",
 	"follow_present_help": "follow_present_help",
-	"media": "Media"
+	"media": "Media",
+	"tool_edit_text": "Modifier le texte",
+	"tool_space_help_part_one": "Utilisez la barre d'outil pour ajouter des éléments.",
+	"tool_space_help_part_two": "Vous pouvez également déposer des fichiers images, son ou video.",
+	"tool_delete_space": "Confirmez-vous la suppression de \"%s\" ?"
 }

locales/oc.js

@@ -19,6 +19,7 @@
     "logout": "Se desconnectar",
     "email": "Adreça electronica",
     "password": "Senhal",
+    "forgot_password": "Senhal oblidat",	    
     "width": "Largor",
     "height": "Nautor",
     "nick": "Escais",
@@ -323,5 +324,9 @@
     "mute_present": "Quitar de seguir",
     "follow_present_help": "Se qualqu’un mai presenta aqueste espaci, los demai membres seguiràn automaticament la presentacion. Basculatz l’abonament a la presentacion amb aqueste boton.",
     "export": "exportar",
-    "media": "Mèdia"
+    "media": "Mèdia",
+    "tool_edit_text": "Editar tèxt",
+    "tool_space_help_part_one": "Utilizar la barra d’aisina per apondre de contengut.",
+    "tool_space_help_part_two": "Podètz tanben lisar d’imatges o de fichièrs sons o vidèos.",
+    "tool_delete_space": "Suprimir « %s » per de bon ?"
 }

middlewares/session.js

@@ -23,7 +23,12 @@ module.exports = (req, res, next) => {
   }
 
   // authentication via session/cookie
-  const token = req.cookies["sdsession"];
+  let token = req.cookies["sdsession"];
+
+  if (!token || token == null) {
+    // authentication via session/header
+    token = req.headers["x-spacedeck-auth"];
+  }
 
   if (token && token != "null" && token != null) {
     db.Session.findOne({ where: { token: token } })

package-lock.json

@@ -24,11 +24,6 @@
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz",
       "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w=="
     },
-    "@types/mime-types": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
-      "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM="
-    },
     "@types/node": {
       "version": "14.14.7",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz",
@@ -58,9 +53,12 @@
       }
     },
     "agent-base": {
-      "version": "5.1.1",
+      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "requires": {
+        "debug": "4"
+      }
     },
     "ajv": {
       "version": "6.12.6",
@@ -1280,6 +1278,11 @@
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
+    "colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -1652,6 +1655,11 @@
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
     },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+    },
     "default-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
@@ -1762,6 +1770,11 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
     },
+    "devtools-protocol": {
+      "version": "0.0.854822",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz",
+      "integrity": "sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg=="
+    },
     "dom-serializer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
@@ -2353,6 +2366,15 @@
         }
       }
     },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
     "findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -2481,26 +2503,13 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
     "fs-extra": {
-      "version": "0.6.4",
+      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha1-9G8MdbeEH40gCzNIzU1pHVoJnRU=",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "requires": {
-        "jsonfile": "~1.0.1",
+        "graceful-fs": "^4.1.2",
-        "mkdirp": "0.3.x",
+        "jsonfile": "^4.0.0",
-        "ncp": "~0.4.2",
+        "universalify": "^0.1.0"
-        "rimraf": "~2.2.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc="
-        },
-        "rimraf": {
-          "version": "2.2.8",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
-        }
       }
     },
     "fs-minipass": {
@@ -3136,9 +3145,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.8",
+      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "hpkp": {
@@ -3210,11 +3219,11 @@
       }
     },
     "https-proxy-agent": {
-      "version": "4.0.0",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "requires": {
-        "agent-base": "5",
+        "agent-base": "6",
         "debug": "4"
       }
     },
@@ -3246,9 +3255,9 @@
       "dev": true
     },
     "ignore-walk": {
-      "version": "3.0.3",
+      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
       "requires": {
         "minimatch": "^3.0.4"
       }
@@ -3300,9 +3309,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "1.3.5",
+      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
     "interpret": {
       "version": "1.4.0",
@@ -3662,9 +3671,12 @@
       "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0="
     },
     "jsonfile": {
-      "version": "1.0.1",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-6l7+QLg2kLmGZ2FKc5L8YOhCwN0="
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
     },
     "jsprim": {
       "version": "1.4.1",
@@ -3698,6 +3710,11 @@
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
+    "klona": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
+      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="
+    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -3801,10 +3818,18 @@
         "strip-bom": "^2.0.0"
       }
     },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
     "lodash": {
-      "version": "4.17.20",
+      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.assignin": {
       "version": "4.2.0",
@@ -4136,12 +4161,20 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
     "mock-aws-s3": {
-      "version": "2.6.0",
+      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/mock-aws-s3/-/mock-aws-s3-2.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/mock-aws-s3/-/mock-aws-s3-4.0.2.tgz",
-      "integrity": "sha512-eZVouXl5EKoXSDX/TRyVsIg9MXBnlL60iPBpF5XPOEMPtpftLc57nLDjqtNkWyRhTjn3jWc/oP0TaAgXv5bYKA==",
+      "integrity": "sha512-J6g3MMCuKHeuqVEOgvQfRGIfVmg6KKrED48Bux/L9rTY3NPK9TFRh/9bCf5AuzjJm9PIlwhDEO99tD8+smnTyQ==",
       "requires": {
-        "fs-extra": "0.6.4",
+        "bluebird": "^3.5.1",
-        "underscore": "1.8.3"
+        "fs-extra": "^7.0.1",
+        "underscore": "1.12.1"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.12.1",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+          "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+        }
       }
     },
     "moment": {
@@ -4205,6 +4238,11 @@
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
       "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
     },
+    "nanoid": {
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -4224,15 +4262,10 @@
         "to-regex": "^3.0.1"
       }
     },
-    "ncp": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ="
-    },
     "needle": {
-      "version": "2.5.2",
+      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
-      "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==",
+      "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==",
       "requires": {
         "debug": "^3.2.6",
         "iconv-lite": "^0.4.4",
@@ -4240,9 +4273,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
+          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
@@ -4265,6 +4298,11 @@
       "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
       "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
     },
+    "node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+    },
     "node-gyp": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
@@ -4336,9 +4374,9 @@
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.6",
+          "version": "7.1.7",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -4449,9 +4487,9 @@
       }
     },
     "nodemailer": {
-      "version": "4.7.0",
+      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.0.tgz",
-      "integrity": "sha512-IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw=="
+      "integrity": "sha512-ikSMDU1nZqpo2WUPE0wTTw/NGGImTkwpJKDIFPZT+YvvR9Sj+ze5wzu95JHkBMglQLoG2ITxU21WukCC/XsFkg=="
     },
     "nodemon": {
       "version": "2.0.7",
@@ -4617,9 +4655,9 @@
       }
     },
     "normalize-url": {
-      "version": "4.5.0",
+      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
       "dev": true
     },
     "now-and-later": {
@@ -4632,9 +4670,9 @@
       }
     },
     "npm-bundled": {
-      "version": "1.1.1",
+      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
       "requires": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -4887,16 +4925,22 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
       "requires": {
         "p-try": "^2.0.0"
       }
     },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-      "dev": true
     },
     "package-json": {
       "version": "6.5.0",
@@ -4972,6 +5016,11 @@
       "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
       "dev": true
     },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -5051,6 +5100,14 @@
         "pinkie": "^2.0.0"
       }
     },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
     "plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -5070,27 +5127,19 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.35",
+      "version": "8.2.15",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz",
-      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+      "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==",
       "requires": {
-        "chalk": "^2.4.2",
+        "colorette": "^1.2.2",
-        "source-map": "^0.6.1",
+        "nanoid": "^3.1.23",
-        "supports-color": "^6.1.0"
+        "source-map": "^0.6.1"
       },
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -5193,33 +5242,28 @@
       }
     },
     "puppeteer": {
-      "version": "3.0.0",
+      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz",
-      "integrity": "sha512-ArmIS8w+XhL4KGP05kxMousA9SFxmeirMkNNcVe5LjK4iGCbZ8qKnG4byuXMru7Ty7a9QwiMUIf80X+zmJuf2A==",
+      "integrity": "sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==",
       "requires": {
-        "@types/mime-types": "^2.1.0",
         "debug": "^4.1.0",
+        "devtools-protocol": "0.0.854822",
         "extract-zip": "^2.0.0",
-        "https-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^5.0.0",
-        "mime": "^2.0.3",
+        "node-fetch": "^2.6.1",
-        "mime-types": "^2.1.25",
+        "pkg-dir": "^4.2.0",
         "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
+        "proxy-from-env": "^1.1.0",
         "rimraf": "^3.0.2",
         "tar-fs": "^2.0.0",
         "unbzip2-stream": "^1.3.3",
         "ws": "^7.2.3"
       },
       "dependencies": {
-        "mime": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz",
-          "integrity": "sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="
-        },
         "ws": {
-          "version": "7.4.3",
+          "version": "7.4.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-          "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="
+          "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
         }
       }
     },
@@ -5611,9 +5655,9 @@
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.6",
+          "version": "7.1.7",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -5645,64 +5689,77 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sanitize-html": {
-      "version": "1.27.5",
+      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.3.3.tgz",
-      "integrity": "sha512-M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==",
+      "integrity": "sha512-DCFXPt7Di0c6JUnlT90eIgrjs6TsJl/8HYU3KLdmrVclFN4O0heTcVbJiMa23OKVr6aR051XYtsgd8EWwEBwUA==",
       "requires": {
-        "htmlparser2": "^4.1.0",
+        "deepmerge": "^4.2.2",
-        "lodash": "^4.17.15",
+        "escape-string-regexp": "^4.0.0",
+        "htmlparser2": "^6.0.0",
+        "is-plain-object": "^5.0.0",
+        "klona": "^2.0.3",
         "parse-srcset": "^1.0.2",
-        "postcss": "^7.0.27"
+        "postcss": "^8.0.2"
       },
       "dependencies": {
         "dom-serializer": {
-          "version": "1.1.0",
+          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.1.tgz",
-          "integrity": "sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==",
+          "integrity": "sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q==",
           "requires": {
             "domelementtype": "^2.0.1",
-            "domhandler": "^3.0.0",
+            "domhandler": "^4.0.0",
             "entities": "^2.0.0"
           }
         },
         "domelementtype": {
-          "version": "2.0.2",
+          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
         },
         "domhandler": {
-          "version": "3.3.0",
+          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-          "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
+          "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
           "requires": {
-            "domelementtype": "^2.0.1"
+            "domelementtype": "^2.2.0"
           }
         },
         "domutils": {
-          "version": "2.4.2",
+          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.2.tgz",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz",
-          "integrity": "sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA==",
+          "integrity": "sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==",
           "requires": {
             "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.0.1",
+            "domelementtype": "^2.2.0",
-            "domhandler": "^3.3.0"
+            "domhandler": "^4.2.0"
           }
         },
         "entities": {
-          "version": "2.1.0",
+          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
         },
         "htmlparser2": {
-          "version": "4.1.0",
+          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-          "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
+          "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
           "requires": {
             "domelementtype": "^2.0.1",
-            "domhandler": "^3.0.0",
+            "domhandler": "^4.0.0",
-            "domutils": "^2.0.0",
+            "domutils": "^2.5.2",
             "entities": "^2.0.0"
           }
+        },
+        "is-plain-object": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+          "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
         }
       }
     },
@@ -5831,9 +5888,9 @@
           }
         },
         "y18n": {
-          "version": "4.0.0",
+          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
           "dev": true
         },
         "yargs": {
@@ -6801,11 +6858,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
-    },
     "umzug": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/umzug/-/umzug-2.3.0.tgz",
@@ -6856,9 +6908,9 @@
       }
     },
     "underscore": {
-      "version": "1.8.3",
+      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
     },
     "undertaker": {
       "version": "1.3.0",
@@ -6920,6 +6972,11 @@
         "crypto-random-string": "^2.0.0"
       }
     },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -7339,20 +7396,11 @@
       }
     },
     "ws": {
-      "version": "3.3.1",
+      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
-      "integrity": "sha512-8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==",
+      "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==",
       "requires": {
-        "async-limiter": "~1.0.0",
+        "async-limiter": "~1.0.0"
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
       }
     },
     "x-xss-protection": {
@@ -7372,9 +7420,9 @@
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
-      "version": "3.2.1",
+      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
       "dev": true
     },
     "yallist": {

package.json

@@ -27,24 +27,24 @@
     "helmet": "^3.5.0",
     "i18n-2": "0.6.3",
     "log-timestamp": "latest",
-    "mock-aws-s3": "^2.6.0",
+    "mock-aws-s3": "^4.0.2",
     "moment": "^2.19.3",
     "morgan": "^1.9.1",
-    "nodemailer": "^4.6.7",
+    "nodemailer": "^6.6.0",
     "puppeteer": "8.0.0",
     "read-chunk": "^2.1.0",
     "request": "^2.88.0",
-    "sanitize-html": "^1.11.1",
+    "sanitize-html": "^2.3.3",
     "sequelize": "^4.37.6",
     "serve-favicon": "~2.4.2",
     "serve-static": "^1.13.1",
     "slug": "^1.1.0",
-    "sqlite3": "^4.0.0",
+    "sqlite3": "^4.2.0",
     "umzug": "^2.1.0",
-    "underscore": "1.8.3",
+    "underscore": "^1.13.1",
     "uuid": "^3.2.1",
     "validator": "7.0.0",
-    "ws": "3.3.1"
+    "ws": "5.2.3"
   },
   "devDependencies": {
     "gulp": "^4.0.2",

public/javascripts/spacedeck_spaces.js

@@ -487,7 +487,7 @@ var SpacedeckSpaces = {
     },
 
     delete_space: function(space) {
-      smoke.confirm("Really delete "+space.name+"?", function(confirmed) {
+      smoke.confirm(__("tool_delete_space", space.name), function(confirmed) {
         if (!confirmed) return;
         var idx = this.active_folder.children.indexOf(space);
 
@@ -502,7 +502,7 @@ var SpacedeckSpaces = {
 
           this.active_folder.children.splice(idx,1);
         }.bind(this));
-      }.bind(this));
+      }.bind(this), {ok: __("ok"), cancel: __("cancel")});
     },
 
     duplicate_space: function(space) {
@@ -528,7 +528,7 @@ var SpacedeckSpaces = {
           space.name = title;
           save_space(space);
         }
-      }.bind(this), {value: space.name});
+      }.bind(this), {value: space.name, ok: __("ok"), cancel: __("cancel")});
     },
 
     rename_folder: function(folder) {
@@ -539,7 +539,7 @@ var SpacedeckSpaces = {
           folder.name = title;
           save_space(folder);
         }
-      }.bind(this), {value: folder.name});
+      }.bind(this), {value: folder.name, ok: __("ok"), cancel: __("cancel")});
     },
 
     edit_space_title: function() {

public/javascripts/spacedeck_vue.js

@@ -121,11 +121,17 @@ function boot_spacedeck() {
   var lang = "en";
 
   window.refreshLocale = function() {
-    if (spacedeck && spacedeck.user && spacedeck.user.preferences) {
+    var old_lang = lang;
-      lang = spacedeck.user.preferences.language || "en";
+    if (spacedeck && spacedeck.user && spacedeck.user.prefs_language) {
+      lang = spacedeck.user.prefs_language || "en";
     } else if (window.browser_lang) {
       lang = window.browser_lang;
     }
+    if (lang != old_lang) {
+      i18n.init({ lng: lang, resStore: window.locales }, function(err, t) {
+        console.log("i18n initialized: "+lang);
+      });
+    }
   }
 
   window.refreshLocale();

routes/api/users.js

@@ -289,7 +289,7 @@ router.post('/password_reset_requests/:confirm_token/confirm', function(req, res
         bcrypt.genSalt(10, (err, salt) => {
           bcrypt.hash(password, salt, function(err, hash) {
             user.password_hash = hash;
-            user.password_token = null;
+            user.password_reset_token = null;
             user.save().then(function(updatedUser) {
               res.sendStatus(201);
             });

spacedeck.js

@@ -61,7 +61,7 @@ app.use(bodyParser.urlencoded({
 }));
 
 app.use(cookieParser());
-//app.use(helmet.frameguard())
+//app.use(helmet.frameguard({ action: 'SAMEORIGIN' }));
 //app.use(helmet.xssFilter())
 /*app.use(helmet.hsts({
   maxAge: 7776000000,

styles/artifact.scss

@@ -3,6 +3,7 @@
 
 .artifact {
   position: relative;
+  line-height: normal;
   //-webkit-transform: translate3d(0,0,0); // hw accel
 
   iframe {

views/partials/account.html

@@ -3,7 +3,7 @@
     <a class="btn btn-dark btn-md btn-round btn-icon" href="/spaces">
       <span class="icon icon-svg icon-sd6"></span>
     </a>
-    <h5>Edit Account</h5>
+    <h5><%=__('edit_account')%></h5>
   </div>
 
   <div class="header-right pull-right">
@@ -86,7 +86,7 @@
         </div>
 
         <div class="form-group">
-          <button class="btn btn-md btn-dark" v-on:click="save_user()">Save</button>
+          <button class="btn btn-md btn-dark" v-on:click="save_user()"><%=__('save')%></button>
         </div>
       </div>
     </div>
@@ -158,7 +158,7 @@
     </div>
 
     <div class="collapse" v-bind:class="{in:account=='terminate'}">
-      <h4>Terminate Account</h4>
+      <h4><%=__('terminate_caption')%></h4>
       <div class="modal-section labels-inline">
         <div class="form-group">
           <label class="label"><%=__("current_password")%></label>
@@ -177,7 +177,7 @@
       </div>
       
       <div class="modal-footer">
-        <button class="btn btn-stroke-darken btn-md" v-on:click="remove_account(account_remove_password, account_remove_feedback)">Terminate Account</button>
+        <button class="btn btn-stroke-darken btn-md" v-on:click="remove_account(account_remove_password, account_remove_feedback)"><%=__('terminate_caption')%></button>
       </div>
     </div>
   </div>

views/partials/login.html

@@ -36,7 +36,7 @@
         <div class="center alert alert-danger" v-if="login_error">{{login_error}}</div>
 
         <div style="margin-top:2em">
-          <a href="/password-reset">Forgot Password</a>
+          <a href="/password-reset"><%= __("forgot_password") %></a>
         </div>
       </form>
     </div>

views/partials/space.html

@@ -43,8 +43,8 @@
   <div class="space-empty" v-cloak v-if="active_view == 'space' && !present_mode && active_space_artifacts.length == 0">
     <div class="table-fake">
       <div class="cell">
-        <p>Use the toolbar to add content.<br>
+        <p><%= __('tool_space_help_part_one')%><br>
-          You can also drop images or sound and video files.</p>
+           <%= __('tool_space_help_part_two')%></p>
       </div>
     </div>
   </div>

views/partials/tool/toolbar-elements.html

@@ -41,6 +41,11 @@
       <span class="icon-label"><%=__("tool_arrow")%></span>
     </button>
 
+    <button class="btn btn-icon-labeled btn-transparent" v-on:click="start_drawing_line()" v-bind:class="{active:active_tool=='line'}" title="<%=__("tool_line")%>">
+      <span class="icon icon-tool-line"></span>
+      <span class="icon-label"><%=__("tool_line")%></span>
+    </button>
+
     <div class="dropdown bottom light center">
       <div class="btn-collapse in">
         <input type="file" multiple v-on:change="handle_image_file_upload($event)" id="image_file_upload" class="btn btn-transparent btn-icon-labeled" style="position: absolute; z-index: 1; opacity: 0;">