From 9d04827adca0ff4542d281b1d950524ab761529f Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 15 Jan 2020 12:13:10 +0100 Subject: Add ascProvider to fix notarizing on macOS I am now managing multiple apps so I had to specify the ascProvider now; it was unecessary before. --- build-helpers/notarize.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js index d799a5624..26a627bea 100644 --- a/build-helpers/notarize.js +++ b/build-helpers/notarize.js @@ -1,18 +1,19 @@ -const { notarize } = require('electron-notarize'); +const { notarize } = require("electron-notarize"); exports.default = async function notarizing(context) { const { electronPlatformName, appOutDir } = context; const isTagBuild = process.env.TRAVIS_TAG; - if (electronPlatformName !== 'darwin' || !isTagBuild) { + if (electronPlatformName !== "darwin" || !isTagBuild) { return; } const appName = context.packager.appInfo.productFilename; return await notarize({ - appBundleId: 'com.kytwb.ferdi', + appBundleId: "com.kytwb.ferdi", appPath: `${appOutDir}/${appName}.app`, + ascProvider: "B6J9X9DWFL", appleId: process.env.APPLEID, - appleIdPassword: process.env.APPLEID_PASSWORD, + appleIdPassword: process.env.APPLEID_PASSWORD }); }; -- cgit v1.2.3-70-g09d2 From e9ebf32b7fc20ed3eb61173a65c1799d09b04bf7 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 15 Jan 2020 12:31:42 +0100 Subject: Add twitter/opencollective branding resources --- branding/opencollective-header.jpg | Bin 0 -> 2229496 bytes branding/social-preview.psd | Bin 2619596 -> 0 bytes branding/social-previeww-base.psd | Bin 0 -> 2619596 bytes branding/twitter-header.jpg | Bin 0 -> 213675 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 branding/opencollective-header.jpg delete mode 100644 branding/social-preview.psd create mode 100644 branding/social-previeww-base.psd create mode 100644 branding/twitter-header.jpg diff --git a/branding/opencollective-header.jpg b/branding/opencollective-header.jpg new file mode 100644 index 000000000..4bb8d809f Binary files /dev/null and b/branding/opencollective-header.jpg differ diff --git a/branding/social-preview.psd b/branding/social-preview.psd deleted file mode 100644 index 5a01e7d68..000000000 Binary files a/branding/social-preview.psd and /dev/null differ diff --git a/branding/social-previeww-base.psd b/branding/social-previeww-base.psd new file mode 100644 index 000000000..5a01e7d68 Binary files /dev/null and b/branding/social-previeww-base.psd differ diff --git a/branding/twitter-header.jpg b/branding/twitter-header.jpg new file mode 100644 index 000000000..39d9b1cb2 Binary files /dev/null and b/branding/twitter-header.jpg differ -- cgit v1.2.3-70-g09d2 From b17b5914c8edcfcdaed1dce6b9b96dc083ffccc1 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Wed, 15 Jan 2020 22:24:02 -0500 Subject: Simplify navigation with Markdown --- README.md | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 1f50307ba..e524ffa2e 100644 --- a/README.md +++ b/README.md @@ -17,29 +17,24 @@
Toggle navigation - + +- [What is Ferdi?](#what-is-ferdi) +- [What does Ferdi look like?](#what-does-ferdi-look-like) +- [Download Ferdi](#download-ferdi) + - [Or use homebrew](#or-use-homebrew-macos-only) + - [Or use AUR (Arch Linux)](#or-use-aur-arch-linux) +- [Ferdi-specific features](#ferdi-specific-features) +- [Development](#development) + - [Install OS dependencies](#install-os-dependencies) + - [Clone repository with submodule](#clone-repository-with-submodule) + - [Install dependencies](#install-dependencies) + - [Fix native modules to match current electron node version](#fix-native-modules-to-match-current-electron-node-version) + - [Start development app](#start-development-app) + - [Packaging](#packaging) + - [Release](#release) +- [Contributors ✨](#contributors-) +- [Backers via OpenCollective](#backers-via-opencollective) +- [Sponsors via OpenCollective](#sponsors-via-opencollective)
### What is Ferdi? -- cgit v1.2.3-70-g09d2 From e64ab67aa95bc86a22c7815a86e8657c6d2062bc Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 17 Jan 2020 07:01:11 +0700 Subject: New translations en-US.json (Spanish) --- src/i18n/locales/es.json | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index ddf2b89c7..b5c46ac1e 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -25,9 +25,9 @@ "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.", "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment", "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.", - "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.", - "feature.quickSwitch.search": "Search...", - "feature.quickSwitch.title": "QuickSwitch", + "feature.quickSwitch.info": "Seleccionar servicio con TAB y ↑ ↓. Abrir servicio con ENTER.", + "feature.quickSwitch.search": "Buscar...", + "feature.quickSwitch.title": "Cambio rápido", "feature.serviceLimit.limitReached": "Has sumado {amount} servicios más de los que están incluídos en tu plan. Por favor mejora tu cuenta para sumar más servicios.", "feature.shareFranz.action.email": "Enviar como correo", "feature.shareFranz.action.facebook": "Compartir en Facebook", @@ -58,7 +58,7 @@ "import.notSupportedHeadline": "Servicios aún no admitidos en Ferdi 5", "import.skip.label": "Quiero agregar servicios manualmente", "import.submit.label": "Importar servicios", - "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", + "infobar.authRequestFailed": "Error al intentar realizar la solicitud de autenticación. Por favor, cerrar la sesión y volver a entrar si este error persiste.", "infobar.buttonChangelog": "¿Qué hay de nuevo?", "infobar.buttonInstallUpdate": "Reiniciar e instalar actualización", "infobar.buttonReloadServices": "Recargar servicios", @@ -72,12 +72,12 @@ "invite.skip.label": "Lo haré más tarde", "invite.submit.label": "Enviar invitaciones", "invite.successInfo": "Invitaciones enviadas correctamente", - "locked.headline": "Locked", - "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.", - "locked.invalidCredentials": "Password invalid", - "locked.password.label": "Password", - "locked.submit.label": "Unlock", - "login.changeServer": "Change server", + "locked.headline": "Bloqueado", + "locked.info": "Ferdi está bloqueado. Debe desbloquear Ferdi con su contraseña para ver mensajes.", + "locked.invalidCredentials": "Contraseña incorrecta", + "locked.password.label": "Contraseña", + "locked.submit.label": "Desbloquear", + "login.changeServer": "Cambiar servidor", "login.customServerQuestion": "Using a custom Ferdi server?", "login.customServerSuggestion": "Try importing your Franz account", "login.email.label": "Dirección de correo electrónico", @@ -85,7 +85,7 @@ "login.invalidCredentials": "Correo electrónico o contraseña no válidos ", "login.link.password": "Restablecer contraseña", "login.link.signup": "Crear una cuenta gratuita", - "login.password.label": "Password", + "login.password.label": "Contraseña", "login.serverLogout": "Tu sesión ha expirado, por favor inicia la sesión de nuevo.", "login.submit.label": "Iniciar sesión", "login.tokenExpired": "Tu sesión ha expirado, por favor inicia la sesión de nuevo.", @@ -93,7 +93,7 @@ "menu.Todoss.openTodosDrawer": "Abrir la pestaña de tareas", "menu.app.about": "Acerca de Ferdi", "menu.app.announcement": "¿Qué hay de nuevo?", - "menu.app.autohideMenuBar": "Auto-hide menu bar", + "menu.app.autohideMenuBar": "Auto-ocultar barra de menú", "menu.app.checkForUpdates": "Comprobar actualizaciones", "menu.app.hide": "Ocultar", "menu.app.hideOthers": "Ocultar otros", @@ -127,17 +127,17 @@ "menu.services": "Servicios", "menu.services.activatePreviousService": "Activa el servicio previo", "menu.services.addNewService": "Añadir Nuevo Servicio...", - "menu.services.goHome": "Home", + "menu.services.goHome": "Inicio", "menu.services.setNextServiceActive": "Activa el siguiente servicio", "menu.todos": "Tareas pendientes", "menu.todos.enableTodos": "Habilitar Tareas pendientes", "menu.view": "Mostrar", - "menu.view.back": "Back", + "menu.view.back": "Volver", "menu.view.enterFullScreen": "Pasar a pantalla completa", "menu.view.exitFullScreen": "Salir de Pantalla Completa", - "menu.view.forward": "Forward", - "menu.view.lockFerdi": "Lock Ferdi", - "menu.view.openQuickSwitch": "Open Quick Switch", + "menu.view.forward": "Siguiente", + "menu.view.lockFerdi": "Bloquear Ferdi", + "menu.view.openQuickSwitch": "Abrir Cambio Rápido", "menu.view.reloadFranz": "Recargar Ferdi", "menu.view.reloadService": "Recargar Servicio", "menu.view.resetZoom": "Tamaño Actual", @@ -163,24 +163,24 @@ "password.submit.label": "Enviar", "password.successInfo": "Por favor revisa tu correo electrónico", "premiumFeature.button.upgradeAccount": "Mejora tu cuenta", - "pricing.features.accountSync": "Account Synchronisation", + "pricing.features.accountSync": "Sincronización de cuenta", "pricing.features.adFree": "Sin anuncios para siempre!", "pricing.features.appDelays": "Sin pantallas de espera", "pricing.features.customWebsites": "Agregue sitios personalizados", - "pricing.features.desktopNotifications": "Desktop Notifications", + "pricing.features.desktopNotifications": "Notificaciones de escritorio", "pricing.features.onPremise": "En sitio y otros servicios alojados", - "pricing.features.recipes": "Choose from more than 70 Services", + "pricing.features.recipes": "Elegir entre más de 70 servicios", "pricing.features.serviceProxies": "Apoderados de Servicio", "pricing.features.spellchecker": "Soporte de corrector ortográfico", "pricing.features.teamManagement": "Administración de Equipo", "pricing.features.thirdPartyServices": "Instalar servicios de terceros", "pricing.features.unlimitedServices": "Agregar servicios ilimitados", - "pricing.features.upToSixServices": "Add up to 6 services", - "pricing.features.upToThreeServices": "Add up to 3 services", + "pricing.features.upToSixServices": "Añadir hasta 6 servicios", + "pricing.features.upToThreeServices": "Añadir hasta 3 servicios", "pricing.features.workspaces": "Espacios de trabajo", "pricing.plan.free": "Ferdi gratis", "pricing.plan.legacy": "Ferdi Premium", - "pricing.plan.personal": "Ferdi Personal", + "pricing.plan.personal": "Ferdi Profesional", "pricing.plan.personal-monthly": "Ferdi Personal Mensual", "pricing.plan.personal-yearly": "Ferdi Personal Anual", "pricing.plan.pro": "Ferdi Profesional", @@ -215,17 +215,17 @@ "service.restrictedHandler.customUrl.text": "Por favor suscribase al Plan Ferdi Profesional para utilizar urls personalizadas y servicios auto alojados.", "service.restrictedHandler.serviceLimit.headline": "Ha llegado al límite del servicio.", "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.", - "service.webviewLoader.loading": "Loading {service}", + "service.webviewLoader.loading": "Cargando {service}", "services.getStarted": "Primeros pasos", - "services.login": "Please login to use Ferdi.", - "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", - "services.serverless": "Use Ferdi without an Account", + "services.login": "Iniciar sesión para usar Ferdi.", + "services.serverInfo": "Opcionalmente, puede cambiar su servidor Ferdi pulsando en el icono de la esquina inferior izquierda.", + "services.serverless": "Usar Ferdi sin una cuenta", "services.welcome": "Bienvenido a Ferdi", "settings.account.account.editButton": "Editar cuenta", "settings.account.accountType.basic": "Cuenta Básica", "settings.account.accountType.premium": "Cuenta Colaborador Premium", - "settings.account.accountUnavailable": "Account is unavailable", - "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.", + "settings.account.accountUnavailable": "La cuenta no está disponible", + "settings.account.accountUnavailableInfo": "Estás usando Ferdi sin una cuenta. Si desea utilizar Ferdi con una cuenta y así mantener sus servicios sincronizados entre instalaciones, debe seleccionar un servidor en la Configuración e iniciar sesión.", "settings.account.buttonSave": "Actualizar perfil", "settings.account.deleteAccount": "Eliminar cuenta", "settings.account.deleteEmailSent": "Has recibido un correo electrónico con un enlace para confirmar la eliminación de su cuenta. ¡Tu cuenta y datos no podrán ser restaurados!", @@ -271,7 +271,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas", "settings.app.form.language": "Idioma", - "settings.app.form.lockPassword": "Password", + "settings.app.form.lockPassword": "Contraseña", "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -294,7 +294,7 @@ "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.", "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Password", + "settings.app.lockedPassword": "Contraseña", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Los cambios requieren reiniciar", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", @@ -423,7 +423,7 @@ "sidebar.addNewService": "Añadir nuevo servicio", "sidebar.closeTodosDrawer": "Close Ferdi Todos", "sidebar.closeWorkspaceDrawer": "Cerrar cajón de espacio de trabajo", - "sidebar.lockFerdi": "Lock Ferdi", + "sidebar.lockFerdi": "Bloquear Ferdi", "sidebar.muteApp": "Desactivar notificaciones y sonido", "sidebar.openTodosDrawer": "Open Ferdi Todos", "sidebar.openWorkspaceDrawer": "Abrir diseñador de espacios de trabajo", @@ -438,7 +438,7 @@ "signup.legal.privacy": "Declaración de privacidad", "signup.legal.terms": "Términos de servicio", "signup.link.login": "Ya tienes una cuenta, ¿Iniciar sesión?", - "signup.password.label": "Password", + "signup.password.label": "Contraseña", "signup.submit.label": "Crear cuenta", "subscription.bestValue": "Best value", "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial", @@ -467,9 +467,9 @@ "validation.oneRequired": "Al menos uno es requerido", "validation.required": "{field} es obligatorio", "validation.url": "{field} no es una URL válida", - "webControls.back": "Back", - "webControls.forward": "Forward", - "webControls.goHome": "Home", + "webControls.back": "Volver", + "webControls.forward": "Siguiente", + "webControls.goHome": "Inicio", "webControls.openInBrowser": "Open in Browser", "webControls.reload": "Volver a cargar", "welcome.loginButton": "Accede a tu cuenta", -- cgit v1.2.3-70-g09d2 From eaa752f068cc8dcacd274c5bfec707f775cf1109 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Fri, 17 Jan 2020 08:00:41 +0700 Subject: New translations en-US.json (Spanish) --- src/i18n/locales/es.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index b5c46ac1e..99d802a83 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -250,54 +250,54 @@ "settings.account.upgradeToPro.label": "Actualiza a Ferdi Profesional", "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario", "settings.account.yourLicense": "Su Licencia Ferdi", - "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)", + "settings.app.accentColorInfo": "Escribir color de acento en formato compatible CSS. (Predeterminado: #7367f0)", "settings.app.buttonClearAllCache": "Limpiar caché", "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización", "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones", "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.", "settings.app.currentVersion": "Versión actual:", - "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.accentColor": "Color de realce", + "settings.app.form.adaptableDarkMode": "Activar modo oscuro", "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano", "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar", "settings.app.form.beta": "Incluir versiones beta", "settings.app.form.darkMode": "Únete al Lado Oscuro", "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU", - "settings.app.form.enableLock": "Enable Password Lock", + "settings.app.form.enableLock": "Activar bloqueo por contraseña", "settings.app.form.enableSpellchecking": "Activar corrección ortográfica", "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema", "settings.app.form.enableTodos": "Activar Ferdi Todos", - "settings.app.form.hibernate": "Enable service hibernation", - "settings.app.form.hibernationStrategy": "Hibernation strategy", + "settings.app.form.hibernate": "Habilitar hibernación del servicio", + "settings.app.form.hibernationStrategy": "Estrategia de hibernación", "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas", "settings.app.form.language": "Idioma", "settings.app.form.lockPassword": "Contraseña", "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema", - "settings.app.form.noUpdates": "Disable updates", - "settings.app.form.privateNotifications": "Don't show message content in notifications", + "settings.app.form.noUpdates": "Desactivar actualizaciones", + "settings.app.form.privateNotifications": "No mostrar contenido de mensajes en notificaciones", "settings.app.form.runInBackground": "Mantener Ferdi en segundo plano al cerrar la ventana", - "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb", - "settings.app.form.scheduledDNDEnd": "To", - "settings.app.form.scheduledDNDStart": "From", - "settings.app.form.server": "Server", + "settings.app.form.scheduledDNDEnabled": "Activar programación \"No molestar\"", + "settings.app.form.scheduledDNDEnd": "A", + "settings.app.form.scheduledDNDStart": "De", + "settings.app.form.server": "Servidor", "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados", "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas", - "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", - "settings.app.form.todoServer": "Todo Server", - "settings.app.form.universalDarkMode": "Enable universal Dark Mode", + "settings.app.form.showServiceNavigationBar": "Mostrar siempre barra de navegación", + "settings.app.form.todoServer": "Servidor de tareas", + "settings.app.form.universalDarkMode": "Activar modo oscuro universal", "settings.app.headline": "Configuración", "settings.app.headlineAdvanced": "Avanzado", "settings.app.headlineAppearance": "Apariencia", "settings.app.headlineGeneral": "General", "settings.app.headlineLanguage": "Idioma", "settings.app.headlineUpdates": "Actualizaciones", - "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", + "settings.app.hibernateInfo": "Por defecto, Ferdi mantendrá todos sus servicios abiertos y cargados en segundo plano para que estén listos cuando los necesite. La hibernación del servicio desactivará los mismos tras el tiempo especificado. Esto es útil para ahorrar RAM y evitar que los servicios ralentizen su sistema.", "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.", - "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockInfo": "El bloqueo de contraseña le permite mantener los mensajes protegidos.\nSi activa el bloqueo de contraseña, se le pedirá introducirla cada vez que inicie o bloquee Ferdi usando el símbolo de la esquina inferior izquierda o bien el acceso directo CMD/CTRL+Shift+L.", "settings.app.lockedPassword": "Contraseña", - "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", + "settings.app.lockedPasswordInfo": "Por favor, asegúrese de recordar la contraseña que establezca.\nSi la perdiera u olvidara, tendría que reinstalar Ferdi.", "settings.app.restartRequired": "Los cambios requieren reiniciar", - "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", + "settings.app.scheduledDNDInfo": "El \"No molestar\" programado permite definir un período de tiempo en el que no recibir notificaciones de Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", -- cgit v1.2.3-70-g09d2 From 866274ec7c8a45afe3a0af87809f59538295c9f2 Mon Sep 17 00:00:00 2001 From: Sauceee Date: Mon, 20 Jan 2020 22:26:40 +0100 Subject: Windows multisize tray ico --- src/assets/images/tray/win32/tray-unread.ico | Bin 7387 -> 41805 bytes src/assets/images/tray/win32/tray.ico | Bin 4694 -> 38281 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico index 9421512c8..34d21f185 100644 Binary files a/src/assets/images/tray/win32/tray-unread.ico and b/src/assets/images/tray/win32/tray-unread.ico differ diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico index dcb721ada..e3b7edf60 100644 Binary files a/src/assets/images/tray/win32/tray.ico and b/src/assets/images/tray/win32/tray.ico differ -- cgit v1.2.3-70-g09d2 From b78233aee3204cfcbb8aae7cb49fc404cd5cc0e8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2020 10:13:36 +0000 Subject: docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e524ffa2e..ac5ff1c87 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Steliyan Stoyanov
💻 🤔
Bror Winther
📖
Felix W. Dekker
📖 +
Sauceee
🎨 -- cgit v1.2.3-70-g09d2 From 615b33fbb006ebe5d9b1059f88b02eaf5b0dc127 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2020 10:13:38 +0000 Subject: docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 20179d7dc..3cb300bfa 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -260,6 +260,15 @@ "contributions": [ "doc" ] + }, + { + "login": "Sauceee", + "name": "Sauceee", + "avatar_url": "https://avatars2.githubusercontent.com/u/17987941?v=4", + "profile": "https://github.com/Sauceee", + "contributions": [ + "design" + ] } ], "contributorsPerLine": 6, -- cgit v1.2.3-70-g09d2 From e928f00ace1f7fca1e66b07b319881bcb5829dd5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 22:03:06 +0000 Subject: docs: update README.md [skip ci] --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ac5ff1c87..615eb28fe 100644 --- a/README.md +++ b/README.md @@ -239,6 +239,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Felix W. Dekker
📖
Sauceee
🎨 + +
Lennart Weller
📦 + -- cgit v1.2.3-70-g09d2 From b46af511ad2c06c0b24a6e205bb75f20cf8f06b9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 22:03:07 +0000 Subject: docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3cb300bfa..b62d0e442 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -269,6 +269,15 @@ "contributions": [ "design" ] + }, + { + "login": "lhw", + "name": "Lennart Weller", + "avatar_url": "https://avatars2.githubusercontent.com/u/351875?v=4", + "profile": "http://lhw.ring0.de", + "contributions": [ + "platform" + ] } ], "contributorsPerLine": 6, -- cgit v1.2.3-70-g09d2 From 4e705f543d48a5be861b3f4d0505865ead6b1fca Mon Sep 17 00:00:00 2001 From: vantezzen Date: Tue, 28 Jan 2020 12:27:32 +0100 Subject: Update submodules --- recipes | 2 +- src/internal-server | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes b/recipes index cea06d3a1..3dcb305ff 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit cea06d3a1645be7896659f06088caf9668ce7837 +Subproject commit 3dcb305ffb706a7604cdfbadf7f2d2e236cb223d diff --git a/src/internal-server b/src/internal-server index f534147e0..c39e8b45a 160000 --- a/src/internal-server +++ b/src/internal-server @@ -1 +1 @@ -Subproject commit f534147e00fc889769845b9207572ce63ef3cad7 +Subproject commit c39e8b45a51387f24d30e62a170681fc3422ad08 -- cgit v1.2.3-70-g09d2 From 12c2f45378f3a78186953621da86dbc2c79e6903 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Tue, 28 Jan 2020 12:28:18 +0100 Subject: Update release guide --- README.md | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 615eb28fe..f7eb28fac 100644 --- a/README.md +++ b/README.md @@ -18,23 +18,30 @@
Toggle navigation -- [What is Ferdi?](#what-is-ferdi) -- [What does Ferdi look like?](#what-does-ferdi-look-like) -- [Download Ferdi](#download-ferdi) - - [Or use homebrew](#or-use-homebrew-macos-only) - - [Or use AUR (Arch Linux)](#or-use-aur-arch-linux) -- [Ferdi-specific features](#ferdi-specific-features) -- [Development](#development) - - [Install OS dependencies](#install-os-dependencies) - - [Clone repository with submodule](#clone-repository-with-submodule) - - [Install dependencies](#install-dependencies) - - [Fix native modules to match current electron node version](#fix-native-modules-to-match-current-electron-node-version) - - [Start development app](#start-development-app) - - [Packaging](#packaging) - - [Release](#release) -- [Contributors ✨](#contributors-) -- [Backers via OpenCollective](#backers-via-opencollective) -- [Sponsors via OpenCollective](#sponsors-via-opencollective) +- [Ferdi](#ferdi) + - [Table of contents](#table-of-contents) + - [What is Ferdi?](#what-is-ferdi) + - [What does Ferdi look like?](#what-does-ferdi-look-like) + - [Download Ferdi](#download-ferdi) + - [Or use homebrew (macOS only)](#or-use-homebrew-macos-only) + - [Or use AUR (Arch Linux)](#or-use-aur-arch-linux) + - [Ferdi-specific Features](#ferdi-specific-features) + - [Development](#development) + - [Install OS dependencies](#install-os-dependencies) + - [Node.js](#nodejs) + - [Git](#git) + - [Debian/Ubuntu](#debianubuntu) + - [Fedora](#fedora) + - [Windows](#windows) + - [Clone repository with submodule](#clone-repository-with-submodule) + - [Install dependencies](#install-dependencies) + - [Fix native modules to match current electron node version](#fix-native-modules-to-match-current-electron-node-version) + - [Start development app](#start-development-app) + - [Packaging](#packaging) + - [Release](#release) + - [Contributors ✨](#contributors-%e2%9c%a8) + - [Backers via OpenCollective](#backers-via-opencollective) + - [Sponsors via OpenCollective](#sponsors-via-opencollective)
### What is Ferdi? @@ -191,6 +198,8 @@ Deliverables will be available in the `out` folder. ```bash $ git checkout develop && git pull $ git submodule update --remote --force +$ git add . +$ git commit -m "Update submodules" $ git checkout master $ git merge --no-ff develop $ git tag v5.3.4-beta.4 -- cgit v1.2.3-70-g09d2 From 11eb09fab486ee7d947c1398053ec926ac174630 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Tue, 28 Jan 2020 13:13:05 +0100 Subject: Bump version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index acf4852d2..cbb7191f1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ferdi", "productName": "Ferdi", "appId": "com.kytwb.ferdi", - "version": "5.4.1-beta.5", + "version": "5.4.1-beta.6", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "kytwb", "main": "index.js", -- cgit v1.2.3-70-g09d2