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
..
.htaccess	refactor folder structure	2008-09-29 16:04:30 +00:00
canned.php	Added short titles for canned messages	2012-01-29 11:18:35 +00:00
captcha.php	apache 2 license in php headers	2013-03-06 22:22:53 +01:00
chat.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
common.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
config.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
converter.php	apache 2 license in php headers	2013-03-06 22:22:53 +01:00
demothread.php	apache 2 license in php headers	2013-03-06 22:22:53 +01:00
expand.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
groups.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
invitation.php	Implemented cross-domain invitations	2011-12-15 08:13:40 +00:00
notify.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
operator_settings.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
operator.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
pagination.php	apache 2 license in php headers	2013-03-06 22:22:53 +01:00
request.php	Added Cross-domain javascript requests	2011-12-11 14:37:46 +00:00
settings.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
statistics.php	Added tabs at statistics page	2012-03-13 20:28:38 +00:00
styles.php	Added invitations styles	2011-12-15 08:14:07 +00:00
track.php	Fixed bug in visitor's tracking	2012-03-17 14:39:58 +00:00
userinfo.php	apache 2 license in php headers	2013-03-06 22:22:53 +01:00