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 |
|
Evgeny Gryaznov
|
98aad6e490
|
apache 2 license in php headers
|
2013-03-06 22:22:53 +01:00 |
|
Dmitriy Simushev
|
5a3af46203
|
Replaced all mysql_real_escape_string by db_escape_string
|
2011-11-21 18:03:40 +00:00 |
|
Evgeny Gryaznov
|
79b37c720f
|
fix groupids in visitors update; fix DB error reporting in installer; smaller opaway/oponline image
|
2011-04-07 00:31:22 +02:00 |
|
Evgeny Gryaznov
|
a90594235a
|
format code in libs/
|
2011-02-26 15:04:12 +01:00 |
|
Evgeny Gryaznov
|
c5bc5ed2f5
|
fast history search, fix redirection to groups, extract webim_mail function into notify.php
|
2011-02-16 01:43:19 +01:00 |
|