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
935 Commits 3 Branches 25 Tags 4.7 MiB
eb27166c6c
Commit Graph

404 Commits

Author SHA1 Message Date
Tim Düsterhus
d1101fe101 Properly import IllegalLinkException 2012-10-20 16:20:52 +02:00
Tim Düsterhus
dcd72ef7e1 Properly handle suspended status in JS and fix "you" 2012-10-19 17:49:56 +02:00
Tim Düsterhus
d45c8e3a63 Improve suspended status in JSON-answer, include benchmark 2012-10-19 17:44:30 +02:00
Tim Düsterhus
c3ecf87746 Properly extend MeCommand 2012-10-17 14:26:37 +02:00
Tim Düsterhus
f7b5c1d012 serverPush -> nodePush 2012-10-14 17:30:52 +02:00
Tim Düsterhus
8e2154c994 Adding WhisperCommand 2012-09-07 23:08:13 +02:00
Tim Düsterhus
f777bc1d2e Fixing Chat*(Page|Form|Action) 2012-09-07 22:42:19 +02:00
Tim Düsterhus
ec0154e3a4 Fixing ChatPageMenuItemProvider 2012-09-07 22:32:42 +02:00
Tim Düsterhus
88525e69bf Removing permission from $neededPermissions 2012-09-07 22:29:02 +02:00
Tim Düsterhus
16b3809865 Add Command Suffix to commands 2012-09-07 22:23:27 +02:00
Tim Düsterhus
c918ca0c86 Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2012-08-28 22:13:54 +02:00
Tim Düsterhus
4e31261961 Fixing namespace 2012-08-28 21:58:47 +02:00
Tim Düsterhus
f48dfab256 Show ip in join message. 2012-08-28 21:53:21 +02:00
Tim Düsterhus
ba21e669e3 Return array in ChatRoomCacheBuilder 2012-08-16 12:08:29 +03:00
Tim Düsterhus
a1d4028723 Add .userLink 2012-08-15 18:04:09 +02:00
Tim Düsterhus
f507070d20 Disallow direct access 2012-08-12 20:30:08 +02:00
Tim Düsterhus
e8618f2c13 Use $this->objectAction 2012-08-10 17:15:25 +02:00
Tim Düsterhus
3bb8ef4577 Use $loginRequired 2012-08-08 16:51:24 +02:00
Tim Düsterhus
ec8eba6986 Enable DOMNodeInsertedHandler 2012-08-07 23:56:57 +02:00
Tim Düsterhus
60d23310e3 Additional data is now serialized 2012-08-07 21:12:32 +02:00
max-m
f48c4d2d81 Smilies except the default category (ID null) will be loaded via Ajax from now on. 
Also fixed some css bugs and restyled the sidebar a bit.
 2012-07-14 15:04:53 +02:00
