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
|
0802ce8993
|
Added aggregating groups
|
2012-02-25 13:43:12 +00:00 |
|
Evgeny Gryaznov
|
b9cc8ed5b1
|
extract tabbar generation code -> inc_tabbar.php
|
2011-02-26 15:37:48 +01:00 |
|
Evgeny Gryaznov
|
e3ead37bd7
|
2011 copyrights
|
2011-02-16 01:22:22 +01:00 |
|
Evgeny Gryaznov
|
f9898e5b85
|
remove odd white spaces, unify headers
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@604 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-08-04 16:30:39 +00:00 |
|
Evgeny Gryaznov
|
faf9ff61b2
|
update copyright header
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@602 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-08-04 15:03:27 +00:00 |
|
Evgeny Gryaznov
|
003fd4597a
|
add GPL clause
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@599 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-08-04 13:38:37 +00:00 |
|
Evgeny Gryaznov
|
4b3eebf85b
|
rename product: headers
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@519 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-06-03 22:44:32 +00:00 |
|
Evgeny Gryaznov
|
4b790f7fcf
|
modify profile permission
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@517 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-05-31 16:13:22 +00:00 |
|
Evgeny Gryaznov
|
6f5074deba
|
rtl support, get rid of hsplitter in js
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@483 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-04-24 14:19:11 +00:00 |
|
Evgeny Gryaznov
|
147beb3ed2
|
fix date_diff, profile
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@467 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-04-10 14:12:57 +00:00 |
|
Evgeny Gryaznov
|
11dcfdd91a
|
group members, generate button for group
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@435 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-03-24 23:34:57 +00:00 |
|
Evgeny Gryaznov
|
11663d2dd5
|
fixes in operator groups
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@434 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-03-22 23:09:31 +00:00 |
|
Evgeny Gryaznov
|
2fb7e37d7b
|
department -> group, manages groups of agent
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@431 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-03-22 21:22:51 +00:00 |
|