FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0b558ec8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						
						
					 
					
						2014-10-06 09:53:28 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							1969ccb329 
							
						 
					 
					
						
						
							
							grunt  
						
						
						
					 
					
						2014-10-06 09:52:51 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							d35be71523 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop'  
						
						... 
						
						
						
						Conflicts:
	dist/css/material-wfont.min.css
	dist/css/material.min.css
	template/material/css/material-wfont.min.css
	template/material/css/material.min.css 
						
					 
					
						2014-10-06 09:52:19 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							2c10288e4b 
							
						 
					 
					
						
						
							
							fix   #88  
						
						
						
					 
					
						2014-10-06 09:50:09 +02:00 
						 
				 
			
				
					
						
							
							
								Fez Vrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							3598c2a019 
							
						 
					 
					
						
						
							
							Merge pull request  #91  from icyflame/patch-2  
						
						... 
						
						
						
						Added links and fixed grammar 
						
					 
					
						2014-10-06 09:31:58 +02:00 
						 
				 
			
				
					
						
							
							
								Siddharth Kannan 
							
						 
					 
					
						
						
						
						
							
						
						
							3a4251e900 
							
						 
					 
					
						
						
							
							Added links and fixed grammar  
						
						... 
						
						
						
						Added link to the Google Material Design Guideline document.
Fixed the Grammar of the first few lines in the README.md file. 
						
					 
					
						2014-10-06 12:50:25 +05:30 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							56246f96a1 
							
						 
					 
					
						
						
							
							grunt less  
						
						
						
					 
					
						2014-10-06 09:11:51 +02:00 
						 
				 
			
				
					
						
							
							
								Fez Vrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							7a898886ef 
							
						 
					 
					
						
						
							
							Merge pull request  #86  from pmarti/master  
						
						... 
						
						
						
						Use roboto condensed, not roboto 
						
					 
					
						2014-10-06 09:05:02 +02:00 
						 
				 
			
				
					
						
							
							
								Fez Vrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							52622820f5 
							
						 
					 
					
						
						
							
							Merge pull request  #89  from dandv/patch-2  
						
						... 
						
						
						
						Fix *all* typos and improve the English description 
						
					 
					
						2014-10-06 09:03:24 +02:00 
						 
				 
			
				
					
						
							
							
								Dan Dascalescu 
							
						 
					 
					
						
						
						
						
							
						
						
							3f96aad020 
							
						 
					 
					
						
						
							
							Fix *all* typos and improve the English description  
						
						
						
					 
					
						2014-10-05 21:12:05 -07:00 
						 
				 
			
				
					
						
							
							
								Pablo Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							981a517b9a 
							
						 
					 
					
						
						
							
							Use roboto condensed, not roboto  
						
						... 
						
						
						
						We're @import'ing Roboto Condensed but using plain Roboto
