imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into matthew/status

Browse source
This commit is contained in:
Matthew Hodgson 2017-10-26 01:47:22 +01:00
commit 1237de3ef0
38 changed files with 6827 additions and 1574 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/UserSettingsStore.js
View file

@ -40,7 +40,7 @@ export default {
getLabsFeatures() {
const featuresConfig = SdkConfig.get()['features'] || {};
// The old flag: honourned for backwards compat
// The old flag: honoured for backwards compatibility
const enableLabs = SdkConfig.get()['enableLabs'];
let labsFeatures;
@ -233,7 +233,7 @@ export default {
isFeatureEnabled: function(featureId: string): boolean {
const featuresConfig = SdkConfig.get()['features'];
// The old flag: honourned for backwards compat
// The old flag: honoured for backwards compatibility
const enableLabs = SdkConfig.get()['enableLabs'];
let sdkConfigValue = enableLabs ? 'labs' : 'disable';