Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #713 from vector-im/dbkr/remove_member_event_rule

Browse Source 
Remove member event rule as per SYN-607
This commit is contained in:
David Baker 2016-01-21 12:30:03 +00:00
commit 568f9bb19d
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

@ -155,7 +155,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: [{
@ -176,7 +176,7 @@ var VectorPushRulesDefinitions = {
} }
] ]
} }
}, },*/
// Incoming call // Incoming call
"im.vector.rule.call": { "im.vector.rule.call": {
@ -614,7 +614,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'
// Others go to others // Others go to others
@ -741,7 +741,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'
]; ];
for (var i in vectorRuleIds) { for (var i in vectorRuleIds) {