diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-24 15:15:42 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-24 15:15:42 +0200 |
commit | 54f8b191a94bd78a85b046bbf21dd2245d3a6f3e (patch) | |
tree | ada5876f0e8a697ba4693bba07f5e0f31fea1fc9 /src/actions | |
parent | Update submodules (diff) | |
parent | bump version to 5.4.0 (diff) | |
download | ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.gz ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.zst ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.zip |
Merge https://github.com/meetfranz/franz into franz-5.4.0-release
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/index.js | 4 | ||||
-rw-r--r-- | src/actions/payment.js | 4 | ||||
-rw-r--r-- | src/actions/user.js | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/actions/index.js b/src/actions/index.js index 336344d76..9d3684edc 100644 --- a/src/actions/index.js +++ b/src/actions/index.js | |||
@@ -14,6 +14,8 @@ import requests from './requests'; | |||
14 | import announcements from '../features/announcements/actions'; | 14 | import announcements from '../features/announcements/actions'; |
15 | import workspaces from '../features/workspaces/actions'; | 15 | import workspaces from '../features/workspaces/actions'; |
16 | import todos from '../features/todos/actions'; | 16 | import todos from '../features/todos/actions'; |
17 | import planSelection from '../features/planSelection/actions'; | ||
18 | import trialStatusBar from '../features/trialStatusBar/actions'; | ||
17 | 19 | ||
18 | const actions = Object.assign({}, { | 20 | const actions = Object.assign({}, { |
19 | service, | 21 | service, |
@@ -33,4 +35,6 @@ export default Object.assign( | |||
33 | { announcements }, | 35 | { announcements }, |
34 | { workspaces }, | 36 | { workspaces }, |
35 | { todos }, | 37 | { todos }, |
38 | { planSelection }, | ||
39 | { trialStatusBar }, | ||
36 | ); | 40 | ); |
diff --git a/src/actions/payment.js b/src/actions/payment.js index 2aaefc025..f61faf197 100644 --- a/src/actions/payment.js +++ b/src/actions/payment.js | |||
@@ -4,5 +4,9 @@ export default { | |||
4 | createHostedPage: { | 4 | createHostedPage: { |
5 | planId: PropTypes.string.isRequired, | 5 | planId: PropTypes.string.isRequired, |
6 | }, | 6 | }, |
7 | upgradeAccount: { | ||
8 | planId: PropTypes.string.isRequired, | ||
9 | onCloseWindow: PropTypes.func, | ||
10 | }, | ||
7 | createDashboardUrl: {}, | 11 | createDashboardUrl: {}, |
8 | }; | 12 | }; |
diff --git a/src/actions/user.js b/src/actions/user.js index 5d7d9a899..7061a367a 100644 --- a/src/actions/user.js +++ b/src/actions/user.js | |||
@@ -11,8 +11,10 @@ export default { | |||
11 | lastname: PropTypes.string.isRequired, | 11 | lastname: PropTypes.string.isRequired, |
12 | email: PropTypes.string.isRequired, | 12 | email: PropTypes.string.isRequired, |
13 | password: PropTypes.string.isRequired, | 13 | password: PropTypes.string.isRequired, |
14 | accountType: PropTypes.string.isRequired, | 14 | accountType: PropTypes.string, |
15 | company: PropTypes.string, | 15 | company: PropTypes.string, |
16 | plan: PropTypes.string, | ||
17 | currency: PropTypes.string, | ||
16 | }, | 18 | }, |
17 | retrievePassword: { | 19 | retrievePassword: { |
18 | email: PropTypes.string.isRequired, | 20 | email: PropTypes.string.isRequired, |