in our font-face declarations. 
						
					 
					
						2014-10-06 09:57:00 +07:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							0bcf95636d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
					 
					
						2014-10-05 17:29:13 -04:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							f85271ca03 
							
						 
					 
					
						
						
							
							jshint double-quotes error  
						
						
						
					 
					
						2014-10-05 17:27:50 -04:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							640027abe3 
							
						 
					 
					
						
						
							
							new checkbox style,  fix   #53  TODO: fix ripple  
						
						
						
					 
					
						2014-10-05 17:37:10 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							b8eece9270 
							
						 
					 
					
						
						
							
							fixed version  
						
						
						
					 
					
						2014-10-05 12:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								shockwork 
							
						 
					 
					
						
						
						
						
							
						
						
							8980fc4235 
							
						 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
					 
					
						2014-10-05 11:30:45 +02:00 
						 
				 
			
				
					
						
							
							
								shockwork 
							
						 
					 
					
						
						
						
						
							
						
						
							97194417b0 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/FezVrasta/bootstrap-material-design  into develop  
						
						
						
					 
					
						2014-10-05 11:28:22 +02:00 
						 
				 
			
				
					
						
							
							
								shockwork 
							
						 
					 
					
						
						
						
						
							
						
						
							7d56a5a462 
							
						 
					 
					
						
						
							
							jshint no longer checks *.min.js, pre master merge  
						
						
						
					 
					
						2014-10-05 11:26:50 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							3006639053 
							
						 
					 
					
						
						
							
							added ignore files list  
						
						
						
					 
					
						2014-10-05 11:22:39 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							47b9330b30 
							
						 
					 
					
						
						
							
							added multiple main files  
						
						
						
					 
					
						2014-10-05 11:13:09 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							2faa68a1fa 
							
						 
					 
					
						
						
							
							support for editorconfig  
						
						
						
					 
					
						2014-10-05 10:20:47 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							4964878091 
							
						 
					 
					
						
						
							
							refactor of example template to reflect dist changes  
						
						
						
					 
					
						2014-10-05 09:41:29 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							41c94a218a 
							
						 
					 
					
						
						
							
							refactor of the dist files  
						
						
						
					 
					
						2014-10-05 09:32:48 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							4aa98f7028 
							
						 
					 
					
						
						
							
							fixed quotes  
						
						
						
					 
					
						2014-10-05 09:00:13 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							e7758a6154 
							
						 
					 
					
						
						
							
							fixed quotes  
						
						
						
					 
					
						2014-10-05 08:57:23 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							fc4b8f2da2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'nelsonomuto/master' into develop  
						
						
						
					 
					
						2014-10-05 08:55:39 +02:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							9eedd43970 
							
						 
					 
					
						
						
							
							fixes   #81 : integrating with Travis CI  
						
						
						
					 
					
						2014-10-04 20:16:13 -04:00 
						 
				 
			
				
					
						
							
							
								shockwork 
							
						 
					 
					
						
						
						
						
							
						
						
							3440ebe636 
							
						 
					 
					
						
						
							
							.. node-sass compatibility fixed (semi-colons)  
						
						
						
					 
					
						2014-10-04 12:32:51 +02:00 
						 
				 
			
				
					
						
							
							
								Fez Vrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							e27f57bda1 
							
						 
					 
					
						
						
							
							Merge pull request  #82  from FezVrasta/develop  
						
						... 
						
						
						
						fix  #76  
					
						2014-10-04 09:06:49 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							d09279fdb0 
							
						 
					 
					
						
						
							
							fix   #76  
						
						
						
					 
					
						2014-10-04 08:43:25 +02:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2145beb0 
							
						 
					 
					
						
						
							
							fixed livereload, using default 35729 port  
						
						
						
					 
					
						2014-10-03 16:58:06 -04:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							720479cb1e 
							
						 
					 
					
						
						
							
							reverted jshint rules, cleaned up source where it was failing. updating build process errors. TODO: fix livereload  
						
						
						
					 
					
						2014-10-03 16:46:56 -04:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							82aae6fbf0 
							
						 
					 
					
						
						
							
							fixing jshint issues, modifying to allow for some not too strict jshint rules, adding grunt newer dependency.  
						
						
						
					 
					
						2014-10-03 16:13:48 -04:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							5e0ac669d0 
							
						 
					 
					
						
						
							
							adding specrunner and its build config for testing in browser  
						
						
						
					 
					
						2014-10-03 15:46:35 -04:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							fc49b45354 
							
						 
					 
					
						
						
							
							adding unit testing hooks, connect server, jshint, watch tasks and livereload  
						
						
						
					 
					
						2014-10-03 15:15:31 -04:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							d4efc6fc8b 
							
						 
					 
					
						
						
							
							capitalizing gruntfile.js filename  
						
						
						
					 
					
						2014-10-03 11:16:33 -04:00 
						 
				 
			
				
					
						
							
							
								Nelson Omuto 
							
						 
					 
					
						
						
						
						
							
						
						
							a71fc7de74 
							
						 
					 
					
						
						
							
							updating grunt with load grunt tasks  
						
						
						
					 
					
						2014-10-03 11:13:28 -04:00 
						 
				 
			
				
					
						
							
							
								Fez Vrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ddb5230e 
							
						 
					 
					
						
						
							
							Merge pull request  #72  from FezVrasta/develop  
						
						... 
						
						
						
						added nice banner 
						
					 
					
						2014-10-03 15:52:35 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							efea979cc7 
							
						 
					 
					
						
						
							
							added nice banner  
						
						
						
					 
					
						2014-10-03 15:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							351aded5ba 
							
						 
					 
					
						
						
							
							added support for selectize.js  
						
						
						
					 
					
						2014-10-03 15:15:42 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							9b54709ade 
							
						 
					 
					
						
						
							
							refactor to follow the way SASS is organized  
						
						
						
					 
					
						2014-10-03 15:00:58 +02:00 
						 
				 
			
				
					
						
							
							
								shockwork 
							
						 
					 
					
						
						
						
						
							
						
						
							fbbc5f0339 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/FezVrasta/bootstrap-material-design  
						
						
						
					 
					
						2014-10-03 14:01:02 +02:00 
						 
				 
			
				
					
						
							
							
								shockwork 
							
						 
					 
					
						
						
						
						
							
						
						
							84e18436d0 
							
						 
					 
					
						
						
							
							add sass fork  
						
						
						
					 
					
						2014-10-03 13:58:24 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							7b8024b808 
							
						 
					 
					
						
						
							
							added memo  
						
						
						
					 
					
						2014-10-03 13:06:04 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							8f955cb453 
							
						 
					 
					
						
						
							
							fix ripples detection  
						
						
						
					 
					
						2014-10-03 13:03:59 +02:00 
						 
				 
			
				
					
						
							
							
								shockwork 
							
						 
					 
					
						
						
						
						
							
						
						
							666ec3b040 
							
						 
					 
					
						
						
							
							.. run grunt  
						
						
						
					 
					
						2014-10-03 12:54:47 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							b155b25555 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						
						
					 
					
						2014-10-03 11:52:35 +02:00 
						 
				 
			
				
					
						
							
							
								FezVrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							86a7dde9fb 
							
						 
					 
					
						
						
							
							pkg.json  
						
						
						
					 
					
						2014-10-03 11:52:23 +02:00 
						 
				 
			
				
					
						
							
							
								Fez Vrasta 
							
						 
					 
					
						
						
						
						
							
						
						
							10b1bc8cd9 
							
						 
					 
					
						
						
							
							Merge pull request  #71  from pmarti/master  
						
						... 
						
						
						
						Do not add the ripple effect to all a elements 
						
					 
					
						2014-10-03 11:40:52 +02:00 
						 
				 
			
				
					
						
							
							
								Pablo Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							9c79313679 
							
						 
					 
					
						
						
							
							Do not add the ripple effect to all a elements  
						
						... 
						
						
						
						Sometimes we might not want to have some links "rippled" this patch prevents so. Ideally we'd have the possibility of passing our own set of selectors to ripples.init tho 
						
					 
					
						2014-10-03 16:39:46 +07:00