diff options
author | 2019-06-14 17:21:33 +0200 | |
---|---|---|
committer | 2019-06-14 17:21:33 +0200 | |
commit | b0e2f5cb5ea7109a81b1f9404fed084a25996efb (patch) | |
tree | 1df0700fa627a10971db62421bf6383cf3ce4080 /src/stores | |
parent | Restrict services with customURL when not premium user (diff) | |
parent | Fix issue with dev recipe list (diff) | |
download | ferdium-app-b0e2f5cb5ea7109a81b1f9404fed084a25996efb.tar.gz ferdium-app-b0e2f5cb5ea7109a81b1f9404fed084a25996efb.tar.zst ferdium-app-b0e2f5cb5ea7109a81b1f9404fed084a25996efb.zip |
Merge branch 'feature/3rd-party-limit' into feature/new-pricing
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/FeaturesStore.js | 2 | ||||
-rw-r--r-- | src/stores/index.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index 1ac05d3b9..27334c9a2 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
@@ -17,6 +17,7 @@ import shareFranz from '../features/shareFranz'; | |||
17 | import announcements from '../features/announcements'; | 17 | import announcements from '../features/announcements'; |
18 | import settingsWS from '../features/settingsWS'; | 18 | import settingsWS from '../features/settingsWS'; |
19 | import serviceLimit from '../features/serviceLimit'; | 19 | import serviceLimit from '../features/serviceLimit'; |
20 | import communityRecipes from '../features/communityRecipes'; | ||
20 | 21 | ||
21 | import { DEFAULT_FEATURES_CONFIG } from '../config'; | 22 | import { DEFAULT_FEATURES_CONFIG } from '../config'; |
22 | 23 | ||
@@ -77,5 +78,6 @@ export default class FeaturesStore extends Store { | |||
77 | announcements(this.stores, this.actions); | 78 | announcements(this.stores, this.actions); |
78 | settingsWS(this.stores, this.actions); | 79 | settingsWS(this.stores, this.actions); |
79 | serviceLimit(this.stores, this.actions); | 80 | serviceLimit(this.stores, this.actions); |
81 | communityRecipes(this.stores, this.actions); | ||
80 | } | 82 | } |
81 | } | 83 | } |
diff --git a/src/stores/index.js b/src/stores/index.js index ff01a3dd3..c9ec77612 100644 --- a/src/stores/index.js +++ b/src/stores/index.js | |||
@@ -13,6 +13,7 @@ import GlobalErrorStore from './GlobalErrorStore'; | |||
13 | import { workspaceStore } from '../features/workspaces'; | 13 | import { workspaceStore } from '../features/workspaces'; |
14 | import { announcementsStore } from '../features/announcements'; | 14 | import { announcementsStore } from '../features/announcements'; |
15 | import { serviceLimitStore } from '../features/serviceLimit'; | 15 | import { serviceLimitStore } from '../features/serviceLimit'; |
16 | import { communityRecipesStore } from '../features/communityRecipes'; | ||
16 | 17 | ||
17 | export default (api, actions, router) => { | 18 | export default (api, actions, router) => { |
18 | const stores = {}; | 19 | const stores = {}; |
@@ -33,6 +34,7 @@ export default (api, actions, router) => { | |||
33 | workspaces: workspaceStore, | 34 | workspaces: workspaceStore, |
34 | announcements: announcementsStore, | 35 | announcements: announcementsStore, |
35 | serviceLimit: serviceLimitStore, | 36 | serviceLimit: serviceLimitStore, |
37 | communityRecipes: communityRecipesStore, | ||
36 | }); | 38 | }); |
37 | // Initialize all stores | 39 | // Initialize all stores |
38 | Object.keys(stores).forEach((name) => { | 40 | Object.keys(stores).forEach((name) => { |