diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
commit | df44b69c4655415fe1e44689ece443ec06ef0f52 (patch) | |
tree | e677ed5f5328bb3b14bc976c7392d8e259f89034 /src/actions | |
parent | [wip] add icon upload (diff) | |
parent | Merge pull request #494 from heavypackets/websecurity-enable-patch (diff) | |
download | ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.gz ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.zst ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.zip |
Merge branch 'develop' into feature/icon-upload
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/app.js | 1 | ||||
-rw-r--r-- | src/actions/service.js | 4 | ||||
-rw-r--r-- | src/actions/user.js | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/actions/app.js b/src/actions/app.js index 25ff9344d..e4f648fc9 100644 --- a/src/actions/app.js +++ b/src/actions/app.js | |||
@@ -22,6 +22,7 @@ export default { | |||
22 | healthCheck: {}, | 22 | healthCheck: {}, |
23 | muteApp: { | 23 | muteApp: { |
24 | isMuted: PropTypes.bool.isRequired, | 24 | isMuted: PropTypes.bool.isRequired, |
25 | overrideSystemMute: PropTypes.bool, | ||
25 | }, | 26 | }, |
26 | toggleMuteApp: {}, | 27 | toggleMuteApp: {}, |
27 | }; | 28 | }; |
diff --git a/src/actions/service.js b/src/actions/service.js index 1b918251b..e3100e986 100644 --- a/src/actions/service.js +++ b/src/actions/service.js | |||
@@ -50,6 +50,10 @@ export default { | |||
50 | channel: PropTypes.string.isRequired, | 50 | channel: PropTypes.string.isRequired, |
51 | args: PropTypes.object.isRequired, | 51 | args: PropTypes.object.isRequired, |
52 | }, | 52 | }, |
53 | sendIPCMessageToAllServices: { | ||
54 | channel: PropTypes.string.isRequired, | ||
55 | args: PropTypes.object.isRequired, | ||
56 | }, | ||
53 | openWindow: { | 57 | openWindow: { |
54 | event: PropTypes.object.isRequired, | 58 | event: PropTypes.object.isRequired, |
55 | }, | 59 | }, |
diff --git a/src/actions/user.js b/src/actions/user.js index fe32b8a05..ccf1fa56a 100644 --- a/src/actions/user.js +++ b/src/actions/user.js | |||
@@ -27,4 +27,5 @@ export default { | |||
27 | importLegacyServices: PropTypes.arrayOf(PropTypes.shape({ | 27 | importLegacyServices: PropTypes.arrayOf(PropTypes.shape({ |
28 | recipe: PropTypes.string.isRequired, | 28 | recipe: PropTypes.string.isRequired, |
29 | })).isRequired, | 29 | })).isRequired, |
30 | delete: {}, | ||
30 | }; | 31 | }; |