FezVrasta
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cea1f36ef
							
						
					 | 
					
						
						
							
							Merge branch 'develop'
						
						
						
						
						
						
						
						Conflicts:
	bower.json 
						
					 | 
					
						2014-10-18 15:18:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phuc Nguyen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebdf2f0c3f
							
						
					 | 
					
						
						
							
							Merge upstream/develop into card
						
						
						
						
						
					 | 
					
						2014-10-13 18:01:22 +07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phuc Nguyen
							
						 
					 | 
					
						
						
						
						
							
						
						
							8835848f68
							
						
					 | 
					
						
						
							
							Trying to fix issue with ripple effect on card image
						
						
						
						
						
					 | 
					
						2014-10-13 16:58:48 +07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								FezVrasta
							
						 
					 | 
					
						
						
						
						
							
						
						
							eeb7cceead
							
						
					 | 
					
						
						
							
							added support for mobile devices to ripples.js
						
						
						
						
						
					 | 
					
						2014-10-13 10:50:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								FezVrasta
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9722a936c
							
						
					 | 
					
						
						
							
							improved ripples.js
						
						
						
						
						
					 | 
					
						2014-10-13 09:43:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phuc Nguyen
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a80e1b083
							
						
					 | 
					
						
						
							
							Add styling for cards (first draft)
						
						
						
						
						
					 | 
					
						2014-10-12 17:28:11 +07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phuc Nguyen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4eef5af020
							
						
					 | 
					
						
						
							
							Add null check for $ripple
						
						
						
						
						
					 | 
					
						2014-10-12 15:42:56 +07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jordan Davis
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb116a89b6
							
						
					 | 
					
						
						
							
							change font to Roboto, change border radius and fab style to reflect google guidelines
						
						
						
						
						
					 | 
					
						2014-10-10 23:22:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shockwork
							
						 
					 | 
					
						
						
						
						
							
						
						
							16af0a6f76
							
						
					 | 
					
						
						
							
							fixes #106 - also fixes the jshint errors from prior commit
						
						
						
						
						
					 | 
					
						2014-10-10 10:34:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shockwork
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4336133d9
							
						
					 | 
					
						
						
							
							fixes #94 - ripple background color
						
						
						
						
						
					 | 
					
						2014-10-10 00:48:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shockwork
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5aa3da98e
							
						
					 | 
					
						
						
							
							jshint no longer checks *.min.js, pre master merge
						
						
						
						
						
					 | 
					
						2014-10-05 11:26:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								FezVrasta
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc1cecdb23
							
						
					 | 
					
						
						
							
							refactor of example template to reflect dist changes
						
						
						
						
						
					 | 
					
						2014-10-05 09:41:29 +02:00 | 
					
					
						
						
							
							
							
						
					 |