Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-11-01 14:20:07 +00:00
Code Issues Releases Wiki Activity
548 Commits 3 Branches 25 Tags 4.7 MiB
35f61fefd4
Commit Graph

224 Commits

Author SHA1 Message Date
Tim Düsterhus
1ffd7c7828 Adding predefined oxford color 2012-01-30 18:16:15 +01:00
Tim Düsterhus
d2f6e3c88a Fixing Color-Command 2012-01-30 18:13:16 +01:00
Tim Düsterhus
5eb9aea503 2011 -> 2012 2012-01-30 17:48:13 +01:00
Tim Düsterhus
b15391f421 Merge branch 'master' into commands 
Conflicts:
	file/js/TimWolla.WCF.Chat.coffee
	file/lib/system/chat/commands/ChatCommandHandler.class.php
 2012-01-30 17:46:54 +01:00
Tim Düsterhus
58484b2ec0 Fixing UTF-8 issue 2012-01-28 17:51:35 +01:00
Tim Düsterhus
2f937df323 2011 -> 2012 2012-01-28 17:50:33 +01:00
Tim Düsterhus
7fe21df49c Show newestMessages when switching room via ajax as well 2012-01-28 16:56:20 +01:00
max-m
7c8a72e89c Check if the executed command actually is "free the fish". 2012-01-28 15:23:33 +01:00
Tim Düsterhus
5e177e614f Adding Color-Command 2012-01-22 15:40:25 +01:00
Tim Düsterhus
94a48df147 Merge branch 'master' into commands 
Conflicts:
	file/lib/data/chat/message/ChatMessage.class.php
 2012-01-22 14:10:10 +01:00
Tim Düsterhus
c2745de23b Show text/plain message 2012-01-21 19:05:34 +01:00
Tim Düsterhus
331bcf3049 Code format and removing unneeded templatelistener 2012-01-21 17:45:53 +01:00
Tim Düsterhus
569cab1f95 Save images as base64 to prevent problems with editors that do not like binary data 2012-01-21 17:22:17 +01:00
Tim Düsterhus
c38eb73b12 Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2012-01-18 21:43:57 +01:00
Tim Düsterhus
729ee194f1 Adding Max' shroom to chat-copyright-page 2012-01-18 21:43:26 +01:00
Tim Düsterhus
4a9e1cb1e4 Fixing problem with empty newestMessages 2012-01-18 21:18:03 +01:00
Tim Düsterhus
8b29cbb557 Adding ChatCopyrightPage with overlay 
-> Moving Link into chatControls
 2012-01-14 16:33:44 +01:00
Tim Düsterhus
36592b0d9e Moving lastSeen a bit around to see your join when inline-room-changing 2012-01-14 12:53:18 +01:00
Tim Düsterhus
bedb5dcea5 Cleaning up ChatMessagePage 2012-01-14 12:50:57 +01:00
Tim Düsterhus
cf07716179 Adding basic user-sending 2012-01-12 20:04:28 +01:00
Tim Düsterhus
a942396b7c Use current() 2012-01-03 13:10:46 +01:00
Tim Düsterhus
f020c8a20f Adding missing space 2011-12-27 14:39:42 +01:00
Tim Düsterhus
fd6739bd2d Commands return the receiver now as well 2011-12-27 14:39:35 +01:00
Tim Düsterhus
6046e40cc2 Adding /me 2011-12-27 14:32:28 +01:00
Tim Düsterhus
cfa7ce79a9 Adding separator 2011-12-27 14:21:06 +01:00
Tim Düsterhus
83713fc56e Use language-items 2011-12-27 14:17:13 +01:00
Tim Düsterhus
0dcb2823c3 ME and WHISPER are parsed like normal messages 2011-12-27 14:16:29 +01:00
Tim Düsterhus
bb50e76463 Change username on error-type as well 2011-12-27 14:09:29 +01:00
Tim Düsterhus
a2638046eb Adding Basic command system. 
To be improved!
 2011-12-27 14:04:26 +01:00
