aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md41
-rw-r--r--branding/opencollective-header.jpgbin0 -> 2229496 bytes
-rw-r--r--branding/social-previeww-base.psd (renamed from branding/social-preview.psd)bin2619596 -> 2619596 bytes
-rw-r--r--branding/twitter-header.jpgbin0 -> 213675 bytes
-rw-r--r--build-helpers/notarize.js9
-rw-r--r--next_release.md47
-rw-r--r--package.json2
m---------src/internal-server0
8 files changed, 24 insertions, 75 deletions
diff --git a/README.md b/README.md
index 1f50307ba..e524ffa2e 100644
--- a/README.md
+++ b/README.md
@@ -17,29 +17,24 @@
17 17
18<details> 18<details>
19<summary>Toggle navigation</summary> 19<summary>Toggle navigation</summary>
20<ul> 20
21<li><a href="#what-is-ferdi">What is Ferdi?</a></li> 21- [What is Ferdi?](#what-is-ferdi)
22<li><a href="#what-does-ferdi-look-like">What does Ferdi look like?</a></li> 22- [What does Ferdi look like?](#what-does-ferdi-look-like)
23<li><a href="#download-ferdi">Download Ferdi</a> 23- [Download Ferdi](#download-ferdi)
24<ul> 24 - [Or use homebrew](#or-use-homebrew-macos-only)
25<li><a href="#or-use-homebrew-macos-only">Or use homebrew</a></li> 25 - [Or use AUR (Arch Linux)](#or-use-aur-arch-linux)
26</ul> 26- [Ferdi-specific features](#ferdi-specific-features)
27</li> 27- [Development](#development)
28<li><a href="#ferdi-specific-features">Ferdi-specific features</a></li> 28 - [Install OS dependencies](#install-os-dependencies)
29<li><a href="#development">Development</a></li> 29 - [Clone repository with submodule](#clone-repository-with-submodule)
30<ul> 30 - [Install dependencies](#install-dependencies)
31<li><a href="#install-os-dependencies">Install OS dependencies</a></li> 31 - [Fix native modules to match current electron node version](#fix-native-modules-to-match-current-electron-node-version)
32<li><a href="#clone-repository-with-submodule">Clone repository with submodule</a></li> 32 - [Start development app](#start-development-app)
33<li><a href="#install-dependencies">Install dependencies</a></li> 33 - [Packaging](#packaging)
34<li><a href="#fix-native-modules-to-match-current-electron-node-version">Fix native modules to match current electron node version</a></li> 34 - [Release](#release)
35<li><a href="#start-development-app">Start development app</a></li> 35- [Contributors ✨](#contributors-)
36<li><a href="#packaging">Packaging</a></li> 36- [Backers via OpenCollective](#backers-via-opencollective)
37<li><a href="#release">Release</a></li> 37- [Sponsors via OpenCollective](#sponsors-via-opencollective)
38</ul>
39<li><a href="#contributors-">Contributors ✨</a></li>
40<li><a href="#backers-via-opencollective">Backers via OpenCollective</a></li>
41<li><a href="#sponsors-via-opencollective">Sponsors via OpenCollective</a></li>
42</ul>
43</details> 38</details>
44 39
45### What is Ferdi? 40### What is Ferdi?
diff --git a/branding/opencollective-header.jpg b/branding/opencollective-header.jpg
new file mode 100644
index 000000000..4bb8d809f
--- /dev/null
+++ b/branding/opencollective-header.jpg
Binary files differ
diff --git a/branding/social-preview.psd b/branding/social-previeww-base.psd
index 5a01e7d68..5a01e7d68 100644
--- a/branding/social-preview.psd
+++ b/branding/social-previeww-base.psd
Binary files differ
diff --git a/branding/twitter-header.jpg b/branding/twitter-header.jpg
new file mode 100644
index 000000000..39d9b1cb2
--- /dev/null
+++ b/branding/twitter-header.jpg
Binary files differ
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 @@
1const { notarize } = require('electron-notarize'); 1const { notarize } = require("electron-notarize");
2 2
3exports.default = async function notarizing(context) { 3exports.default = async function notarizing(context) {
4 const { electronPlatformName, appOutDir } = context; 4 const { electronPlatformName, appOutDir } = context;
5 const isTagBuild = process.env.TRAVIS_TAG; 5 const isTagBuild = process.env.TRAVIS_TAG;
6 if (electronPlatformName !== 'darwin' || !isTagBuild) { 6 if (electronPlatformName !== "darwin" || !isTagBuild) {
7 return; 7 return;
8 } 8 }
9 9
10 const appName = context.packager.appInfo.productFilename; 10 const appName = context.packager.appInfo.productFilename;
11 11
12 return await notarize({ 12 return await notarize({
13 appBundleId: 'com.kytwb.ferdi', 13 appBundleId: "com.kytwb.ferdi",
14 appPath: `${appOutDir}/${appName}.app`, 14 appPath: `${appOutDir}/${appName}.app`,
15 ascProvider: "B6J9X9DWFL",
15 appleId: process.env.APPLEID, 16 appleId: process.env.APPLEID,
16 appleIdPassword: process.env.APPLEID_PASSWORD, 17 appleIdPassword: process.env.APPLEID_PASSWORD
17 }); 18 });
18}; 19};
diff --git a/next_release.md b/next_release.md
deleted file mode 100644
index ae472bce9..000000000
--- a/next_release.md
+++ /dev/null
@@ -1,47 +0,0 @@
1# Next release
2Infos about the next release:
3
4## Beta
5v5.4.0-beta.5:
6- Updated translations
7- Remove "&" sign from window menu bar (#65)
8- Extend debug information
9- Use SSH for submodules
10- Move hibernation indicator to bottom left (#129 (comment))
11- Add fix for 1.1.1.1 hack (#146)
12- Fix darkmode not loading correctly (#158)
13- Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173))
14
15## Minor
16v5.4.0
17
18### Features
19- **Merge Franz 5.4.0**
20- **Use Ferdi without an Account**: Simply choose "Use Ferdi without an Account" on the login screen
21- **Accent color**: Change Ferdi's accent color
22- **Darkmode**:
23 - Easily open and edit any service's `darkmode.css` through the new "Open darkmode.css" button
24 - Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173) - @steliyan)
25- **Hibernation**: Activate service hibernation to save battery
26- **Smaller file size**: Ferdi is now 17% smaller
27- **Annoucements**: Always get notified about the latest features of Ferdi
28- **Navigation bar**: Add option to always show a service navigation bar
29
30### Minor changes
31- Sorting applications in QuickSwitch by last used
32- Add info about teams only being available on Franz servers
33- Add toggle to disable dark mode on per-service basis
34- Add toggle to disable universal Dark Mode
35- Improve switching between accounts
36- Extend debug information
37- Add fix for 1.1.1.1 hack (#146)
38
39### Bug fixes
40- Fix universal darkmode for WhatsApp and Threema QR Codes
41- Fix darkmode not activating on reload
42- Fix disabling/enabling service not correctly reloading webview (#116)
43- Remove "&" sign from window menu bar (#65)
44
45### Changes in building Ferdi
46- Update Building Node Version
47- Use SSH for submodules \ No newline at end of file
diff --git a/package.json b/package.json
index 8d6d82e63..acf4852d2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
2 "name": "ferdi", 2 "name": "ferdi",
3 "productName": "Ferdi", 3 "productName": "Ferdi",
4 "appId": "com.kytwb.ferdi", 4 "appId": "com.kytwb.ferdi",
5 "version": "5.4.1-beta.4", 5 "version": "5.4.1-beta.5",
6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", 6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
7 "copyright": "kytwb", 7 "copyright": "kytwb",
8 "main": "index.js", 8 "main": "index.js",
diff --git a/src/internal-server b/src/internal-server
Subproject 48cb16fefe46ab66b1884f18e04c1f701a8e0c0 Subproject f534147e00fc889769845b9207572ce63ef3cad