From 7240ee40a8f434723f74fbd789c3b3ccf45735e6 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Wed, 21 Aug 2019 15:15:22 +0200 Subject: Add custom icon --- README.md | 9 +++- build-helpers/images/dmgInstaller.tiff | Bin 34272 -> 111748 bytes build-helpers/images/icon.icns | Bin 1057357 -> 214073 bytes build-helpers/images/icon.ico | Bin 325490 -> 4286 bytes build-helpers/images/icon.png | Bin 126364 -> 110475 bytes build-helpers/images/icons/1024x1024.png | Bin 126364 -> 110475 bytes build-helpers/images/icons/128x128.png | Bin 5538 -> 10489 bytes build-helpers/images/icons/16x16.png | Bin 682 -> 2231 bytes build-helpers/images/icons/24x24.png | Bin 1143 -> 2745 bytes build-helpers/images/icons/256x256.png | Bin 13267 -> 20995 bytes build-helpers/images/icons/32x32.png | Bin 1526 -> 3272 bytes build-helpers/images/icons/48x48.png | Bin 2262 -> 4415 bytes build-helpers/images/icons/512x512.png | Bin 38356 -> 47050 bytes build-helpers/images/icons/64x64.png | Bin 2885 -> 5466 bytes build-helpers/images/icons/96x96.png | Bin 4422 -> 7947 bytes build-helpers/images/win-app-ico.ico | Bin 32038 -> 4286 bytes .../images/win-installer-loading-splash.gif | Bin 36630 -> 221086 bytes src/assets/images/logo.svg | 56 +++------------------ src/components/services/content/Services.js | 2 +- src/i18n/locales/defaultMessages.json | 8 +-- src/i18n/locales/en-US.json | 2 +- .../src/components/services/content/Services.json | 2 +- 22 files changed, 22 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 383c26187..a7af22e09 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,14 @@ # Ferdi -👛 Hard-fork of [Franz](https://github.com/meetfranz/franz) removing the non-skippable app delay (too) frequently inviting you to buy a licence +👛 Hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted features. + +## Changes +- [x] Removes the fullscreen app delay inviting users to upgrade +- [x] Removes pages begging you to donate afte registration +- [ ] [#5](https://github.com/kytwb/Ferdi/issues/5) Makes it optional to create an account +- [ ] [#6](https://github.com/kytwb/Ferdi/issues/6) Makes RocketChat self-hosted generally available +- [ ] Add option to change server to a custom [ferdi-server](https://github.com/vantezzen/ferdi-server) ## Packaging diff --git a/build-helpers/images/dmgInstaller.tiff b/build-helpers/images/dmgInstaller.tiff index faff9f245..f09096221 100644 Binary files a/build-helpers/images/dmgInstaller.tiff and b/build-helpers/images/dmgInstaller.tiff differ diff --git a/build-helpers/images/icon.icns b/build-helpers/images/icon.icns index 15120c210..e3a0b93e2 100644 Binary files a/build-helpers/images/icon.icns and b/build-helpers/images/icon.icns differ diff --git a/build-helpers/images/icon.ico b/build-helpers/images/icon.ico index db626c20b..0f9d4a084 100644 Binary files a/build-helpers/images/icon.ico and b/build-helpers/images/icon.ico differ diff --git a/build-helpers/images/icon.png b/build-helpers/images/icon.png index 9c39f06e0..c7c31a3cf 100644 Binary files a/build-helpers/images/icon.png and b/build-helpers/images/icon.png differ diff --git a/build-helpers/images/icons/1024x1024.png b/build-helpers/images/icons/1024x1024.png index 9c39f06e0..ce8d6008e 100644 Binary files a/build-helpers/images/icons/1024x1024.png and b/build-helpers/images/icons/1024x1024.png differ diff --git a/build-helpers/images/icons/128x128.png b/build-helpers/images/icons/128x128.png index 8eb811283..602d9407a 100644 Binary files a/build-helpers/images/icons/128x128.png and b/build-helpers/images/icons/128x128.png differ diff --git a/build-helpers/images/icons/16x16.png b/build-helpers/images/icons/16x16.png index 2523dd8a7..034f4f3f7 100644 Binary files a/build-helpers/images/icons/16x16.png and b/build-helpers/images/icons/16x16.png differ diff --git a/build-helpers/images/icons/24x24.png b/build-helpers/images/icons/24x24.png index 9cb17a0b1..834e4c844 100644 Binary files a/build-helpers/images/icons/24x24.png and b/build-helpers/images/icons/24x24.png differ diff --git a/build-helpers/images/icons/256x256.png b/build-helpers/images/icons/256x256.png index 5742147b8..65e06e0f1 100644 Binary files a/build-helpers/images/icons/256x256.png and b/build-helpers/images/icons/256x256.png differ diff --git a/build-helpers/images/icons/32x32.png b/build-helpers/images/icons/32x32.png index 09b88a805..c3845ebc6 100644 Binary files a/build-helpers/images/icons/32x32.png and b/build-helpers/images/icons/32x32.png differ diff --git a/build-helpers/images/icons/48x48.png b/build-helpers/images/icons/48x48.png index c9d2f331c..bfea3471a 100644 Binary files a/build-helpers/images/icons/48x48.png and b/build-helpers/images/icons/48x48.png differ diff --git a/build-helpers/images/icons/512x512.png b/build-helpers/images/icons/512x512.png index 9d5f1c658..e32841eff 100644 Binary files a/build-helpers/images/icons/512x512.png and b/build-helpers/images/icons/512x512.png differ diff --git a/build-helpers/images/icons/64x64.png b/build-helpers/images/icons/64x64.png index 7842217ed..aed8a89d8 100644 Binary files a/build-helpers/images/icons/64x64.png and b/build-helpers/images/icons/64x64.png differ diff --git a/build-helpers/images/icons/96x96.png b/build-helpers/images/icons/96x96.png index bbae07f45..df3d0c245 100644 Binary files a/build-helpers/images/icons/96x96.png and b/build-helpers/images/icons/96x96.png differ diff --git a/build-helpers/images/win-app-ico.ico b/build-helpers/images/win-app-ico.ico index 339ba79ca..658826324 100644 Binary files a/build-helpers/images/win-app-ico.ico and b/build-helpers/images/win-app-ico.ico differ diff --git a/build-helpers/images/win-installer-loading-splash.gif b/build-helpers/images/win-installer-loading-splash.gif index 02598281f..2f1c9d827 100644 Binary files a/build-helpers/images/win-installer-loading-splash.gif and b/build-helpers/images/win-installer-loading-splash.gif differ diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg index 9677d617b..e224330ed 100644 --- a/src/assets/images/logo.svg +++ b/src/assets/images/logo.svg @@ -1,50 +1,8 @@ - - - - - - - - - - - - - - - -franz -Created with Sketch. - - - - - - - - - - - - - - + + + + + + + diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 8f8c38a11..22ebde1d3 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -10,7 +10,7 @@ import Appear from '../../ui/effects/Appear'; const messages = defineMessages({ welcome: { id: 'services.welcome', - defaultMessage: '!!!Welcome to Franz', + defaultMessage: '!!!Welcome to Ferdi', }, getStarted: { id: 'services.getStarted', diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index affaf7f2b..b394118bb 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -417,7 +417,7 @@ { "descriptors": [ { - "defaultMessage": "!!!Support Franz", + "defaultMessage": "!!!Support Ferdi", "end": { "column": 3, "line": 16 @@ -443,7 +443,7 @@ } }, { - "defaultMessage": "!!!Support the development of Franz", + "defaultMessage": "!!!Support the development of Ferdi", "end": { "column": 3, "line": 24 @@ -456,7 +456,7 @@ } }, { - "defaultMessage": "!!!I don't want to support the development of Franz.", + "defaultMessage": "!!!I don't want to support the development of Ferdi.", "end": { "column": 3, "line": 28 @@ -894,7 +894,7 @@ { "descriptors": [ { - "defaultMessage": "!!!Welcome to Franz", + "defaultMessage": "!!!Welcome to Ferdi", "end": { "column": 3, "line": 14 diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 19cf031f6..06be5fd86 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -123,7 +123,7 @@ "service.errorHandler.text": "{name} has failed to load.", "service.webviewLoader.loading": "Loading", "services.getStarted": "Get started", - "services.welcome": "Welcome to Franz", + "services.welcome": "Welcome to Ferdi", "settings.account.account.editButton": "Edit account", "settings.account.accountType.basic": "Basic Account", "settings.account.accountType.premium": "Premium Supporter Account", diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json index 884ab0c90..7fef6a4b2 100644 --- a/src/i18n/messages/src/components/services/content/Services.json +++ b/src/i18n/messages/src/components/services/content/Services.json @@ -1,7 +1,7 @@ [ { "id": "services.welcome", - "defaultMessage": "!!!Welcome to Franz", + "defaultMessage": "!!!Welcome to Ferdi", "file": "src/components/services/content/Services.js", "start": { "line": 11, -- cgit v1.2.3-70-g09d2