jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							a0ab3864c0 
							
						 
					 
					
						
						
							
							Push the headers for the chatbox even further down to make sure that jQuery is already loaded.  
						
						
						
						
					 
					
						2014-04-23 23:01:51 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							0bd031a269 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:jgen/shimmie2 into linting  
						
						... 
						
						
						
						Manually resolved conflicts:
	ext/chatbox/js/yshout.js 
						
						
					 
					
						2014-04-23 22:42:30 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							e2516fa5cf 
							
						 
					 
					
						
						
							
							Chatbox should be fixed now.  
						
						... 
						
						
						
						The chatbox extension actually needs some functionality that was removed from jQuery versions 1.9 and up. When Shimmie's version of jQuery was bumped up to 1.11 this actually broke the chatbox. 
						
						
					 
					
						2014-04-20 04:51:19 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							8b698e1b6f 
							
						 
					 
					
						
						
							
							Revert this commit.  
						
						
						
						
					 
					
						2014-04-20 04:29:11 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							57a390eaab 
							
						 
					 
					
						
						
							
							Massive linting!  
						
						
						
						
					 
					
						2014-04-19 23:38:42 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							28d83fda0d 
							
						 
					 
					
						
						
							
							Even more linting and cleaning.  
						
						
						
						
					 
					
						2014-04-19 02:33:34 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							2da8c19a07 
							
						 
					 
					
						
						
							
							More linting!  
						
						
						
						
					 
					
						2014-04-19 01:36:18 -04:00 
						 
				 
			
				
					
						
							
							
								Shish 
							
						 
					 
					
						
						
						
						
							
						
						
							4a2c47459c 
							
						 
					 
					
						
						
							
							Chatbox  
						
						
						
						
					 
					
						2013-06-19 20:59:59 +01:00