Merge pull request #185 from RocketChat/master

Keeping sync
RocketChat · Jun 14, 2015 · dd38387 · dd38387
2 parents e8a3c35 + fb2528a
commit dd38387
Show file tree

Hide file tree

Showing 31 changed files with 1,391 additions and 72 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -17,7 +17,9 @@ markdown
 meteor-platform
 reactive-var
 service-configuration
+
 chrismbeckett:toastr
+dispatch:kernel
 francocatena:status
 iframely:oembed
 iron:router
@@ -31,29 +33,26 @@ meteorhacks:kadira
 mizzao:autocomplete
 mizzao:timesync
 momentjs:moment
-monbro:mongodb-mapreduce-aggregation
 mrt:reactive-store
 nooitaf:colors
 pauli:accounts-linkedin
 percolate:migrations
 percolatestudio:synced-cron
 pierreeric:rxfavico
-
 raix:handlebar-helpers
+rocketchat:autolinker
+rocketchat:emojione
 rocketchat:file
+rocketchat:highlight
+#rocketchat:hubot
 rocketchat:lib
+rocketchat:markdown
 rocketchat:me
 rocketchat:mentions
-rocketchat:highlight
-rocketchat:autolinker
-rocketchat:markdown
-rocketchat:emojione
-
-simple:highlight.js
+rocketchat:tmpembed
 tap:i18n
 tmeasday:crypto-md5
 tmeasday:errors
 todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
-emojione:emojione
diff --git a/.meteor/versions b/.meteor/versions
@@ -20,9 +20,10 @@ [email protected]
 dandv:[email protected]
 [email protected]
 [email protected]
+dispatch:[email protected]
+dispatch:[email protected]
 [email protected]
 [email protected]
-emojione:[email protected]
 [email protected]
 [email protected]
 francocatena:[email protected]
@@ -62,15 +63,15 @@ matb33:[email protected]
 [email protected]
 [email protected]
 [email protected]
-meteorhacks:kadira@2.21.0
+meteorhacks:kadira@2.22.0
 meteorhacks:[email protected]
+meteorspark:[email protected]
 [email protected]
 [email protected]
 mizzao:[email protected]
 mizzao:[email protected]
 [email protected]
 momentjs:[email protected]
-monbro:[email protected]
 [email protected]
 [email protected]
 mrt:[email protected]
@@ -85,6 +86,8 @@ pauli:[email protected]
 percolate:[email protected]
 percolatestudio:[email protected]
 pierreeric:[email protected]_1
+qnub:[email protected]
+raix:[email protected]
 raix:[email protected]
 [email protected]
 [email protected]
@@ -99,6 +102,7 @@ rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -107,7 +111,7 @@ simple:[email protected]
 [email protected]
 [email protected]
 [email protected]
-tap:i18n@1.4.1
+tap:i18n@1.5.0
 [email protected]
 tmeasday:[email protected]
 tmeasday:[email protected]

diff --git a/client/methods/sendMessage.coffee b/client/methods/sendMessage.coffee
@@ -11,10 +11,10 @@ Meteor.methods
 				username: Meteor.user().username
 
 			message.html = message.msg
-
+			if _.trim(message.html) isnt ''
+				message.html = _.escapeHTML message.html
 			message = RocketChat.callbacks.run 'beforeSaveMessage', message
-			message.html = message.html.replace /\n/g, '<br/>'
-			console.log message
+			message.html = message.html.replace /\n/gm, '<br/>'
 
 			ChatMessage.upsert
 				rid: message.rid

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
@@ -41,14 +41,32 @@ a {
 
 code {
 	background: #f8f8f8;
-	border-radius: 6px;
+	border-radius: 4px;
 	border: 1px solid #ccc;
 	color: #333;
 	display: block;
 	font-weight: bold;
 	overflow-x: auto;
 	padding: 0.5em;
 	word-wrap: break-word;
+	&.inline {
+		display: inline-block;
+		padding: 0 10px;
+		margin: 0;
+		vertical-align: bottom;
+	}
+}
+
+q {
+	padding-left: 10px;
+	&:before {
+		content: ' ';
+		background-color: #ccc;
+		height: 22px;
+		width: 3px;
+		position: absolute;
+		left: 50px;
+	}
 }
 
 .text-center {
@@ -1622,7 +1640,7 @@ a.github-fork {
 	}
 	.footer {
 		position: absolute;
-		padding: 14px 20px 0px 20px;
+		padding: 8px 20px 0px 20px;
 		background: #fff;
 		border-top: 1px solid @tertiary-background-color;
 		z-index: 100;
@@ -1683,11 +1701,31 @@ a.github-fork {
 			}
 		}
 		> .users-typing {
+			float: left;
 			height: 20px;
 			font-size: 12px;
 			color: #888;
 			padding: 3px 0px 0px 5px;
 		}
+		> .formatting-tips {
+			float: right;
+			height: 20px;
+			font-size: 11px;
+			color: #888;
+			padding: 4px 0px 0px 5px;
+			display: inline-block;
+			white-space: nowrap;
+			q {
+				padding: 0 0 0 3px;
+				border-left: 3px solid #ccc;
+				&:before {
+					content: none !important;
+				}
+			}
+			code {
+				color: #888;
+			}
+		}
 	}
 	.add-user-search {
 		height: 100%;