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
1,090 Commits 3 Branches 25 Tags 4.7 MiB
b99a625a36
Commit Graph

767 Commits

Author SHA1 Message Date
Tim Düsterhus
cbde0dea50 Adding error handling when messages couldn't be loaded 2012-03-03 22:55:24 +01:00
Tim Düsterhus
a484c6d9c3 Adding some more ACL 2012-03-03 22:00:54 +01:00
Tim Düsterhus
b103dff5f9 Adding For Update to query 2012-03-03 21:40:43 +01:00
Tim Düsterhus
86544d5ae8 Made rooms sortable 2012-03-03 21:36:52 +01:00
Tim Düsterhus
5f3abffcd2 Fix for untestet commit. Importing WCF 2012-03-01 22:17:40 +01:00
Tim Düsterhus
c1ccfd2998 Moving user fetching into ChatRoom 
Untested commit incoming
 2012-03-01 22:11:20 +01:00
Tim Düsterhus
4e78ee9690 Forgot one file… 2012-02-26 18:17:07 +01:00
Tim Düsterhus
4152462ade Include ACL-group-permissions as well 2012-02-26 18:16:28 +01:00
Tim Düsterhus
dbd4e7b849 Adding ACL-Administration 
plus correcting comments and fixing unload handler
 2012-02-26 17:55:44 +01:00
Tim Düsterhus
38977abbd8 Removing WCF.Action.Toggle as it has no effect 2012-02-26 11:12:29 +01:00
Tim Düsterhus
18b6ac9ca6 .smiley -> .jsSmiley 2012-02-18 17:42:15 +01:00
Tim Düsterhus
409c6c068f ChatLeaveAction is now called on unloading 2012-02-18 17:35:33 +01:00
Tim Düsterhus
a7e6bab0cd Adding ChatLeaveAction to Routing 2012-02-18 17:21:57 +01:00
Tim Düsterhus
856587648a Adding ChatLeaveAction 
Still need to be called on unload.
 2012-02-18 15:48:58 +01:00
Tim Düsterhus
af12204f13 Fixing ChatUtil 2012-02-18 15:41:58 +01:00
Tim Düsterhus
4357ccf342 Default color ist generated randomly now 2012-02-16 18:21:33 +01:00
Tim Düsterhus
7b81b91454 Fixed updating of the badges. 2012-02-12 15:33:50 +01:00
Tim Düsterhus
744d26b40a Add missing js und wcf- Prefix 2012-02-12 12:32:21 +01:00
Tim Düsterhus
f6ba0bfc7f Use $this->objectAction to match WoltLab/WCF@635dd8c454 2012-02-11 17:42:56 +01:00
Tim Düsterhus
3f3c011661 Fixing badges 2012-02-09 21:19:48 +01:00
Tim Düsterhus
d3c2cc5a10 Use .default for hot-status 
Thanks @Luzifr
 2012-02-07 17:39:24 +01:00
Tim Düsterhus
a8ae61b4e1 Fixing some classes, real buttons 2012-02-06 18:35:09 +01:00
Tim Düsterhus
5cb790cbb4 Blue icon in navigation 2012-02-06 17:56:46 +01:00
Tim Düsterhus
f5a7f6d940 Don't use RELATIVE_WCF_DIR 
To comply with WoltLab/WCF@ef1f1061b6
 2012-02-05 21:54:37 +01:00
Tim Düsterhus
d0800739bb Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2012-02-05 21:48:39 +01:00
Tim Düsterhus
c89c0e9d08 Use ChatRoomAction 2012-02-05 21:48:09 +01:00
max-m
3ec195d10e Fixes animation of old messages due to channelchange 2012-02-05 21:35:56 +01:00
Tim Düsterhus
5ad865d232 Merge branch 'acp' 
Conflicts:
	install.sql
 2012-02-05 20:59:11 +01:00
