jnm
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c90c13c3b
							
						
					 | 
					
						
						
							
							Merge pull request #15 from spacemunkay/denney-add-users-roles
						
						
						
						
						
						
						
						Changing UserRole to UserRoleJoin 
						
						
					 | 
					
						2013-05-23 18:03:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7755f00ed
							
						
					 | 
					
						
						
							
							Initial stab at check-in feature
						
						
						
						
						
						
					 | 
					
						2013-05-19 15:43:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							91bb2ea43e
							
						
					 | 
					
						
						
							
							Changing UserRole to UserRoleJoin
						
						
						
						
						
						
						
						Beware, this breaks the view for some reason 
						
						
					 | 
					
						2013-04-23 23:21:17 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								John N. Milner
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3fcdec10c
							
						
					 | 
					
						
						
							
							WIP adding user roles view; adding end datetime to user roles
						
						
						
						
						
						
					 | 
					
						2013-04-18 22:16:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa3658ec63
							
						
					 | 
					
						
						
							
							fix wrong id in fixtures
						
						
						
						
						
						
					 | 
					
						2013-01-05 14:31:59 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							c00c8fa3df
							
						
					 | 
					
						
						
							
							Fixed user profiles and added NOTE action to bike_logs
						
						
						
						
						
						
					 | 
					
						2013-01-05 14:01:26 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							db9982dcd2
							
						
					 | 
					
						
						
							
							Added user roles and authentication, sign in/out
						
						
						
						
						
						
					 | 
					
						2012-12-29 16:22:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f850d61f1
							
						
					 | 
					
						
						
							
							Added extra status to bike statuses
						
						
						
						
						
						
					 | 
					
						2012-12-27 02:15:56 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2eefd8163
							
						
					 | 
					
						
						
							
							actsasloggable transaction actions fixtures, resources, controller, and views
						
						
						
						
						
						
					 | 
					
						2012-12-09 18:11:18 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							139f5ccf9b
							
						
					 | 
					
						
						
							
							ActsAsLoggable User Actions fixtures, resources, controller, and views
						
						
						
						
						
						
					 | 
					
						2012-12-09 18:06:04 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							29af72787b
							
						
					 | 
					
						
						
							
							Add Bike Style model and defaults
						
						
						
						
						
						
					 | 
					
						2012-12-08 16:36:29 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ce2cef2f6
							
						
					 | 
					
						
						
							
							Add extra default condition
						
						
						
						
						
						
					 | 
					
						2012-12-08 16:27:53 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bf4c4d601
							
						
					 | 
					
						
						
							
							Added bike_brands and bike_models sql data
						
						
						
						
						
						
						
						-Update some migrations to match source schema, will need to add timestamps back eventually 
						
						
					 | 
					
						2012-12-08 14:59:49 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							6937cc3146
							
						
					 | 
					
						
						
							
							Added sql for bike brands and their models
						
						
						
						
						
						
					 | 
					
						2012-12-08 14:22:43 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Denney
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ba1ef6225
							
						
					 | 
					
						
						
							
							move test/fixtures to db/seed/fixtures since they are only used for seeding, not testing.
						
						
						
						
						
						
					 | 
					
						2012-12-08 09:43:46 -05:00 | 
					
					
						
						
							
							
							
						
					 |