1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00
Commit Graph

80 Commits

Author SHA1 Message Date
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