Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00
Code Issues Releases Wiki Activity
122 Commits 3 Branches 25 Tags 4.7 MiB
c9669eb07f
Commit Graph

122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Düsterhus
c9669eb07f Use ChatRoom::getTitle instead of $chatroom->title|language 2011-12-10 21:54:44 +01:00
Tim Düsterhus
44454e12e0 Merge branch 'master' into chatTemplate 
Conflicts:
	file/lib/page/ChatPage.class.php
 2011-12-10 21:53:56 +01:00
Tim Düsterhus
08c8e8b44b Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2011-12-10 21:52:24 +01:00
Tim Düsterhus
136bdde006 Use language-specific title 2011-12-10 21:51:44 +01:00
max-m
12ccf89d30 Added possibility of using Chat/Log and Chat/Send as routes 2011-12-10 21:36:33 +01:00
Tim Düsterhus
812ce1d5d4 Check some of our options 2011-12-10 18:05:21 +01:00
max-m
e938614f01 Fixed TimeIntervalOptionType 2011-12-10 17:32:42 +01:00
Tim Düsterhus
0eb439e75f Use fetchColumn to fetch the object-ids 2011-12-10 17:20:57 +01:00
Tim Düsterhus
c062a7f956 Merge branch 'master' into chatTemplate 2011-12-10 16:58:36 +01:00
Tim Düsterhus
7e0dd0517d Validate module 2011-12-10 16:56:36 +01:00
Tim Düsterhus
177791061d Merge branch 'chatTemplate' of github.com:wbbaddons/Tims-Chat into chatTemplate 2011-12-10 16:52:54 +01:00
Tim Düsterhus
3df2fd39c8 Attempt to fix option-type 2011-12-10 16:52:40 +01:00
Tim Düsterhus
07657cfea0 Merge branch 'master' into chatTemplate 2011-12-10 16:47:23 +01:00
Tim Düsterhus
830182dcf8 Parse normal messages with SimpleMessageParser 2011-12-10 16:47:15 +01:00
Tim Düsterhus
086f420564 Merge branch 'master' into chatTemplate 2011-12-10 16:40:55 +01:00
Tim Düsterhus
cd0928a881 Fixing namespace of XSD 2011-12-10 16:40:45 +01:00
max-m
67cea18b32 Renamed TimeIntervalOptionType.php 2011-12-10 16:39:53 +01:00
Tim Düsterhus
a38643d3fb Adding TimeIntervalOptionType 2011-12-10 16:15:49 +01:00
Tim Düsterhus
cc2902f720 Merge branch 'chatTemplate' of github.com:wbbaddons/Tims-Chat into chatTemplate 2011-12-10 15:59:39 +01:00
Tim Düsterhus
3215fc4aec Adding missing semicolon 2011-12-10 15:57:38 +01:00
max-m
d7855b2af3 Added new options an language vars 
Added new options and language vars,
edited chatJavascriptInclude.tpl to conform to the HTML5 standard
 2011-12-10 15:42:15 +01:00
Tim Düsterhus
4cf51f74be Adding PHPDoc for ChatMessage::jsonify 2011-12-10 15:24:36 +01:00
Tim Düsterhus
ac3dfbde0e Revert "Slight rewrite of ChatUtil::gradient()" 
This reverts commit 7b07072a8e.

Conflicts:

	file/lib/util/ChatUtil.class.php
 2011-12-10 14:45:14 +01:00
Tim Düsterhus
b78f5561d0 Adding ChatUtil::timeModifier 2011-12-10 14:43:18 +01:00
Tim Düsterhus
7b07072a8e Slight rewrite of ChatUtil::gradient() 2011-12-10 14:25:36 +01:00
Tim Düsterhus
bb730c1321 Updating title of Log-Tab 2011-12-10 12:47:35 +01:00
Tim Düsterhus
17051c72d6 Merge branch 'master' into chatTemplate 2011-12-09 23:43:20 +01:00
Tim Düsterhus
7ead2148e4 Renaming __tostring to __toString 2011-12-09 23:42:16 +01:00
max-m
e537788732 Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2011-12-09 19:52:46 +01:00
max-m
29cdce2e67 Added option.xml 2011-12-09 19:50:21 +01:00
Tim Düsterhus
ebbd54b343 Revert "Add <time>-Tag" 
This reverts commit 768c4f0066.
 2011-12-05 21:21:12 +01:00
Tim Düsterhus
cbd2814659 Style the time :) 2011-12-05 21:17:01 +01:00
Tim Düsterhus
768c4f0066 Add <time>-Tag 2011-12-05 21:14:14 +01:00
Tim Düsterhus
c744a0ed6f Fixing toString of ChatRoom 2011-12-05 20:25:18 +01:00
Tim Düsterhus
e35a6a2f04 Fixing namespace declaration 2011-12-05 18:00:03 +01:00
Tim Düsterhus
9b3851ed59 Get some more space :) 2011-12-05 17:12:30 +01:00
Tim Düsterhus
b8c85813b0 Moving gradient into ChatUtil 2011-12-05 16:53:12 +01:00
Tim Düsterhus
ac5ef926e3 Wrap the time into <time> 2011-12-05 15:40:30 +01:00
Tim Düsterhus
8f2fc01231 Add formatted time for display in template 2011-12-05 15:39:56 +01:00
Tim Düsterhus
63cd1a31b3 Scroll the messages down automatically 2011-12-05 14:58:01 +01:00
Tim Düsterhus
dd0e4eb4d8 ChatMessage container will now scroll 2011-12-05 14:54:25 +01:00
Tim Düsterhus
f76fcca04d Optimizing use of chatMessage-Template. We can now insert messages via JS 2011-12-05 14:45:50 +01:00
Tim Düsterhus
725a94aeb2 Adding chatMessage-Template 2011-12-04 23:12:12 +01:00
Tim Düsterhus
ca2d596d31 Adding language-items to be used in GUI 
… and actually use them!
 2011-12-04 23:00:58 +01:00
Tim Düsterhus
86491edea1 Merge branch 'master' into chatTemplate 2011-12-04 22:59:27 +01:00
Tim Düsterhus
c4e1a2bbdc Adding language-items for JOIN and LEAVE 2011-12-04 22:59:13 +01:00
Tim Düsterhus
91a7cda256 Show "Information" instead of username in information messages 2011-12-04 22:57:15 +01:00
Tim Düsterhus
cc38d47c7d Show formatted message in chat 2011-12-04 22:55:56 +01:00
Tim Düsterhus
7def9d4efd Merge branch 'master' into chatTemplate 2011-12-04 22:54:55 +01:00
Tim Düsterhus
adc5b049cc Adding method to get the formatted message 2011-12-04 22:54:48 +01:00