Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-23 21:50:09 +00:00
Code Issues Releases Wiki Activity
136 Commits 3 Branches 25 Tags 4.7 MiB
c7d867905f
Commit Graph

85 Commits

Author SHA1 Message Date
Tim Düsterhus
c7d867905f Adding options-object for insertText 2011-12-12 16:16:24 +01:00
max-m
1d8b96aefc Fixed typo 2011-12-12 15:52:36 +01:00
max-m
29174e5afc Completely reworked frontend 2011-12-11 23:29:43 +01:00
Tim Düsterhus
9e08160a18 Merge branch 'master' into chatTemplate 2011-12-11 13:41:09 +01:00
Tim Düsterhus
96f468b3ca Adding onSubmit-event-skeleton and correct icon-urls 2011-12-11 13:27:39 +01:00
Tim Düsterhus
f8024bbf2b Adding insertText method 2011-12-11 13:01:35 +01:00
Tim Düsterhus
df68fbc889 Adding onError for room-change 2011-12-11 12:58:13 +01:00
max-m
9c9a76245d Use getTitle instead ... 
I had forgotten to change it in my workingdir, so I'd overwride it in my
last commit :(
 2011-12-10 22:21:40 +01:00
max-m
6652cb4c09 Added phpdoc and corrected codingstyle ;) 2011-12-10 22:15:23 +01:00
Tim Düsterhus
c2d5588f97 Merge branch 'master' into chatTemplate 2011-12-10 21:55:45 +01:00
Tim Düsterhus
cbcf875fe1 Use getTitle-method 2011-12-10 21:55:34 +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
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
3215fc4aec Adding missing semicolon 2011-12-10 15:57:38 +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
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
Tim Düsterhus
ebbd54b343 Revert "Add <time>-Tag" 
This reverts commit 768c4f0066.
 2011-12-05 21:21:12 +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
b8c85813b0 Moving gradient into ChatUtil 2011-12-05 16:53:12 +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
f76fcca04d Optimizing use of chatMessage-Template. We can now insert messages via JS 2011-12-05 14:45:50 +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
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
Tim Düsterhus
f159d952ca Adding ChatMessageList 
Show the newest 5 messages on join.
Adding method to get formatted nickname
 2011-12-04 22:46:50 +01:00
Tim Düsterhus
d20fd79ece Optimizing our JavaScript 2011-12-04 19:06:34 +01:00
max-m
e7e8457ca5 Made userlist toggleable. 2011-12-04 11:52:56 +01:00
max-m
f47b796051 Deleted spinner background 2011-12-04 01:32:14 +01:00
max-m
c0f481fb13 Prevent new loading of active channel. 2011-12-04 01:27:21 +01:00
max-m
bc604dc658 Added ajax loading indicators next to channel name. 2011-12-04 00:44:16 +01:00