1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-11-01 14:20:07 +00:00
Commit Graph

676 Commits

Author SHA1 Message Date
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
max-m
ac6ce5dfac Fixed topic animation. 2011-12-03 21:23:13 +01:00
Tim Düsterhus
3bf303a612 Change Page-Title as well 2011-12-03 18:07:57 +01:00
Tim Düsterhus
d470fc8ebe We have to exit; here, 'cause show does not
That was different in WCF 1.1, wasn't it?
2011-12-03 17:53:36 +01:00
Tim Düsterhus
10509645da Again removed the topic-message
Fail.
2011-12-03 17:38:28 +01:00
Tim Düsterhus
65de6db578 Room-Change via Ajax is functional now 2011-12-03 17:37:20 +01:00
Tim Düsterhus
1ac020f216 Removing topic-message as topic will be displayed outside the stream 2011-12-03 15:23:28 +01:00
Tim Düsterhus
96e13535e1 Mark new room as active
... and old one no longer as active
2011-12-03 15:06:36 +01:00
Tim Düsterhus
8b2f5c7bb7 Adding click-event for chat-rooms 2011-12-03 15:01:54 +01:00
Tim Düsterhus
e2b7f5df6a Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2011-12-03 14:17:37 +01:00
Tim Düsterhus
46c063085d Adding onbeforeunload-event 2011-12-02 23:16:55 +01:00
max-m
65e7054f1e Reformatted chat1.svg
Added title, description, author, copyright and license informations; added "global" style information; deleted double leaderLine on "Lower" layer
2011-11-30 18:15:39 +01:00
max-m
5402a7aaf4 Decrapified chat1.svg 2011-11-29 17:03:38 +01:00
Tim Düsterhus
c6184376c5 Use FQN of WCF in ChatPageMenuItemProvider 2011-11-29 16:57:44 +01:00
max-m
bca0772268 Replaced chat icon
Replaced the old chat icon with a new WCF-styled SVG one
2011-11-29 16:46:41 +01:00
Tim Düsterhus
66f9cd2ec7 Insert Topic-Message 2011-11-28 21:40:37 +01:00
Tim Düsterhus
3f3fc9e130 Save colors in user-storage
Additionally reorganized file.
2011-11-28 21:10:19 +01:00
Tim Düsterhus
f57d178654 Adding ChatRoomEditor 2011-11-27 20:20:13 +01:00
Tim Düsterhus
e5455475f7 Adding method to clear the room-cache. 2011-11-27 20:15:22 +01:00
Tim Düsterhus
96e835e738 Hide PageMenuItem for guests
They cannot view the page anyway ;)
2011-11-27 20:01:28 +01:00
Tim Düsterhus
3ef8578a46 Guests are not supported. 2011-11-27 17:22:07 +01:00
Tim Düsterhus
0a1c65db17 Avoid caching of old versions of JS-File 2011-11-27 13:33:44 +01:00
Tim Düsterhus
c28b0a3067 Alert smiley-code on click.
Will be replaced with inserting into input lateron.
2011-11-27 13:13:59 +01:00
Tim Düsterhus
3314249c44 Read Smilies from default category. 2011-11-27 13:07:53 +01:00
Tim Düsterhus
0e25a9b821 Remove Index Breadcrumb
We have more space now. The chat doesn't really belong to "Forum" either
2011-11-27 12:49:13 +01:00
Tim Düsterhus
5c72cd52be Adding PageMenuItem for chat 2011-11-27 12:46:10 +01:00
Tim Düsterhus
c92e1079c3 Throw IllegalLinkException when no room is there
Additionally added dummy join message.
2011-11-27 12:38:02 +01:00
Tim Düsterhus
6bc4285f30 Adding ChatMessage DataBaseObjects 2011-11-27 12:33:20 +01:00
Tim Düsterhus
74464ff83b Redirect to correct room if there is no id given
Additionally pass rooms to template
2011-11-26 19:54:06 +01:00
Tim Düsterhus
aba9a07a3c Changing CacheBuilder to return the list rather than an array
Furthermore if the parameter is not passend we will select the first room automatically
2011-11-26 17:51:06 +01:00
Tim Düsterhus
8ee9b0a207 Validating ID-Parameter 2011-11-26 17:37:46 +01:00
Tim Düsterhus
063fb644b0 Read $_GET['id'] and pass it to template 2011-11-26 17:19:34 +01:00
Tim Düsterhus
aabebd820e Added ChatRoom DataBaseObjects 2011-11-26 16:54:50 +01:00
Tim Düsterhus
b5da946b4d Adding chatL.png-icon 2011-11-26 15:29:46 +01:00
Tim Düsterhus
653bb7d88b PageMenu-Item is now marked as active 2011-11-26 15:29:28 +01:00
Tim Düsterhus
8cd5aaed42 Adding basic file-structure 2011-11-26 15:17:17 +01:00