aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md1
-rw-r--r--branding/social-preview.psdbin2137096 -> 2619596 bytes
-rw-r--r--package-lock.json2
-rw-r--r--package.json2
-rw-r--r--src/config.js2
5 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index 3f1628f67..7e591eb02 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ You can find the installers in the [latest release](https://github.com/getferdi/
26- [x] Makes all users Premium by default ([#15](https://github.com/getferdi/ferdi/issues/15)) 26- [x] Makes all users Premium by default ([#15](https://github.com/getferdi/ferdi/issues/15))
27- [x] Using the Ferdi API instead of Franz's servers 27- [x] Using the Ferdi API instead of Franz's servers
28- [x] [Add option to change server to a custom](https://github.com/getferdi/ferdi/wiki/Custom-Server) [ferdi-server](https://github.com/getferdi/server) 28- [x] [Add option to change server to a custom](https://github.com/getferdi/ferdi/wiki/Custom-Server) [ferdi-server](https://github.com/getferdi/server)
29- [x] Add option to use Ferdi without an account ([#5](https://github.com/getferdi/ferdi/issues/5))
29- [x] Add "Private Notification"-Mode, that hides message content from notifications ([franz#879](https://github.com/meetfranz/franz/issues/879)) 30- [x] Add "Private Notification"-Mode, that hides message content from notifications ([franz#879](https://github.com/meetfranz/franz/issues/879))
30- [x] Add Password Lock feature to keep your messages protected ([#41](https://github.com/getferdi/ferdi/issues/41), [franz#810](https://github.com/meetfranz/franz/issues/810), [franz#950](https://github.com/meetfranz/franz/issues/950), [franz#1430](https://github.com/meetfranz/franz/issues/1430)) 31- [x] Add Password Lock feature to keep your messages protected ([#41](https://github.com/getferdi/ferdi/issues/41), [franz#810](https://github.com/meetfranz/franz/issues/810), [franz#950](https://github.com/meetfranz/franz/issues/950), [franz#1430](https://github.com/meetfranz/franz/issues/1430))
31- [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37)) 32- [x] Add an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37))
diff --git a/branding/social-preview.psd b/branding/social-preview.psd
index 891ccdc39..5a01e7d68 100644
--- a/branding/social-preview.psd
+++ b/branding/social-preview.psd
Binary files differ
diff --git a/package-lock.json b/package-lock.json
index dde0a1d80..e037c9133 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "ferdi", 2 "name": "ferdi",
3 "version": "5.4.0-beta.1", 3 "version": "5.4.0-beta.2",
4 "lockfileVersion": 1, 4 "lockfileVersion": 1,
5 "requires": true, 5 "requires": true,
6 "dependencies": { 6 "dependencies": {
diff --git a/package.json b/package.json
index 52681241b..09675fa62 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.0-beta.1", 5 "version": "5.4.0-beta.2",
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/config.js b/src/config.js
index e30a6d4b2..b1dbab1ff 100644
--- a/src/config.js
+++ b/src/config.js
@@ -89,7 +89,7 @@ export const DEFAULT_FEATURES_CONFIG = {
89 }, 89 },
90 isServiceProxyEnabled: false, 90 isServiceProxyEnabled: false,
91 isServiceProxyIncludedInCurrentPlan: true, 91 isServiceProxyIncludedInCurrentPlan: true,
92 isAnnouncementsEnabled: false, 92 isAnnouncementsEnabled: true,
93 isWorkspaceIncludedInCurrentPlan: true, 93 isWorkspaceIncludedInCurrentPlan: true,
94 isWorkspaceEnabled: false, 94 isWorkspaceEnabled: false,
95 isCommunityRecipesIncludedInCurrentPlan: true, 95 isCommunityRecipesIncludedInCurrentPlan: true,