Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							7897795e8b 
							
						 
					 
					
						
						
							
							Correct spec description  
						
						
						
						
					 
					
						2014-04-27 14:39:32 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							00511c5b64 
							
						 
					 
					
						
						
							
							Finish Api/TimeEntries spec, fix bike_id handling  
						
						
						
						
					 
					
						2014-04-27 14:39:11 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							1191014471 
							
						 
					 
					
						
						
							
							WIP, cleaned up api/time_entries, added TimeEntry  
						
						... 
						
						
						
						* Added scoped TimeEntry model
* Removed setting defaults in TimeEntry controller
* Still working on tests… 
						
						
					 
					
						2014-04-26 20:06:47 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							062ed9c2d1 
							
						 
					 
					
						
						
							
							Added tests for user checkin/checkout on index  
						
						
						
						
					 
					
						2014-03-12 21:52:37 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							124ce5901d 
							
						 
					 
					
						
						
							
							Update spec tests for registration page  
						
						
						
						
					 
					
						2014-03-12 21:29:01 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9322ff3d 
							
						 
					 
					
						
						
							
							Fixed weird spec sign_in issues, and render json  
						
						
						
						
					 
					
						2014-03-09 22:49:30 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							64e907b6f7 
							
						 
					 
					
						
						
							
							Should authenticate by user username, not email  
						
						
						
						
					 
					
						2014-03-09 22:48:35 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							e2f442889e 
							
						 
					 
					
						
						
							
							Added tasks controller, spec, JS, apitesthelper  
						
						... 
						
						
						
						Had an issue with calling render_views in the specs to render the
jbuilder json templates and also getting the devise sign_in method to
work, ended up adding a helper to add the username/password for a user 
						
						
					 
					
						2014-03-09 22:30:41 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							3b904f95f2 
							
						 
					 
					
						
						
							
							Adding api task_lists#show and spec, edit.haml updates  
						
						
						
						
					 
					
						2014-03-09 19:20:00 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							dc0a567a27 
							
						 
					 
					
						
						
							
							Added bike show api method  
						
						
						
						
					 
					
						2014-03-08 15:03:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							20964eb268 
							
						 
					 
					
						
						
							
							Update feature for new bike view to pass  
						
						
						
						
					 
					
						2014-02-10 00:09:11 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							d0c05a0244 
							
						 
					 
					
						
						
							
							Fix validations for creating a bike, view respond to errors  
						
						
						
						
					 
					
						2014-02-09 18:23:35 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							e867366525 
							
						 
					 
					
						
						
							
							Made feature specs for creating a bike  
						
						
						
						
					 
					
						2014-02-08 16:56:34 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							fb02646092 
							
						 
					 
					
						
						
							
							Moved registrations specs to features  
						
						
						
						
					 
					
						2014-02-08 16:56:21 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							75832a3910 
							
						 
					 
					
						
						
							
							Add poltergeist to gem file, and limited version dependecies  
						
						
						
						
					 
					
						2014-02-08 16:54:50 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							38a716b132 
							
						 
					 
					
						
						
							
							Added User password_reset spec and some refactor  
						
						... 
						
						
						
						*Make returned error in errors array
*Use constants 
						
						
					 
					
						2014-02-04 23:47:30 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							9fa0017d36 
							
						 
					 
					
						
						
							
							Fixed error response codes, finished bikes#create spec  
						
						
						
						
					 
					
						2014-02-03 00:14:37 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							e0041662d3 
							
						 
					 
					
						
						
							
							WIP, adding api/bikes_controller#create  
						
						
						
						
					 
					
						2014-02-02 17:11:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							8e112ca936 
							
						 
					 
					
						
						
							
							Adding logs_controller_spec, finally test coverage!!!!!  
						
						
						
						
					 
					
						2014-02-02 09:45:01 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							8c5ff986a2 
							
						 
					 
					
						
						
							
							Update spec, remove turnip, to get tests working  
						
						
						
						
					 
					
						2014-02-02 09:44:18 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							eeefe25227 
							
						 
					 
					
						
						
							
							Make sure grabbing valid ID, better faking  
						
						
						
						
					 
					
						2013-11-03 13:58:26 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							d0b2144b28 
							
						 
					 
					
						
						
							
							Adding better fake seed data  
						
						
						
						
					 
					
						2013-11-03 13:52:43 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							4aed82cf80 
							
						 
					 
					
						
						
							
							Make wheel size an combobox option on bikes  
						
						
						
						
					 
					
						2013-10-19 15:37:01 -04:00 
						 
				 
			
				
					
						
							
							
								Ron Warholic 
							
						 
					 
					
						
						
						
						
							
						
						
							86ada003d6 
							
						 
					 
					
						
						
							
							Fixed default sort and added migration for shop_id => Integer  
						
						
						
						
					 
					
						2013-10-18 23:44:12 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							cecb3b1a32 
							
						 
					 
					
						
						
							
							Changing bike_status to bike_purporse  
						
						
						
						
					 
					
						2013-09-02 14:02:18 -04:00 
						 
				 
			
				
					
						
							
							
								John N. Milner 
							
						 
					 
					
						
						
						
						
							
						
						
							c5b16139f5 
							
						 
					 
					
						
						
							
							Merge branch 'master' into denney-new-user-form  
						
						... 
						
						
						
						Conflicts:
	db/schema.rb 
						
						
					 
					
						2013-05-30 22:03:53 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							9021294c4b 
							
						 
					 
					
						
						
							
							Auth by username instead of email  
						
						... 
						
						
						
						Added username to User table/model 
						
						
					 
					
						2013-05-25 11:08:58 -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 
						 
				 
			
				
					
						
							
							
								John N. Milner 
							
						 
					 
					
						
						
						
						
							
						
						
							55fbd06305 
							
						 
					 
					
						
						
							
							Closes   #1  
						
						
						
						
					 
					
						2013-04-04 22:27:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							189137ba9d 
							
						 
					 
					
						
						
							
							Almost usable, still a lot of work left  
						
						... 
						
						
						
						-Moved bikes to User model instead of profile
-User can copy user log to a bike log with new actsasloggable
-Added user stats
-some css was messing up checkboxes, need to figure out which stylesheet was doing that 
						
						
					 
					
						2012-12-31 15:38:34 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							db9982dcd2 
							
						 
					 
					
						
						
							
							Added user roles and authentication, sign in/out  
						
						
						
						
					 
					
						2012-12-29 16:22:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							d7f5eb26bf 
							
						 
					 
					
						
						
							
							Experimenting with Netzke/ ExtJS  
						
						
						
						
					 
					
						2012-12-23 09:02:07 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							885caefaf7 
							
						 
					 
					
						
						
							
							Create factory for seeding db with fake bikes, update seeds.rb  
						
						
						
						
					 
					
						2012-12-09 14:26:31 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							aa3ed3d43b 
							
						 
					 
					
						
						
							
							git init  
						
						
						
						
					 
					
						2012-12-04 00:46:15 -05:00