Tim Düsterhus
e283126b29 Fix Fatal error: Cannot override final method wcf\page\AbstractPage::__construct() in wcf/lib/acp/form/ChatRoomAddForm.class.php on line 16 2012-06-16 20:08:05 +02:00
Tim Düsterhus
93ea9c8341 Run the subpages. 
I really wanna have PHP 5.4 ready :(
 2012-06-10 18:49:11 +02:00
Tim Düsterhus
366b7207ca Adding $this->room again 2012-06-10 18:48:08 +02:00
Tim Düsterhus
42ad9e7164 timwolla.wcf.chat -> be.bastelstu.wcf.chat 2012-06-04 21:43:03 +02:00
Tim Düsterhus
9755242683 More Docs 2012-06-04 21:34:07 +02:00
Tim Düsterhus
d9d90e9c19 Docs and Code Optimization 2012-06-04 21:22:25 +02:00
Tim Düsterhus
d7f91715e4 More docs. 2012-06-04 21:10:03 +02:00
Tim Düsterhus
c1c6c3d5bb PHPDoc and Removing unneeded code 2012-06-04 20:30:08 +02:00
Tim Düsterhus
0a7fa7f640 Adding some more doc-blocks and cleaning up code. 2012-05-31 16:57:20 +02:00
Tim Düsterhus
961dbcc1f9 Adding Restore-Command 2012-05-19 23:03:35 +02:00
Tim Düsterhus
aec5ba361f Expose user-object. 2012-05-19 23:03:26 +02:00
Tim Düsterhus
fc47129ce0 Adding WhereCommand 2012-05-19 21:49:35 +02:00
Tim Düsterhus
12497c3583 Populate whether a user is suspended. 2012-05-19 21:37:15 +02:00
Tim Düsterhus
874b5009a2 Take care of global suspensions as well 2012-05-19 21:28:10 +02:00
Tim Düsterhus
e8607eaf56 Adding Suspension-Handling 2012-05-19 21:25:50 +02:00
Tim Düsterhus
f91a03aa32 Revert "Optimizing ChatRoom::getUsers()" 
This reverts commit f8193d1050.
 2012-05-19 20:49:50 +02:00
Tim Düsterhus
f8193d1050 Optimizing ChatRoom::getUsers() 2012-05-19 20:41:33 +02:00
Tim Düsterhus
f72dfb4e54 Moving pruning to *Action 2012-05-19 20:33:25 +02:00
Tim Düsterhus
ca790587f2 Trigger message loading once a minute for easier detection of dead users. 
Closes #9
 2012-05-19 17:44:19 +02:00
Tim Düsterhus
5c1f84eb1e Deliver integers as integers. 2012-05-02 20:27:16 +02:00
Tim Düsterhus
bea88516ea Fixing PHP-Syntax-Error 2012-04-30 22:21:39 +02:00
Tim Düsterhus
040189ffab Fixing autocompletion + PHPDoc 2012-04-30 21:23:57 +02:00
Tim Düsterhus
bdf019b332 Adding language item for IP-Address 2012-04-30 21:14:25 +02:00
Tim Düsterhus
3ba9cf7143 serverPush -> nodePush 2012-04-30 20:52:30 +02:00
Tim Düsterhus
49f8e67baf Check whether the socket is writable. 2012-04-28 19:59:33 +02:00
Tim Düsterhus
51683c9484 Correctly call the socket. 2012-04-27 21:32:33 +02:00
Tim Düsterhus
a3bdeba53c Ensure the message is at least 10 seconds old 
Otherwise slower clients would get problems with two messages directly after each other
 2012-04-27 20:16:58 +02:00
Tim Düsterhus
211c6485a8 Fixing the algorithm change 2012-04-27 20:00:42 +02:00
Tim Düsterhus
378a1ab33a Change algorithm to sort out dead users when using Push-Server 2012-04-27 19:54:50 +02:00
Tim Düsterhus
58ec55bed2 PHP now triggers newMessage-event 2012-04-27 19:33:28 +02:00
Tim Düsterhus
80ae9779f8 Clear cache when creating a temproom. 
Fixes #8
 2012-04-19 20:24:16 +03:00
Tim Düsterhus
8dcd287fb4 Clean Up dead users by cronjob as well. 2012-04-19 15:06:34 +02:00
Tim Düsterhus
3eaf35c9c1 ChatUtil::writeUserData now accepts the user-object as the second parameter. 2012-04-18 22:45:11 +02:00
Tim Düsterhus
2e2edec54f Fixing Dead-User-Query 2012-04-18 21:36:07 +02:00
Tim Düsterhus
56c7544045 Kill dead users. 2012-04-18 21:01:38 +02:00
Tim Düsterhus
2cc70345ce Properly delete position when a room is deleted. 2012-04-16 22:12:44 +02:00
Tim Düsterhus
c1b2fe0dfd Adding lastActivity 2012-04-15 21:37:20 +02:00
Tim Düsterhus
6351a72fd0 Adding language item for temporary rooms. 2012-04-15 20:17:44 +02:00
Tim Düsterhus
3248b14097 Fixing ChatXEditor::prune() 2012-04-15 18:00:59 +02:00
Tim Düsterhus
306f1c38b7 Fixed usage of constant 2012-04-15 17:32:25 +02:00
Tim Düsterhus
66bfb5029b Adding some pieces of Temproom-Command. 2012-04-15 17:11:08 +02:00
Tim Düsterhus
26f747ddb7 Disable away on join. 2012-04-15 15:43:26 +02:00
Tim Düsterhus
ab42584965 Adding language-items for away-message. 2012-04-15 15:37:41 +02:00
Tim Düsterhus
bafc678eb4 Adding Profile-Link to info 2012-04-15 14:09:51 +02:00
Tim Düsterhus
26a90bd98c Adding IP-Address in info. 2012-04-15 13:30:08 +02:00
Tim Düsterhus
2c4c816b24 Commands can now be written in any case. 2012-04-05 16:50:08 +03:00
Tim Düsterhus
7033542580 Some files slipped through sed. 2012-03-24 22:39:26 +01:00
Tim Düsterhus
2af603c8e5 system.chat.commands -> system.chat.command 2012-03-24 22:37:47 +01:00
Tim Düsterhus
4c05e38d1e Fixing didInit event a bit 2012-03-24 22:29:07 +01:00
Tim Düsterhus
8592826b71 Added more information in /info 2012-03-24 22:03:04 +01:00
Tim Düsterhus
0cceabdb88 Check whether the user may write. 2012-03-24 21:47:03 +01:00
Tim Düsterhus
01be519230 Adding InfoCommand 2012-03-23 23:27:15 +01:00
Tim Düsterhus
a28aaffcae Fixing Syntax-Error in IRestrictedCommand 2012-03-23 18:14:33 +01:00
Tim Düsterhus
dcaac3e74e Merge branch 'commands' 2012-03-23 18:12:22 +01:00
Tim Düsterhus
9b9b4b5086 Bugfix 2012-03-23 17:50:06 +01:00
Tim Düsterhus
cf434b1778 Adding general Permissions 2012-03-23 17:45:26 +01:00
Tim Düsterhus
e7598d14f7 Adding away-command 2012-03-22 18:45:36 +01:00
Tim Düsterhus
f58b518963 Handle arbitrary Exceptions 2012-03-22 17:38:33 +01:00
Tim Düsterhus
4a901569bd Merge branch 'master' into commands 
Conflicts:
	file/lib/system/chat/commands/ChatCommandHandler.class.php
 2012-03-22 17:18:53 +01:00
Tim Düsterhus
499526000a SQL-Standard 2012-03-22 16:38:08 +01:00
Tim Düsterhus
c18b9e739b Transaction is only committed when the parent call succeeds as well 2012-03-22 16:26:52 +01:00
Tim Düsterhus
a11e38dafd Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2012-03-16 17:09:30 +01:00
Tim Düsterhus
907a348674 Use offset for sorting 2012-03-16 17:09:12 +01:00
Tim Düsterhus
32b1a5bada Fixed bad fix + use fetchColumn 2012-03-15 20:16:24 +01:00
Tim Düsterhus
a1f939d763 Fixed comment 2012-03-15 20:11:01 +01:00
Tim Düsterhus
a3b912c823 Prevent constructing of Util. 2012-03-12 22:51:29 +01:00
Tim Düsterhus
24161a5939 Changing Package Identifier to be.bastelstu.wcf.chat 2012-03-12 17:19:01 +01:00
Tim Düsterhus
6e89b04751 Adding cleanup-cronjob (Currently missing the PIP) 
Moving getPackageID into the Util
 2012-03-08 22:07:46 +01:00
Tim Düsterhus
8b0dd6e391 SystemException was not imported 2012-03-08 21:31:09 +01:00
Tim Düsterhus
382bbdba3c Avoid problem with disabled join messages and no last messages. 2012-03-08 21:30:37 +01:00
Tim Düsterhus
92018b9a63 Optimizing reading of smilies. 2012-03-08 21:27:54 +01:00
Tim Düsterhus
81462252dc PackageDependencyHandler is now a Singleton 
Fixes Tims Chat in accordance to WoltLab/WCF@6eb121400f
 2012-03-05 16:49:45 +01:00
Tim Düsterhus
81bdbccbe2 Merge branch 'master' into commands 
Conflicts:
	file/lib/form/ChatForm.class.php
	template/chatMessage.tpl
 2012-03-04 19:57:23 +01:00
Tim Düsterhus
ef72a875e5 Compress JSON with GZip if enabled 2012-03-04 17:16:25 +01:00
Tim Düsterhus
94aec081ba Strip Crap :D 2012-03-04 17:04:10 +01:00
Tim Düsterhus
a66a3cd448 Disallow to long messages in PHP 2012-03-04 15:48:10 +01:00
Tim Düsterhus
c9fc8e1ce6 Adding missing prefix for ACL-Keys 2012-03-04 13:42:04 +01:00
Tim Düsterhus
1fef092c13 Sending HTTP 204 in ChatLeaveAction 2012-03-03 23:18:52 +01:00
Tim Düsterhus
d8c8ee2f5d Fixing one problem with null 2012-03-03 23:16:24 +01:00
Tim Düsterhus
730dbd7770 Adding array with default permission values 2012-03-03 23:12:21 +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
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
f6ba0bfc7f Use $this->objectAction to match WoltLab/WCF@635dd8c454 2012-02-11 17:42:56 +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
c89c0e9d08 Use ChatRoomAction 2012-02-05 21:48:09 +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
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
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
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
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