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

Merge remote-tracking branch 'matrix-org/develop' into travis/presence

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-10-25 11:21:19 -06:00
commit e773585a02
80 changed files with 9256 additions and 2909 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/UserSettingsStore.js
View file

@ -28,7 +28,7 @@ import SdkConfig from './SdkConfig';
const FEATURES = [
{
id: 'feature_groups',
name: _td("Groups"),
name: _td("Communities"),
},
{
id: 'feature_pinning',
@ -44,7 +44,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;
@ -221,7 +221,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';