Dmitriy Simushev
							
						 
					 | 
					
						
						
						
						
							
						
						
							466cc31f45
							
						
					 | 
					
						
						
							
							Update headers
						
						
						
						
						
					 | 
					
						2013-03-12 21:03:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e75270cd0
							
						
					 | 
					
						
						
							
							having token checks on POST forms
						
						
						
						
						
						
						
						Conflicts:
	src/messenger/webim/operator/cannededit.php 
						
					 | 
					
						2012-07-03 15:09:47 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b84b439358
							
						
					 | 
					
						
						
							
							having token checks on POST forms
						
						
						
						
						
					 | 
					
						2012-04-30 16:41:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dmitriy Simushev
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d87e5e1a6
							
						
					 | 
					
						
						
							
							Added short titles for canned messages
						
						
						
						
						
					 | 
					
						2012-01-29 11:18:35 +00: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd89e6e84c
							
						
					 | 
					
						
						
							
							recompute resources
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@465 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2009-04-09 22:57:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6f1fbe34b
							
						
					 | 
					
						
						
							
							localize updates & canned messages, add them into main menu, russian translation
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@464 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2009-04-09 21:43:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							334248c474
							
						
					 | 
					
						
						
							
							canned responses editor, Updates at the top level
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@463 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2009-04-08 22:40:26 +00:00 | 
					
					
						
						
							
							
							
						
					 |