Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

packages/rocketchat-livechat/app/client/lib/triggers.js

@@ -54,7 +54,7 @@ this.Triggers = (function() {
 			trigger.conditions.forEach(function(condition) {
 				switch (condition.name) {
 					case 'page-url':
-						if (request.href.match(new RegExp(urlRegex))) {
+						if (request.href.match(new RegExp(condition.value))) {
 							fire(trigger.actions);
 						}
 						break;