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 |
|
Evgeny Gryaznov
|
214e52e5c2
|
format the code; remove comments in the client code; move csrfchecktoken() right after check_login()
Conflicts:
src/messenger/webim/libs/common.php
src/messenger/webim/operator/canned.php
src/messenger/webim/operator/cannededit.php
src/messenger/webim/operator/operators.php
src/messenger/webim/operator/settings.php
src/messenger/webim/operator/translate.php
|
2012-07-03 15:21:59 +00:00 |
|
YuFei Zhu
|
c948956779
|
update comment for avatar csrf, and add csrf token check to permission page
|
2012-07-03 15:12:27 +00:00 |
|
Evgeny Gryaznov
|
dd6632ffdf
|
format the code; remove comments in the client code; move csrfchecktoken() right after check_login()
|
2012-06-27 10:11:40 +02:00 |
|
YuFei Zhu
|
e3b8848f78
|
update comment for avatar csrf, and add csrf token check to permission page
|
2012-05-01 13:02:34 +01:00 |
|
Dmitriy Simushev
|
1cd6926f4f
|
Replaced all mysql_close by close_connection, except for the directory /install
|
2011-11-21 17:52:19 +00:00 |
|
Evgeny Gryaznov
|
e160af13ef
|
use mysqlprefix in names of session vars
|
2011-02-26 14:43:30 +01:00 |
|
Evgeny Gryaznov
|
b18085de38
|
$mysqlprefix variable added
|
2011-02-26 14:13:16 +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
|
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
|
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 |
|
Evgeny Gryaznov
|
5a82434450
|
right menu depends on agent rights and features
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@411 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-03-16 01:20:04 +00:00 |
|
Evgeny Gryaznov
|
113dc1955a
|
[1.5.1] update from branch
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@317 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-01-13 22:19:12 +00:00 |
|
Evgeny Gryaznov
|
2443b4e0a5
|
permissions
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@221 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2008-12-08 23:47:40 +00:00 |
|
Evgeny Gryaznov
|
c6c3fe05d7
|
permissions
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@218 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2008-12-08 00:34:28 +00:00 |
|