diff --git a/CHANGES.rst b/CHANGES.rst index f11951be2..b6404f1c4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,8 @@ Changelog * Hungarian translation [w3host] * Russian translation [bkocherov] * Update CSS to avoid clash with bootstrap [seocam] -* Add config option ``allow_muc`` to enable/disable multi-user chat (MUC) [jcbrand] +* Add config option ``allow_muc`` to toggle multi-user chat (MUC) [jcbrand] +* Add config option ``allow_contact_requests`` to toggle user adding [jcbrand] 0.6.4 (2013-09-15) ------------------ diff --git a/converse.js b/converse.js index 57ea1f129..d9b5d8831 100644 --- a/converse.js +++ b/converse.js @@ -55,6 +55,7 @@ }; // Default values + this.allow_contact_requests = true; this.allow_muc = true; this.allow_otr = true; this.animate = true; @@ -76,6 +77,7 @@ // Allow only the whitelisted settings attributes to be overwritten, // nothing else. whitelist = [ + 'allow_contact_requests', 'allow_muc', 'allow_otr', 'animate', @@ -1064,7 +1066,10 @@ ''+ ''+ ''+ - ''+ + '' + ), + + add_contact_dropdown_template: _.template( '