Maximilian Mader 06882254a0 Merge branch 'master' into attachments ...

Conflicts:
	template/javascriptInclude.tpl

2013-10-06 02:12:42 +02:00

..

attachment

Fix MessageAttachmentObjectType.class.php

2013-09-14 23:25:56 +02:00

cache/builder

Rename position to showOrder

2013-05-24 00:08:33 +02:00

command

Show more meaningful error message when alias is invalid

2013-10-01 00:16:54 +02:00

dashboard/box

Add RoomCache class

2013-05-24 02:27:55 +02:00

event/listener

Fix HourlyCleanUpCronjobExecuteChatCleanUpListener

2013-08-19 22:09:41 +02:00

menu/page

Add RoomCache class

2013-05-24 02:27:55 +02:00

permission

Fix method call to getGroupIDs in PermissionHandler

2013-02-17 00:04:32 +01:00

user/online/location

Add RoomCache class

2013-05-24 02:27:55 +02:00

CHATCore.class.php

Remove obsolete __run() in CHATCore

2013-08-22 15:50:04 +02:00