Tim Düsterhus
22c2f481d5 Added possibility for user transmission 2011-12-27 12:44:36 +01:00
Tim Düsterhus
530c2ab788 Adding raw-parameter for jsonify 2011-12-27 12:38:05 +01:00
Tim Düsterhus
b7683db870 Correcting PHPDoc 2011-12-27 12:35:58 +01:00
Tim Düsterhus
a9f0cc86f5 Set new lastSeen-message 2011-12-26 19:00:32 +01:00
Tim Düsterhus
f2930612d1 Validate room in form 2011-12-26 17:07:46 +01:00
Tim Düsterhus
d2670d47c3 Adding ChatMessagePage 2011-12-26 17:01:24 +01:00
Tim Düsterhus
bdb7ec3b0d Improved Message-DBOs + Save last seen message in user_storage 2011-12-26 16:31:37 +01:00
Tim Düsterhus
c83336c9fb Merge branch 'master' into chatTplRedesign 2011-12-26 16:05:29 +01:00
Tim Düsterhus
7d3a0ec830 Check whether one can enter the room 2011-12-26 14:14:03 +01:00
Tim Düsterhus
91bab27535 Check permissions in RefreshRoomList 2011-12-26 12:45:05 +01:00
Tim Düsterhus
f231ce5aae Check permissions in Page-Menu 2011-12-26 12:43:19 +01:00
Tim Düsterhus
90f1213ef7 Avoiding problem with default-values 2011-12-24 16:59:29 +01:00
Tim Düsterhus
b15f4aca16 Use Regex-class 2011-12-23 20:28:09 +01:00
max-m
0f411e8015 Moved readUserData to chatUtil 
closes 2
 2011-12-23 15:26:54 +01:00
max-m
602f824e85 Smiley-switch works now. 2011-12-20 21:20:32 +01:00
Tim Düsterhus
d69b7cc6d9 Merge branch 'master' into chatTplRedesign 2011-12-19 16:46:03 +01:00
Tim Düsterhus
80daee9c46 Adding Permission-Handler for ACL 2011-12-19 16:22:56 +01:00
Tim Düsterhus
7076988c02 Shortcut :) 2011-12-19 16:14:27 +01:00
Tim Düsterhus
52445e9cb9 Automatically refresh the room-list 2011-12-18 16:09:40 +01:00
Tim Düsterhus
818d51608c Merge branch 'chatTplRedesign' of github.com:wbbaddons/Tims-Chat into chatTplRedesign 
Conflicts:
	template/chat.tpl
 2011-12-18 15:49:17 +01:00
Tim Düsterhus
a8a69eaaa9 Encoded the chars in ChatUtil::gradient() 2011-12-17 18:40:20 +01:00
Tim Düsterhus
966a4f57d3 Finally fixing ChatPageMenuItemProvider 2011-12-15 17:14:55 +01:00
Tim Düsterhus
c24402ec86 Fix getLink 
Call isVisible again directly before getLink to ensure the pointer is at the first place.
... and we also have to return the new link! ;)
 2011-12-15 10:56:22 +01:00
Tim Düsterhus
18d27897e4 Implemented getLink for ChatPageMenuItemProvider 2011-12-15 10:54:18 +01:00
Tim Düsterhus
c50df5be07 Adding S to TIME_MODIFIER_REGEX 2011-12-14 17:25:16 +01:00
Tim Düsterhus
15a7456aba Fixing bug with empty string 2011-12-14 17:24:41 +01:00
Tim Düsterhus
44737e2df2 Introducing ChatCommandHandler 2011-12-13 23:10:29 +01:00
Tim Düsterhus
a5c1f7c575 Filling ChatForm with life 2011-12-13 23:02:00 +01:00
Tim Düsterhus
510ee9645e Adding ChatMessageAction 2011-12-13 22:35:11 +01:00
Tim Düsterhus
2b6666246b Moving resetCache-method into ChatRoomEditor 2011-12-13 22:18:04 +01:00
Tim Düsterhus
d4d748950a Adding ChatForm-skeleton 2011-12-13 22:10:35 +01:00
Tim Düsterhus
c5821e543b Adding UTF-8 save version of str_split 2011-12-13 18:15:30 +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
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
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
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
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
c6184376c5 Use FQN of WCF in ChatPageMenuItemProvider 2011-11-29 16:57:44 +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
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
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