Tim Düsterhus
b87d577aa1 Fixed validation 2012-02-05 20:50:13 +01:00
Tim Düsterhus
2a6fbec0d7 Renaming a missed #topic 2012-02-05 20:46:52 +01:00
Tim Düsterhus
bc614c44ca Fixed updating of topic 2012-02-05 20:36:11 +01:00
Tim Düsterhus
18b097ff9b Reset oldScrollTop to null when clearing the chat 2012-02-05 19:19:27 +01:00
Tim Düsterhus
f82717d839 Break if no users where found. 2012-02-05 19:11:08 +01:00
Tim Düsterhus
3ae3909b55 Adding ID to each message, ensure every message is shown only once 2012-02-05 19:06:00 +01:00
Tim Düsterhus
3243f82f07 Sending 204 No Content in ChatForm 2012-02-05 18:49:17 +01:00
Tim Düsterhus
e7ac15d09c Merge branch 'master' into commands 
Conflicts:
	file/js/TimWolla.WCF.Chat.coffee
 2012-02-05 18:33:42 +01:00
Tim Düsterhus
60bad41091 Removing unused imports 2012-02-05 18:30:27 +01:00
Tim Düsterhus
84622365b0 Adding ChatRoomEditForm 2012-02-05 18:29:16 +01:00
Tim Düsterhus
3bd1f13faa Merge branch 'master' into acp 2012-02-05 18:08:25 +01:00
unknown
3c442c2371 Added the new CSS-prefixes 2012-02-05 18:04:23 +01:00
Tim Düsterhus
720b25f380 Get text-overflow working for our sidebar 2012-02-04 22:37:54 +01:00
Tim Düsterhus
ed5daa1e0a Adding ChatRoomAddForm 2012-02-04 21:57:39 +01:00
Tim Düsterhus
d79552c371 Chatrooms can be deleted now 2012-02-04 21:06:44 +01:00
Tim Düsterhus
fdfc16f6a3 Language items for ACP 2012-02-04 20:59:40 +01:00
Tim Düsterhus
22d3795aec Adding ChatRoomListPage 2012-02-04 20:50:18 +01:00
Tim Düsterhus
08a27db4ed Adding PlainCommand 2012-02-04 12:32:56 +01:00
Tim Düsterhus
64fb4bec06 Use classmember instead of constant for smiley activation 2012-02-04 12:25:09 +01:00
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
3172d9d666 Formatting 2012-01-30 17:44:21 +01:00
Tim Düsterhus
fc7b719920 Adding consoleMock for use in production 2012-01-30 17:31:54 +01:00
Tim Düsterhus
792e09afa0 Given size-parameter for icon-tag 2012-01-30 17:03:49 +01:00
Tim Düsterhus
50ec5ad93f Fixing issue with scroll disabler 2012-01-29 15:23:21 +01:00
Tim Düsterhus
d47ff71e49 Fixing automagically scroll disabler 2012-01-28 21:48:06 +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
Tim Düsterhus
192a421a19 Adding Force-Refresh Button for the RoomList 2012-01-28 16:43:48 +01:00
Tim Düsterhus
cca83a596f Simpler detection whether the user scrolled 2012-01-28 16:37:27 +01:00
Tim Düsterhus
dfdfedc7fa Some optimizations for readability 2012-01-28 16:09:24 +01:00
Tim Düsterhus
a0ea7bce95 Some more comments 2012-01-28 15:57:33 +01:00
Tim Düsterhus
c1fac59618 Automagically disable scrolling when user scrolls 2012-01-28 15:40:33 +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
8f6b7c5e12 Adding autocompleter 2012-01-28 14:08:51 +01:00
Tim Düsterhus
9a1c8072cd Ask for permission only if status is active 2012-01-22 20:47:12 +01:00
Tim Düsterhus
5e177e614f Adding Color-Command 2012-01-22 15:40:25 +01:00
Tim Düsterhus
06c77bafde Removing some inconsistencies 2012-01-22 14:48:11 +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
05138dff87 Changes title format for message notification 2012-01-22 14:07:49 +01:00
Tim Düsterhus
48531785a9 TimWolla.WCF.Chat.notify is added as event 
And we notify only when the window is not focused and notifications are active
 2012-01-21 22:49:15 +01:00
