OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Put back removing of "When people join or leave a room" settings push rule

pull/716/head
manuroe 2016-01-21 16:37:17 +01:00
parent 029cf754ee
commit f3064a2994
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/settings/Notifications.js
View File

@ -171,7 +171,7 @@ var VectorPushRulesDefinitions = {
}, },
// When people join or leave a room // When people join or leave a room
"im.vector.rule.member_event": { /*"im.vector.rule.member_event": {
hsDefaultRuleId: ".m.rule.member_event", hsDefaultRuleId: ".m.rule.member_event",
description: "When people join or leave a room", description: "When people join or leave a room",
conditions: [{ conditions: [{
@ -196,7 +196,7 @@ var VectorPushRulesDefinitions = {
loud: undefined, loud: undefined,
off: false off: false
} }
}, },*/
// Incoming call // Incoming call
"im.vector.rule.call": { "im.vector.rule.call": {
@ -665,7 +665,7 @@ module.exports = React.createClass({
'.m.rule.contains_display_name': 'vector', '.m.rule.contains_display_name': 'vector',
'.m.rule.room_one_to_one': 'vector', '.m.rule.room_one_to_one': 'vector',
'.m.rule.invite_for_me': 'vector', '.m.rule.invite_for_me': 'vector',
'.m.rule.member_event': 'vector', //'.m.rule.member_event': 'vector',
'.m.rule.call': 'vector', '.m.rule.call': 'vector',
'.m.rule.suppress_notices': 'vector' '.m.rule.suppress_notices': 'vector'
@ -793,7 +793,7 @@ module.exports = React.createClass({
'im.vector.rule.room_one_to_one', 'im.vector.rule.room_one_to_one',
'im.vector.rule.room_group', 'im.vector.rule.room_group',
'im.vector.rule.invite_for_me', 'im.vector.rule.invite_for_me',
'im.vector.rule.member_event', //'im.vector.rule.member_event',
'im.vector.rule.call', 'im.vector.rule.call',
'im.vector.rule.notices' 'im.vector.rule.notices'
]; ];