mirror of https://github.com/vector-im/riot-web
Hide message pinning behind a labs setting
Signed-off-by: Travis Ralston <travpc@gmail.com>pull/21833/head
parent
838b9957da
commit
8a641c7173
|
@ -30,6 +30,10 @@ const FEATURES = [
|
||||||
id: 'feature_groups',
|
id: 'feature_groups',
|
||||||
name: _td("Groups"),
|
name: _td("Groups"),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: 'feature_pinning',
|
||||||
|
name: _td("Message Pinning"),
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|
|
@ -31,6 +31,7 @@ import linkifyMatrix from '../../../linkify-matrix';
|
||||||
import AccessibleButton from '../elements/AccessibleButton';
|
import AccessibleButton from '../elements/AccessibleButton';
|
||||||
import ManageIntegsButton from '../elements/ManageIntegsButton';
|
import ManageIntegsButton from '../elements/ManageIntegsButton';
|
||||||
import {CancelButton} from './SimpleRoomHeader';
|
import {CancelButton} from './SimpleRoomHeader';
|
||||||
|
import UserSettingsStore from "../../../UserSettingsStore";
|
||||||
|
|
||||||
linkifyMatrix(linkify);
|
linkifyMatrix(linkify);
|
||||||
|
|
||||||
|
@ -300,7 +301,7 @@ module.exports = React.createClass({
|
||||||
</AccessibleButton>;
|
</AccessibleButton>;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.props.onPinnedClick) {
|
if (this.props.onPinnedClick && UserSettingsStore.isFeatureEnabled('feature_pinning')) {
|
||||||
pinnedEventsButton =
|
pinnedEventsButton =
|
||||||
<AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onPinnedClick} title={_t("Pinned Messages")}>
|
<AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onPinnedClick} title={_t("Pinned Messages")}>
|
||||||
<TintableSvg src="img/icons-pin.svg" width="16" height="16" />
|
<TintableSvg src="img/icons-pin.svg" width="16" height="16" />
|
||||||
|
|
|
@ -618,6 +618,7 @@
|
||||||
"(~%(count)s results)|other": "(~%(count)s results)",
|
"(~%(count)s results)|other": "(~%(count)s results)",
|
||||||
"Cancel": "Cancel",
|
"Cancel": "Cancel",
|
||||||
"or": "or",
|
"or": "or",
|
||||||
|
"Message Pinning": "Message Pinning",
|
||||||
"Active call": "Active call",
|
"Active call": "Active call",
|
||||||
"Monday": "Monday",
|
"Monday": "Monday",
|
||||||
"Tuesday": "Tuesday",
|
"Tuesday": "Tuesday",
|
||||||
|
|
Loading…
Reference in New Issue