diff options
author | 2019-04-03 17:08:49 +0200 | |
---|---|---|
committer | 2019-04-03 17:08:49 +0200 | |
commit | fc4988cd5e54f44779f13732961a3f7b00619eaf (patch) | |
tree | 9e39d2d3baabba44a50cbde3649045579a51d7f6 | |
parent | add workspace premium badge in settings nav (diff) | |
parent | fix shitty twitter account typo (diff) | |
download | ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.gz ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.tar.zst ferdium-app-fc4988cd5e54f44779f13732961a3f7b00619eaf.zip |
fixes conflicts with latest develop
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | package-lock.json | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | packages/forms/package.json | 6 | ||||
-rw-r--r-- | packages/theme/package.json | 4 | ||||
-rw-r--r-- | packages/typings/package.json | 4 | ||||
-rw-r--r-- | packages/ui/package.json | 6 | ||||
-rw-r--r-- | src/features/shareFranz/Component.js | 2 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 4 | ||||
-rw-r--r-- | tsconfig.settings.json | 2 |
10 files changed, 20 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 998d40f4e..175ce06d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,5 +1,4 @@ | |||
1 | ## [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18) | 1 | # [5.0.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1) (2019-03-25) |
2 | |||
3 | 2 | ||
4 | ### General | 3 | ### General |
5 | 4 | ||
@@ -24,6 +23,9 @@ | |||
24 | * **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722)) | 23 | * **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722)) |
25 | 24 | ||
26 | 25 | ||
26 | # [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18) | ||
27 | |||
28 | [See 5.0.1 changelog.](#5-0-1--2019-03-25-) | ||
27 | 29 | ||
28 | # [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15) | 30 | # [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15) |
29 | 31 | ||
diff --git a/package-lock.json b/package-lock.json index c3b291acf..6b87d2432 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "franz", | 2 | "name": "franz", |
3 | "version": "5.0.0", | 3 | "version": "5.0.1", |
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 ec135ca77..8f5c2e8c8 100644 --- a/package.json +++ b/package.json | |||
@@ -2,7 +2,7 @@ | |||
2 | "name": "franz", | 2 | "name": "franz", |
3 | "productName": "Franz", | 3 | "productName": "Franz", |
4 | "appId": "com.meetfranz.franz", | 4 | "appId": "com.meetfranz.franz", |
5 | "version": "5.0.1-beta.1", | 5 | "version": "5.0.1", |
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": "adlk x franz - Stefan Malzner", | 7 | "copyright": "adlk x franz - Stefan Malzner", |
8 | "main": "index.js", | 8 | "main": "index.js", |
diff --git a/packages/forms/package.json b/packages/forms/package.json index fe161a282..8c21303f4 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/forms", | 2 | "name": "@meetfranz/forms", |
3 | "version": "1.0.13", | 3 | "version": "1.0.14", |
4 | "description": "React form components for Franz", | 4 | "description": "React form components for Franz", |
5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
6 | "scripts": { | 6 | "scripts": { |
@@ -25,7 +25,7 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@mdi/js": "^3.3.92", | 26 | "@mdi/js": "^3.3.92", |
27 | "@mdi/react": "^1.1.0", | 27 | "@mdi/react": "^1.1.0", |
28 | "@meetfranz/theme": "^1.0.11", | 28 | "@meetfranz/theme": "^1.0.12", |
29 | "react-html-attributes": "^1.4.3", | 29 | "react-html-attributes": "^1.4.3", |
30 | "react-loader": "^2.4.5" | 30 | "react-loader": "^2.4.5" |
31 | }, | 31 | }, |
@@ -35,5 +35,5 @@ | |||
35 | "react-dom": "16.7.0", | 35 | "react-dom": "16.7.0", |
36 | "react-jss": "^8.6.1" | 36 | "react-jss": "^8.6.1" |
37 | }, | 37 | }, |
38 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" | 38 | "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" |
39 | } | 39 | } |
diff --git a/packages/theme/package.json b/packages/theme/package.json index 3034d6347..e3d1e7af1 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/theme", | 2 | "name": "@meetfranz/theme", |
3 | "version": "1.0.11", | 3 | "version": "1.0.12", |
4 | "description": "Theme configuration for Franz", | 4 | "description": "Theme configuration for Franz", |
5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
@@ -25,5 +25,5 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "color": "^3.1.0" | 26 | "color": "^3.1.0" |
27 | }, | 27 | }, |
28 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" | 28 | "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" |
29 | } | 29 | } |
diff --git a/packages/typings/package.json b/packages/typings/package.json index 5207cf3c6..d0f7ffc43 100644 --- a/packages/typings/package.json +++ b/packages/typings/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/typings", | 2 | "name": "@meetfranz/typings", |
3 | "version": "0.0.9", | 3 | "version": "0.0.10", |
4 | "description": "TypeScript typings for internal and external projects", | 4 | "description": "TypeScript typings for internal and external projects", |
5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
@@ -18,5 +18,5 @@ | |||
18 | "bugs": { | 18 | "bugs": { |
19 | "url": "https://github.com/meetfranz/franz/issues" | 19 | "url": "https://github.com/meetfranz/franz/issues" |
20 | }, | 20 | }, |
21 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" | 21 | "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" |
22 | } | 22 | } |
diff --git a/packages/ui/package.json b/packages/ui/package.json index fb36555c4..d6c72f31f 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/ui", | 2 | "name": "@meetfranz/ui", |
3 | "version": "0.0.6", | 3 | "version": "0.0.7", |
4 | "description": "React UI components for Franz", | 4 | "description": "React UI components for Franz", |
5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
6 | "scripts": { | 6 | "scripts": { |
@@ -25,7 +25,7 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@mdi/js": "^3.3.92", | 26 | "@mdi/js": "^3.3.92", |
27 | "@mdi/react": "^1.1.0", | 27 | "@mdi/react": "^1.1.0", |
28 | "@meetfranz/theme": "^1.0.11", | 28 | "@meetfranz/theme": "^1.0.12", |
29 | "react-loader": "^2.4.5" | 29 | "react-loader": "^2.4.5" |
30 | }, | 30 | }, |
31 | "peerDependencies": { | 31 | "peerDependencies": { |
@@ -34,5 +34,5 @@ | |||
34 | "react-dom": "16.7.0", | 34 | "react-dom": "16.7.0", |
35 | "react-jss": "^8.6.1" | 35 | "react-jss": "^8.6.1" |
36 | }, | 36 | }, |
37 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" | 37 | "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" |
38 | } | 38 | } |
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js index ef43a54fa..8d1d595c5 100644 --- a/src/features/shareFranz/Component.js +++ b/src/features/shareFranz/Component.js | |||
@@ -38,7 +38,7 @@ const messages = defineMessages({ | |||
38 | }, | 38 | }, |
39 | shareTextTwitter: { | 39 | shareTextTwitter: { |
40 | id: 'feature.shareFranz.shareText.twitter', | 40 | id: 'feature.shareFranz.shareText.twitter', |
41 | defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz', | 41 | defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger', |
42 | }, | 42 | }, |
43 | }); | 43 | }); |
44 | 44 | ||
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 5ad1a5deb..c36801d4a 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -9,7 +9,7 @@ | |||
9 | "feature.shareFranz.action.twitter": "Share on Twitter", | 9 | "feature.shareFranz.action.twitter": "Share on Twitter", |
10 | "feature.shareFranz.headline": "Franz is better together!", | 10 | "feature.shareFranz.headline": "Franz is better together!", |
11 | "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com", | 11 | "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com", |
12 | "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz", | 12 | "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger", |
13 | "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.", | 13 | "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.", |
14 | "global.api.unhealthy": "Can't connect to Franz online services", | 14 | "global.api.unhealthy": "Can't connect to Franz online services", |
15 | "global.notConnectedToTheInternet": "You are not connected to the internet.", | 15 | "global.notConnectedToTheInternet": "You are not connected to the internet.", |
@@ -313,4 +313,4 @@ | |||
313 | "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace", | 313 | "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace", |
314 | "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", | 314 | "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", |
315 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 315 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
316 | } \ No newline at end of file | 316 | } |
diff --git a/tsconfig.settings.json b/tsconfig.settings.json index ccd0927ab..19d0906d9 100644 --- a/tsconfig.settings.json +++ b/tsconfig.settings.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "compilerOptions": { | 2 | "compilerOptions": { |
3 | "baseUrl": ".", | 3 | "baseUrl": ".", |
4 | "target": "esnext", | 4 | "target": "es5", |
5 | "module": "commonjs", | 5 | "module": "commonjs", |
6 | "lib": [ | 6 | "lib": [ |
7 | "es2015", | 7 | "es2015", |