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
|
da790fc8d2
|
add csrf token to performance and features views
|
2012-07-03 15:12:33 +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
|
22916ce8a0
|
add csrf token to performance and features views
|
2012-05-01 13:20:03 +01:00 |
|
Dmitriy Simushev
|
61c52eb127
|
Added groups isolation
|
2012-02-25 19:40:05 +00:00 |
|
Evgeny Gryaznov
|
84f37eb14c
|
invitation patch by Fedor Fetisov
|
2011-04-07 10:34:37 +02:00 |
|
Evgeny Gryaznov
|
0c58691731
|
format code in operator/
|
2011-02-26 15:06:19 +01:00 |
|
Evgeny Gryaznov
|
2dd0839f0d
|
notify about new features
|
2011-02-26 13:15:35 +01:00 |
|
Evgeny Gryaznov
|
7443faf449
|
disable feature checkboxes for non-admin
|
2011-02-22 00:22:36 +01:00 |
|
Evgeny Gryaznov
|
56edca952c
|
Ignore packaged releases/output of check_translation (proposed by Peter Harkins); fix formatting in php
|
2011-02-22 00:02:58 +01:00 |
|
Peter Harkins
|
3cc49c965a
|
Check admin permissions
|
2011-02-22 00:00:57 +01:00 |
|
Evgeny Gryaznov
|
7de97c2a68
|
apply patch by Andrew Armstrong: available operators list (revised); remove odd eval code in common.js; fix obfuscation
|
2011-02-21 01:02:39 +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
|
2efea86167
|
show if group is online, filter out empty groups in redirect and visitor selector, captcha checkbox in settings
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@592 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-07-19 00:07:34 +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
|
3866f37f22
|
optional popup notification of the new visitor
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@468 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-04-10 15:41:05 +00:00 |
|
Evgeny Gryaznov
|
2e1a271acf
|
add several options
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@449 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-04-04 21:33:56 +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
|
bf7d51201e
|
ability to turn off "Statistics" feature
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@429 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-03-22 11:54:59 +00:00 |
|
Evgeny Gryaznov
|
90e4bea7b2
|
departments: create/edit/remove
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@413 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-03-16 21:49:45 +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
|
c2d0852e83
|
update from branch (1.5.2)
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@399 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2009-03-08 20:53:16 +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
|
6e70ab1262
|
tabs in settings: General, Optional Services; "Changes saved" panel; fix title messages order
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@250 c66351dc-e62f-0410-b875-e3a5c0b9693f
|
2008-12-24 01:32:42 +00:00 |
|