diff --git a/README.md b/README.md
index c22a3c4425d84615e1a05cbca643fbd2c2e9841b..519dfecc3fb1e0b225f206e39babcd78a4a169d6 100644
--- a/README.md
+++ b/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
diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index caf913d39ebc77955dafaa4530f951f437c229b5..bdfb1e371923f4dbe7428dcd7b9735cfcbd609bc 100644
--- a/client/stylesheets/base.less
+++ b/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));
diff --git a/client/stylesheets/fontello.css b/client/stylesheets/fontello.css
index 83b25a4aaf7cbaba06f65027a363efef70494d24..a92d649b08db39fc7d742b6765a8a3111cf1e1f8 100644
--- a/client/stylesheets/fontello.css
+++ b/client/stylesheets/fontello.css
@@ -1,10 +1,10 @@
@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');
}
}
*/
diff --git a/client/views/app/sideNav/channels.html b/client/views/app/sideNav/channels.html
index fc8f76f6faa14e227a7e3a55d9808265664896e9..bd59d5c704a859ebd4d2b13c5dc6829eab9e5474 100644
--- a/client/views/app/sideNav/channels.html
+++ b/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>
diff --git a/client/views/app/sideNav/chatRoomItem.html b/client/views/app/sideNav/chatRoomItem.html
index 75931d6fcc80da0e1721d2086694f88a8dde04d6..348ef065994bb8492c7df761981421009a0e8fd3 100644
--- a/client/views/app/sideNav/chatRoomItem.html
+++ b/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}}
diff --git a/client/views/app/sideNav/directMessages.html b/client/views/app/sideNav/directMessages.html
index 49e2221f05f1688c8eaed47bc0c21607bbd65c0e..b2e931c351ca87fd0372433e1f764e8beeeb9b20 100644
--- a/client/views/app/sideNav/directMessages.html
+++ b/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>
diff --git a/client/views/app/sideNav/privateGroups.html b/client/views/app/sideNav/privateGroups.html
index df87137b9fba428ce1aff10b2491233446bc0196..61fc1d919d5609f7f153fd1e4a85772875b3afc8 100644
--- a/client/views/app/sideNav/privateGroups.html
+++ b/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}}
diff --git a/client/views/app/sideNav/sideNav.html b/client/views/app/sideNav/sideNav.html
index 3389ec2f5afa365d9162a6c175adc2df144f042a..c9dfe2930d911023f53aa15e345a6820b6adb464 100644
--- a/client/views/app/sideNav/sideNav.html
+++ b/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">
diff --git a/client/views/app/sideNav/starredRooms.html b/client/views/app/sideNav/starredRooms.html
index 3d533cac02798790b2b5d290713cf75af1cf8a2d..fedba07cc22d0a7d5ec3d8dedfb5e4695b6d1900 100644
--- a/client/views/app/sideNav/starredRooms.html
+++ b/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>
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 78d5cdd2c763592807fc79de25ae6f758fe45e4f..0d32ed6de46ebbd9fa621422703ff229b859c452 100644
--- a/i18n/en.i18n.json
+++ b/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",
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index b784fc47e682255e3c97f78d066ff7f34604acbc..08cc1369f7938dcb24baa64ebc8b83a3e078d11c 100644
--- a/i18n/pt.i18n.json
+++ b/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",