Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							97dd4e2e6b 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into rav/olm  
						
						 
						
						... 
						
						
						
						Conflicts:
	webpack.config.js 
						
						
					 
					
						2015-12-03 18:28:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							782174069c 
							
						 
					 
					
						
						
							
							Include olm in the webpack if it's been installed  
						
						 
						
						... 
						
						
						
						.. to make it easy to build a crypto-enabled vector 
						
						
					 
					
						2015-12-03 18:24:34 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							7ff5e42f3e 
							
						 
					 
					
						
						
							
							Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions.  
						
						 
						
						
						
						
					 
					
						2015-12-01 18:05:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d66427ddde 
							
						 
					 
					
						
						
							
							Relative-ize paths in webpack config: they're supposed to be relative but sometimes they aren't.  
						
						 
						
						
						
						
					 
					
						2015-10-23 10:16:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							4b904d90f2 
							
						 
					 
					
						
						
							
							Slightly improve source path tree in the browser debugger  
						
						 
						
						
						
						
					 
					
						2015-10-15 14:40:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							2adb8bac5c 
							
						 
					 
					
						
						
							
							Actually turn on production mode: env vars need to be explicitly passed through  
						
						 
						
						
						
						
					 
					
						2015-10-14 09:20:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							f020f4397c 
							
						 
					 
					
						
						
							
							Switch to webpack  
						
						 
						
						... 
						
						
						
						Webapck actually supports loading input source maps and generally seems a lot
more solid then browserify (even if their website has an annoying animated
logo). 
						
						
					 
					
						2015-09-25 11:43:28 +01:00