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
							
						 
					 | 
					
						
						
						
						
							
						
						
							57f742a539
							
						
					 | 
					
						
						
							
							Added invitations styles
						
						
						
						
						
					 | 
					
						2011-12-15 08:14:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a90594235a
							
						
					 | 
					
						
						
							
							format code in libs/
						
						
						
						
						
					 | 
					
						2011-02-26 15:04:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3ead37bd7
							
						
					 | 
					
						
						
							
							2011 copyrights
						
						
						
						
						
					 | 
					
						2011-02-16 01:22:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							f94b2879c5
							
						
					 | 
					
						
						
							
							get rid of php warnings
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@627 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2009-08-11 16:10:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							04a584ffab
							
						
					 | 
					
						
						
							
							jsver variable in tpl support
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@619 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2009-08-11 09:45:44 +00: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							ece83a4cfc
							
						
					 | 
					
						
						
							
							get rid of: quote_smart, ${print:
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@451 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2009-04-04 21:35:58 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							d912da3d47
							
						
					 | 
					
						
						
							
							*.tpl -> templates/, *.gif -> images/
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@197 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-11-24 00:21:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a91cac03a9
							
						
					 | 
					
						
						
							
							new default style: green
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@191 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-11-07 23:24:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							584b9d5fec
							
						
					 | 
					
						
						
							
							add preview for 4 templates
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@185 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-14 21:14:49 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e4e6802fe
							
						
					 | 
					
						
						
							
							update to use styles folder
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@184 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-14 20:21:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							f90a934457
							
						
					 | 
					
						
						
							
							preview for simplechat, nochat
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@181 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-12 23:05:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ded5ac9888
							
						
					 | 
					
						
						
							
							separate prefix for URL messages
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@175 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-12 00:43:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f06e5a3db
							
						
					 | 
					
						
						
							
							minor: fix spaces
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@174 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-12 00:16:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							788a8dcd84
							
						
					 | 
					
						
						
							
							templates for redirected page
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@172 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-11 23:55:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ce1e28226
							
						
					 | 
					
						
						
							
							use templates instead of static views
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@170 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-10 23:28:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							22fbb1b89e
							
						
					 | 
					
						
						
							
							chat main window template
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@166 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-10 22:26:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evgeny Gryaznov
							
						 
					 | 
					
						
						
						
						
							
						
						
							29f023ac9a
							
						
					 | 
					
						
						
							
							expand leavemessage template
						
						
						
						
						
						
						
						git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@164 c66351dc-e62f-0410-b875-e3a5c0b9693f 
						
					 | 
					
						2008-10-10 21:40:57 +00:00 | 
					
					
						
						
							
							
							
						
					 |