Tim Düsterhus
c2745de23b Show text/plain message 2012-01-21 19:05:34 +01:00
Tim Düsterhus
c7232b8bd0 Send Desktop Notifications 2012-01-21 18:43:58 +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
95712bd017 Only blindIn if the topic is not there 2012-01-21 17:12:49 +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
0c3fc4e474 Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2012-01-16 14:36:39 +01:00
Tim Düsterhus
e4a235e01b Focus in template. 
It was broken due to the disabled input
 2012-01-16 14:35:57 +01:00
max-m
9689d3b397 Fixed CSS, add and use language vars via WCF.Language, tabs change when clicking on badges too 2012-01-15 21:14:48 +01:00
Tim Düsterhus
3afc1d8e94 Coffeescript does not support undefined in there :( 2012-01-15 19:46:59 +01:00
Tim Düsterhus
5905005929 Ensure window and undefined as well 2012-01-15 14:09:07 +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
5d7ef3c05b Adding console.log for information about what is going on 2012-01-14 12:50:39 +01:00
Tim Düsterhus
cf07716179 Adding basic user-sending 2012-01-12 20:04:28 +01:00
Tim Düsterhus
4aba3376ed Cleanup Style 
- Add comment
- Remove unneeded declarations
- Fix conflict with search
 2012-01-07 17:47:38 +01:00
Tim Düsterhus
75adb8e3ab Hide overflow-x so one cannot nuke our chat-stream 2012-01-07 17:20:21 +01:00
Tim Düsterhus
b17498d8e5 Change background-color of "active-badge" to blue 2012-01-07 16:52:28 +01:00
Tim Düsterhus
99f95ed907 Adding Badges for Sidebar-Tabs 2012-01-07 16:45:14 +01:00
Tim Düsterhus
9a4498c143 Merge branch 'jsEvents' 2012-01-06 23:11:14 +01:00
Tim Düsterhus
a942396b7c Use current() 2012-01-03 13:10:46 +01:00
Tim Düsterhus
16df20c714 Elements are unbound automatically 2011-12-30 17:15:21 +01:00
Tim Düsterhus
fc561804f9 Adding basic message-event 2011-12-27 17:09:35 +01:00
Tim Düsterhus
ff56eac276 Elements are unbound automatically 2011-12-27 16:43:44 +01:00
Tim Düsterhus
3b5fa3d95a Take care of notify status 2011-12-27 14:45:25 +01:00
Tim Düsterhus
b024554c29 Merge branch 'master' of github.com:wbbaddons/Tims-Chat 
Conflicts:
	file/js/TimWolla.WCF.Chat.coffee
 2011-12-27 14:44:20 +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
77bf746df9 Converting raw-js to coffeescript 2011-12-27 11:51:43 +01:00
max-m
cfae043ba4 Now the fish won't swim out of the window 
________
    /  Blubb \
    \___   __/
         v
><((((>
 2011-12-26 22:46:29 +01:00
max-m
cded6e79a3 Added title notifications 2011-12-26 22:16:37 +01:00
Tim Düsterhus
9cb0bfafbc Converting CSS to SCSS and moving it into an own file 2011-12-26 21:00:11 +01:00
Tim Düsterhus
05e0393fa6 Fixed formatting 2011-12-26 20:02:23 +01:00
Tim Düsterhus
e4253470bb Merge remote-tracking branch 'origin/chatTplRedesign' into chatTplRedesign 2011-12-26 19:01:02 +01:00
Tim Düsterhus
a9f0cc86f5 Set new lastSeen-message 2011-12-26 19:00:32 +01:00
max-m
ae88c3246c Load new messages every X seconds 2011-12-26 18:46:48 +01:00
Tim Düsterhus
461be89d85 Unbind 'click' later 2011-12-26 17:26:47 +01:00
Tim Düsterhus
6b10542737 Reload Room-List every 60 seconds 2011-12-26 17:26:19 +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
c38c04dc39 Cleanup of CSS & JS 2011-12-26 16:04:48 +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
3a32aa1b8c == -> is != -> isnt 2011-12-24 17:48:08 +01:00
Tim Düsterhus
bbc8efa5ee this. -> @ 2011-12-24 17:47:07 +01:00
Tim Düsterhus
8fbc956111 Someone freed the fish, oh a noez 2011-12-24 17:28:46 +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
max-m
f67405866b Fixed and changed counter a bit. 
Now a counter can be created like this:
		$('INPUT').jCounter(<null, options>);
		The element input element will be wrapped in two divs, 
		the counterContainer div and a second div (display table and table-row ;) ).
		Then the counter will be appended to the new created parent of the Input (the second div).

And it can be called like this:
		$('INPUT').jCounter(either an id, a class or an object ($('bla')) <, options>);
 2011-12-20 16:06:48 +01:00
Tim Düsterhus
2d8724854b Porting counter to coffeescript 2011-12-19 17:36:05 +01:00
Tim Düsterhus
d5cbbdb34d Official file extension is coffee 2011-12-19 17:22:10 +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
d2f9858734 More JSDoc 2011-12-19 15:52:00 +01:00
Tim Düsterhus
d275f86498 Adding JSDoc 2011-12-19 15:46:40 +01:00
Tim Düsterhus
8cb95a94be Ported TimWolla.WCF.Chat.js to coffeescript 2011-12-19 15:44:27 +01:00
max-m
fc16da5acd Trigger chatInput keyup event on submit and insertText 
Also check if appended text would be longer than allowed maximum, if so return and focus chatInput
 2011-12-19 13:58:40 +01:00
Tim Düsterhus
bc386af3d5 Bind to this (i hate it) 2011-12-18 16:13:22 +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
max-m
9001c668ea Changed counter a bit. 2011-12-18 15:46:16 +01:00
Tim Düsterhus
0bf39ff7a4 Fix ajaxLoad onSubmit 2011-12-18 15:33:47 +01:00
Tim Düsterhus
9f563de4e8 Merge branch 'chatTplRedesign' of github.com:wbbaddons/Tims-Chat into chatTplRedesign 2011-12-18 14:53:17 +01:00
Tim Düsterhus
6790c9077f Use this instead of event.target 
The second one differs from where your clicked
 2011-12-18 14:52:20 +01:00
max-m
324977acf8 Added a little character counter next to chatInput. 2011-12-17 21:29:57 +01:00
max-m
decd03b079 Merge branch 'chatTplRedesign' of github.com:wbbaddons/Tims-Chat into chatTplRedesign 2011-12-17 18:41:29 +01:00
Tim Düsterhus
a8a69eaaa9 Encoded the chars in ChatUtil::gradient() 2011-12-17 18:40:20 +01:00
max-m
49ea229781 Added sidebar tabs :) 2011-12-17 18:40:17 +01:00
Tim Düsterhus
f8c2ba051e Removed unneeded code. 2011-12-17 12:10:32 +01:00
Tim Düsterhus
987482c590 Use .ajaxLoad for spinner in input 2011-12-16 18:23:58 +01:00
Tim Düsterhus
94870c557e Made every button functional 2011-12-15 22:54:49 +01:00
Tim Düsterhus
9a8663155b Made Clear-Button functional 2011-12-15 22:34:53 +01:00
Tim Düsterhus
bb1fd6e82c First try of redesign 2011-12-15 18:55:44 +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
34642d70c8 Removing expected data-type 2011-12-13 23:23:28 +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
04a6570bb4 Adding missing comma 2011-12-13 22:34:05 +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
062241ce70 Moved submit into an own method 2011-12-13 21:52:32 +01:00
Tim Düsterhus
e0a7943c1c Reformatting 2011-12-13 21:50:28 +01:00
Tim Düsterhus
b73ba2168c Adding JSDoc 2011-12-13 21:48:13 +01:00
Tim Düsterhus
e68dec0573 Fix the comments 2011-12-13 21:44:56 +01:00
Tim Düsterhus
452315f5f7 Focus chatInput after inserting text 2011-12-13 21:44:31 +01:00
max-m
0165b0c1ac Implemented the send-event. 2011-12-13 21:40:39 +01:00
Tim Düsterhus
c5821e543b Adding UTF-8 save version of str_split 2011-12-13 18:15:30 +01:00
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
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