From 268db27162e8d2cd0252b1be9bf69006cf6323ca Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 4 Jul 2019 15:54:27 +0200 Subject: Add trial onboarding during signup --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 7bf1f8a4a..98c7f547f 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "prop-types": "^15.5.10", "react": "16.6.3", "react-addons-css-transition-group": "15.6.2", + "react-confetti": "3.1.0", "react-dom": "16.6.3", "react-dropzone": "7.0.1", "react-electron-web-view": "^2.0.1", -- cgit v1.2.3-70-g09d2 From c4141f5c4a5918b13b39c920c275571adc0eab62 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 28 Aug 2019 14:42:27 +0200 Subject: fix missing icons --- package-lock.json | 16 ++++++++++++---- package.json | 1 + src/components/ui/FeatureItem.js | 3 ++- src/components/ui/Modal/index.js | 3 ++- src/features/shareFranz/Component.js | 3 ++- 5 files changed, 19 insertions(+), 7 deletions(-) (limited to 'package.json') diff --git a/package-lock.json b/package-lock.json index 13646552b..048425eb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "franz", - "version": "5.2.0-beta.4", + "version": "5.2.1-beta.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2149,9 +2149,9 @@ } }, "@mdi/js": { - "version": "3.4.93", - "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.4.93.tgz", - "integrity": "sha512-SEzolEqT8ErlWdHz4AAtQ1lTfAnM6j67Ppm6k5s/I1aIuuoFP/D8d/z838C28xHO1KOqrsS1fw2wlf6fRiEEJA==" + "version": "4.2.95", + "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.2.95.tgz", + "integrity": "sha512-3qqOZx2HkrQEUc9fr5MiQWlokwmO8TK5bQZ2EP1Rg0q2Q507jy+fUeL8lb9ko2ossYqoPnugIr7jI0/O7uhlrA==" }, "@mdi/react": { "version": "1.1.0", @@ -2178,6 +2178,10 @@ "react-loader": "^2.4.5" }, "dependencies": { + "@mdi/js": { + "version": "3.9.97", + "bundled": true + }, "@meetfranz/theme": { "version": "1.0.14", "bundled": true, @@ -2202,6 +2206,10 @@ "react-loader": "^2.4.5" }, "dependencies": { + "@mdi/js": { + "version": "3.9.97", + "bundled": true + }, "@meetfranz/theme": { "version": "1.0.14", "bundled": true, diff --git a/package.json b/package.json index f7ae953f4..d30fa08c5 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "dependencies": { "@babel/polyfill": "7.4.4", "@babel/runtime": "7.4.5", + "@mdi/js": "4.2.95", "@meetfranz/electron-notification-state": "1.0.0", "@meetfranz/forms": "file:packages/forms", "@meetfranz/theme": "file:packages/theme", diff --git a/src/components/ui/FeatureItem.js b/src/components/ui/FeatureItem.js index a63f5f7b5..53616f2eb 100644 --- a/src/components/ui/FeatureItem.js +++ b/src/components/ui/FeatureItem.js @@ -2,6 +2,7 @@ import React from 'react'; import injectSheet from 'react-jss'; import { Icon } from '@meetfranz/ui'; import classnames from 'classnames'; +import { mdiCheckCircle } from '@mdi/js'; const styles = theme => ({ featureItem: { @@ -27,7 +28,7 @@ export const FeatureItem = injectSheet(styles)(({ {icon ? ( {icon} ) : ( - + )} {name} diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js index 0b7154760..63d858c47 100644 --- a/src/components/ui/Modal/index.js +++ b/src/components/ui/Modal/index.js @@ -5,6 +5,7 @@ import classnames from 'classnames'; import injectCSS from 'react-jss'; import { Icon } from '@meetfranz/ui'; +import { mdiClose } from '@mdi/js'; import styles from './styles'; // ReactModal.setAppElement('#root'); @@ -59,7 +60,7 @@ export default @injectCSS(styles) class Modal extends Component { className={classes.close} onClick={close} > - + )}
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js index 8d1d595c5..859c0ebe9 100644 --- a/src/features/shareFranz/Component.js +++ b/src/features/shareFranz/Component.js @@ -6,6 +6,7 @@ import { defineMessages, intlShape } from 'react-intl'; import { Button } from '@meetfranz/forms'; import { H1, Icon } from '@meetfranz/ui'; +import { mdiHeart } from '@mdi/js'; import Modal from '../../components/ui/Modal'; import { state } from '.'; import { gaEvent } from '../../lib/analytics'; @@ -116,7 +117,7 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz close={this.close.bind(this)} >
- +

{intl.formatMessage(messages.headline)} -- cgit v1.2.3-70-g09d2 From 2c40488438a037ea5606016dd8889ec12c46e82f Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 6 Sep 2019 09:35:48 +0200 Subject: Bump version to 5.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index d30fa08c5..2a415e361 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "franz", "productName": "Franz", "appId": "com.meetfranz.franz", - "version": "5.2.1-beta.1", + "version": "5.3.0", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "adlk x franz - Stefan Malzner", "main": "index.js", -- cgit v1.2.3-70-g09d2 From 06c2285e92ed91403a5a23836871892344efc593 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 7 Sep 2019 00:07:13 +0200 Subject: bump version to 5.3.1 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/CHANGELOG.md b/CHANGELOG.md index 14787bffc..4ba50e0a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [5.3.1](https://github.com/meetfranz/franz/compare/v5.3.0...v5.3.1) (2019-09-06) + +### Features + +* **App:** Add second confirmation step for the free 14 day trial. + # [5.3.0](https://github.com/meetfranz/franz/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) ### Features diff --git a/package.json b/package.json index 2a415e361..980242e5f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "franz", "productName": "Franz", "appId": "com.meetfranz.franz", - "version": "5.3.0", + "version": "5.3.1", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "adlk x franz - Stefan Malzner", "main": "index.js", -- cgit v1.2.3-70-g09d2