1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00

Merge branch '3.0.x' of github.com:wbbaddons/Tims-Chat into 3.0.x

This commit is contained in:
Tim Düsterhus 2014-09-19 23:19:54 +02:00
commit 0f4b99da26
3 changed files with 3 additions and 3 deletions

View File

@ -101,7 +101,7 @@ Initialize **Tims Chat**. Bind needed DOM events and initialize data structures.
When **Tims Chat** becomes focused mark the chat as active and remove the number of new messages from the title. When **Tims Chat** becomes focused mark the chat as active and remove the number of new messages from the title.
$(window).focus -> $(window).focus ->
document.title = v.titleTemplate.fetch(roomList.active) if roomList.active?.title? and roomList.active.topic.trim() isnt '' document.title = v.titleTemplate.fetch(roomList.active) if roomList.active?.title? and roomList.active.title.trim() isnt ''
newMessageCount = 0 newMessageCount = 0
isActive = true isActive = true

View File

@ -152,7 +152,7 @@ Probieren Sie, den Chat neu zu laden<!-- , bei Risiken und Nebenwirkungen fragen
<item name="chat.global.rooms"><![CDATA[Chaträume]]></item> <item name="chat.global.rooms"><![CDATA[Chaträume]]></item>
<item name="chat.global.users"><![CDATA[Nutzer]]></item> <item name="chat.global.users"><![CDATA[Nutzer]]></item>
<item name="chat.global.copyright"><![CDATA[<a href="http://tims.bastelstu.be"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}><strong>Tims Chat{if SHOW_VERSION_NUMBER} {PACKAGE_VERSION}{/if}</strong>, entwickelt in <strong>Tims Bastelstube</strong></a>]]></item> <item name="chat.global.copyright"><![CDATA[<a href="http://tims.bastelstu.be"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}><strong>Tims Chat{if SHOW_VERSION_NUMBER} {PACKAGE_VERSION}{/if}</strong>, entwickelt in <strong>Tims Bastelstu.be</strong></a>]]></item>
<item name="chat.global.copyright.leader"><![CDATA[Projektleiter]]></item> <item name="chat.global.copyright.leader"><![CDATA[Projektleiter]]></item>
<item name="chat.global.copyright.developer"><![CDATA[Entwickler]]></item> <item name="chat.global.copyright.developer"><![CDATA[Entwickler]]></item>
<item name="chat.global.copyright.graphics"><![CDATA[Grafisches]]></item> <item name="chat.global.copyright.graphics"><![CDATA[Grafisches]]></item>

View File

@ -152,7 +152,7 @@ Please try to reload the chat.]]></item>
<item name="chat.global.rooms"><![CDATA[Chatrooms]]></item> <item name="chat.global.rooms"><![CDATA[Chatrooms]]></item>
<item name="chat.global.users"><![CDATA[Users]]></item> <item name="chat.global.users"><![CDATA[Users]]></item>
<item name="chat.global.copyright"><![CDATA[<a href="http://tims.bastelstu.be"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}><strong>Tims Chat{if SHOW_VERSION_NUMBER} {PACKAGE_VERSION}{/if}</strong>, developed in <strong>Tims Bastelstube</strong></a>]]></item> <item name="chat.global.copyright"><![CDATA[<a href="http://tims.bastelstu.be"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}><strong>Tims Chat{if SHOW_VERSION_NUMBER} {PACKAGE_VERSION}{/if}</strong>, developed in <strong>Tims Bastelstu.be</strong></a>]]></item>
<item name="chat.global.copyright.leader"><![CDATA[Project Lead]]></item> <item name="chat.global.copyright.leader"><![CDATA[Project Lead]]></item>
<item name="chat.global.copyright.developer"><![CDATA[Developers]]></item> <item name="chat.global.copyright.developer"><![CDATA[Developers]]></item>
<item name="chat.global.copyright.graphics"><![CDATA[Graphics]]></item> <item name="chat.global.copyright.graphics"><![CDATA[Graphics]]></item>