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

README.md

@@ -12,6 +12,23 @@ Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](ht
 
 It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms.
 
+### On the News
+
+##### [Hacker News](https://news.ycombinator.com/item?id=9624737)
+> Yes, we made it to the #1
+
+##### [Product Hunt](http://www.producthunt.com/posts/rocket-chat)
+> Your own open source Slack-like chat
+
+##### [JavaScript Weekly](http://javascriptweekly.com/issues/234)
+> An open source Web based, channel based chat system (a la Slack) built using Meteor, the full stack JavaScript development platform.
+
+##### [wwwhatsnew.com](http://wwwhatsnew.com/2015/05/30/rocket-chat-para-los-programadores-que-quieran-ofrecer-un-chat-en-su-web/)
+> Para los programadores que quieran ofrecer un chat en su web
+
+##### [clasesdeperiodismo.com](http://www.clasesdeperiodismo.com/2015/05/30/un-chat-de-codigo-abierto-que-puedes-anadir-a-la-web/)
+> Un chat de código abierto que puedes añadir a la web
+
 ## Installation
 
 Prerequisites:
@@ -54,6 +71,9 @@ Checkout [Github Wiki](https://github.com/RocketChat/Rocket.Chat/wiki) (coming s
 
 Thanks to [Diego Sampaio](https://github.com/sampaiodiego), [Gabriel Engel](https://github.com/engelgabriel), [Marcelo Schmidt](https://github.com/marceloschmidt), [Rafael Caferati](https://github.com/rcaferati) e [Rodrigo Nascimento](https://github.com/rodrigok)
 
+Emoji provided free by [Emoji One](http://emojione.com)
+
+Performance monitoring provided by [Kadira](https://kadira.io/)
 
 ### Contributions
 
@@ -61,7 +81,7 @@ Thanks to [Diego Sampaio](https://github.com/sampaiodiego), [Gabriel Engel](http
 
 A lot of work has already gone into Rocket.Chat, but we have much bigger plans for it!
 
-So if you'd like to be part of the project, please check out the [roadmap](https://trello.com/b/dKS6CCbS/rocket-chat-roadmap) and [issues](https://github.com/RocketChat/Rocket.Chat/issues) to see if there's anything you can help with.
+So if you'd like to be part of the project, please check out the [roadmap](https://github.com/RocketChat/Rocket.Chat/milestones) and [issues](https://github.com/RocketChat/Rocket.Chat/issues) to see if there's anything you can help with.
 
 ### Community
 

client/stylesheets/base.less

@@ -992,6 +992,7 @@ a.github-fork {
 		> .wrapper {
 			direction: ltr;
 			padding-left: 8px;
+			padding-bottom: 1em;
 		}
 	}
 	.input-error {
@@ -1078,9 +1079,17 @@ a.github-fork {
 		color: @tertiary-font-color;
 		line-height: 28px;
 		padding-left: 10px;
+
+		a {
+			color: inherit;
+			display: block;
+		}
+		&:hover {
+			background-color: rgba(0, 0, 0, 0.1);
+		}
+
 		&.add-room {
 			&:hover {
-				background-color: rgba(0, 0, 0, 0.1);
 				i{
 					&:before{
 						.transform(rotate(180deg));

client/stylesheets/fontello.css

 @font-face {
   font-family: 'fontello';
-  src: url('/fonts/fontello.eot?19437876');
-  src: url('/fonts/fontello.eot?19437876#iefix') format('embedded-opentype'),
-       url('/fonts/fontello.woff?19437876') format('woff'),
-       url('/fonts/fontello.ttf?19437876') format('truetype'),
-       url('/fonts/fontello.svg?19437876#fontello') format('svg');
+  src: url('/fonts/fontello.eot?19437877');
+  src: url('/fonts/fontello.eot?19437877#iefix') format('embedded-opentype'),
+       url('/fonts/fontello.woff?19437877') format('woff'),
+       url('/fonts/fontello.ttf?19437877') format('truetype'),
+       url('/fonts/fontello.svg?19437877#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -14,7 +14,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('/fonts/fontello.svg?19437876#fontello') format('svg');
+    src: url('/fonts/fontello.svg?19437877#fontello') format('svg');
   }
 }
 */

client/views/app/sideNav/channels.html

@@ -10,6 +10,6 @@
 			{{/each}}
 		</ul>
 	{{else}}
-		<p class="empty">You aren't part of any channel yet.</p>
+		<p class="empty">{{_ "chatRooms.No_channels_yet" }}</p>
 	{{/if}}
-</template>
\ No newline at end of file
+</template>

client/views/app/sideNav/chatRoomItem.html

@@ -7,7 +7,7 @@
 			<i class="{{roomIcon}} {{userStatus}}"></i>
 			<span>{{name}}</span>
 			<span class='opt'>
-				{{!-- <i class="icon-cancel-circled hide-room" title="{{_ "chatRoomItem.Hide_room"}}"></i> --}}
+				<i class="icon-cancel-circled hide-room" title="{{_ "chatRoomItem.Hide_room"}}"></i>
 				{{#if canLeave}}
 					<i class="icon-logout leave-room" title="{{_ "chatRoomItem.Leave_room"}}"></i>
 				{{/if}}

client/views/app/sideNav/directMessages.html

@@ -9,6 +9,6 @@
 			{{/each}}
 		</ul>
 	{{else}}
-		<p class="empty">You haven't started any conversations yet.</p>
+		<p class="empty">{{_ "chatRooms.No_direct_messages_yet" }}</p>
 	{{/if}}
 </template>

client/views/app/sideNav/privateGroups.html

@@ -10,7 +10,7 @@
 			{{/each}}
 		</ul>
 	{{else}}
-		<p class="empty">You have no private groups yet.</p>
+		<p class="empty">{{_ "chatRooms.No_groups_yet" }}</p>
 	{{/if}}
 
 

client/views/app/sideNav/sideNav.html

@@ -10,6 +10,10 @@
 					{{> channels }}
 					{{> directMessages }}
 					{{> privateGroups }}
+
+					<h3>
+						<a href="{{pathFor 'privateHistory'}}">{{_ "general.History"}}</a>
+					</h3>
 				</div>
 			</div>
 			<div class="flex-nav hidden">

client/views/app/sideNav/starredRooms.html

@@ -7,6 +7,6 @@
 			{{/each}}
 		</ul>
 	{{else}}
-		<p class="empty">You haven't added any favorites yet.</p>
+		<p class="empty">{{_ "chatRooms.No_favorites_yet" }}</p>
 	{{/if}}
 </template>

i18n/en.i18n.json

@@ -30,7 +30,11 @@
 		"Members": "Members",
 		"Selected_users": "Selected members",
 		"Save": "Save",
-		"Cancel": "Cancel"
+		"Cancel": "Cancel",
+		"No_channels_yet": "You aren't part of any channel yet.",
+		"No_direct_messages_yet": "You haven't started any conversations yet.",
+		"No_groups_yet": "You have no private groups yet.",
+		"No_favorites_yet": "You haven't added any favorites yet."
 	},
 	"chatWindowDashboard": {
 		"Add_users": "Add users",

i18n/pt.i18n.json

@@ -30,7 +30,11 @@
 		"Members": "Membros",
 		"Selected_users": "Membros selecionados",
 		"Save": "Salvar",
-		"Cancel": "Cancelar"
+		"Cancel": "Cancelar",
+		"No_channels_yet": "Você não faz parte de nenhum canal ainda.",
+		"No_direct_messages_yet": "Você não iniciou nenhuma conversa ainda.",
+		"No_groups_yet": "Nenhum grupo privado ainda.",
+		"No_favorites_yet": "Nenhum favorito ainda."
 	},
 	"chatWindowDashboard": {
 		"Add_users": "Adicionar usuários",