tray/src/messenger/webim/operator
Dmitriy Simushev ae149896e7 Merge branch 'v1.6.x' into OSSG/master
Conflicts:
	src/messenger/webim/install/dbperform.php
	src/messenger/webim/js/164/common.js
	src/messenger/webim/libs/common.php
	src/messenger/webim/locales/en/properties
	src/messenger/webim/locales/ru/properties
	src/messenger/webim/operator/canned.php
	src/messenger/webim/operator/operator.php
	src/messenger/webim/operator/operators.php
	src/messenger/webim/operator/performance.php
	src/messenger/webim/operator/settings.php
	src/messenger/webim/operator/translate.php
	src/messenger/webim/operator/update.php
	src/messenger/webim/operator/users.php
	src/messenger/webim/view/agents.php
	src/messenger/webim/view/performance.php
2013-03-11 11:01:35 +00:00
..
agent.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
autologin.php apache 2 license in php headers 2013-03-06 22:22:53 +01:00
avatar.php apache 2 license in php headers 2013-03-06 22:22:53 +01:00
ban.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
blocked.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
canned.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
cannededit.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
features.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
getcode.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
group.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
groupmembers.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
groups.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
history.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
index.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
invitationstate.php Replaced all mysql_close by close_connection, except for the directory /install 2011-11-21 17:52:19 +00:00
invitationthemes.php Added invitations styles 2011-12-15 08:14:07 +00:00
invite.php Replaced all mysql_close by close_connection, except for the directory /install 2011-11-21 17:52:19 +00:00
login.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
logout.php apache 2 license in php headers 2013-03-06 22:22:53 +01:00
operator.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
operators.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
opgroups.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
performance.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
permissions.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
redirect.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
resetpwd.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
restore.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
settings.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
statistics.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
themes.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
threadprocessor.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
tracked.php Split chatsitevisitor table into chatsitevisitor and visitedpage 2011-11-22 21:57:25 +00:00
translate.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
update.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
updates.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
userhistory.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00
users.php Merge branch 'v1.6.x' into OSSG/master 2013-03-11 11:01:35 +00:00