Brigitte Warner 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e49cbbb2 
							
						 
					 
					
						
						
							
							update less to sass  
						
						
						
						
					 
					
						2014-07-24 20:42:09 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							3e480981c7 
							
						 
					 
					
						
						
							
							Fix User being able to add bikes  
						
						
						
						
					 
					
						2014-06-12 22:24:00 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							5e95ce542c 
							
						 
					 
					
						
						
							
							root path to user edit  
						
						
						
						
					 
					
						2014-06-12 21:24:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							1b2c0fa378 
							
						 
					 
					
						
						
							
							Submit dates in locale format for time being  
						
						... 
						
						
						
						Added jquery date format plugin 
						
						
					 
					
						2014-05-04 20:43:46 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							5c4007a1be 
							
						 
					 
					
						
						
							
							Show add another bike link after creating bike  
						
						
						
						
					 
					
						2014-05-04 11:14:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							0605d0f0d9 
							
						 
					 
					
						
						
							
							Fixed creating bike work time entry & added spec  
						
						
						
						
					 
					
						2014-05-04 10:56:14 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							071815b9fd 
							
						 
					 
					
						
						
							
							Fix app layout for mobile devices  
						
						
						
						
					 
					
						2014-05-04 10:34:55 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							ca3026e7c5 
							
						 
					 
					
						
						
							
							Added delete time entry feature spec  
						
						
						
						
					 
					
						2014-05-03 22:53:27 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							5e0d678ea1 
							
						 
					 
					
						
						
							
							Finish time entry delete JS/html  
						
						
						
						
					 
					
						2014-05-03 22:08:23 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							d94c436ba5 
							
						 
					 
					
						
						
							
							Added api/time_entry/delete method  
						
						
						
						
					 
					
						2014-05-03 22:06:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							24facd4dee 
							
						 
					 
					
						
						
							
							Time entry actions had the wrong IDs...  
						
						
						
						
					 
					
						2014-05-03 21:48:35 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							894423e66f 
							
						 
					 
					
						
						
							
							Fixed bug in user credits available  
						
						... 
						
						
						
						Personal work was counting toward credits, now it’s possible to add a
column to user actions to denote if a user action can count to credits. 
						
						
					 
					
						2014-05-03 21:41:33 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							4ce4bd6597 
							
						 
					 
					
						
						
							
							WIP, rigged up JS/html to delete work entries  
						
						
						
						
					 
					
						2014-05-03 19:29:57 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							2e21e327ca 
							
						 
					 
					
						
						
							
							Home page link to time entries  
						
						
						
						
					 
					
						2014-05-03 19:29:22 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							57d72c04a7 
							
						 
					 
					
						
						
							
							Fix TimeEntry scope  
						
						
						
						
					 
					
						2014-05-03 19:28:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							4224f0de40 
							
						 
					 
					
						
						
							
							Added Time entries index page  
						
						
						
						
					 
					
						2014-04-27 18:59:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							3d71add637 
							
						 
					 
					
						
						
							
							WIP, adding time entry index page  
						
						
						
						
					 
					
						2014-04-27 15:46:42 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							7dd556d718 
							
						 
					 
					
						
						
							
							Fixed forwarding on time entry creation  
						
						
						
						
					 
					
						2014-04-27 15:46:13 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a9d8c1e5 
							
						 
					 
					
						
						
							
							Return time entry on successful create  
						
						
						
						
					 
					
						2014-04-20 22:56:48 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							82f38fe35c 
							
						 
					 
					
						
						
							
							Actually merge time_entry defaults  
						
						
						
						
					 
					
						2014-04-20 22:56:26 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							2321197973 
							
						 
					 
					
						
						
							
							If bike selected, forward to bike checklist  
						
						
						
						
					 
					
						2014-04-20 22:56:04 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							069a11f480 
							
						 
					 
					
						
						
							
							WIP, adding JS and api time entry create  
						
						
						
						
					 
					
						2014-04-19 21:06:29 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							b30203b750 
							
						 
					 
					
						
						
							
							Allow user select bike worked when adding time  
						
						
						
						
					 
					
						2014-04-19 16:48:10 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							3e56f2eb19 
							
						 
					 
					
						
						
							
							Updating edit task list page w/ home & bike link  
						
						
						
						
					 
					
						2014-04-19 16:25:15 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							2d65ebb45f 
							
						 
					 
					
						
						
							
							JS Formatting  
						
						
						
						
					 
					
						2014-04-19 16:22:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							80b2b7ff60 
							
						 
					 
					
						
						
							
							Added New Time Entry Front End  
						
						
						
						
					 
					
						2014-04-19 16:20:14 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							98b136e4f4 
							
						 
					 
					
						
						
							
							Add link to view bike check list when showing bike  
						
						
						
						
					 
					
						2014-03-16 13:50:13 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							9527725e07 
							
						 
					 
					
						
						
							
							Adding makeshift home button, Added view your bike link  
						
						
						
						
					 
					
						2014-03-16 13:34:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							8f637348cf 
							
						 
					 
					
						
						
							
							Fix check in/ check out  
						
						
						
						
					 
					
						2014-03-12 23:35:09 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							062ed9c2d1 
							
						 
					 
					
						
						
							
							Added tests for user checkin/checkout on index  
						
						
						
						
					 
					
						2014-03-12 21:52:37 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							b1ddcfb867 
							
						 
					 
					
						
						
							
							Redirect correctly after creating a bike  
						
						
						
						
					 
					
						2014-03-09 22:48:59 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							656f0f12e4 
							
						 
					 
					
						
						
							
							WIP, creating TaskList Controller and edit action & view  
						
						
						
						
					 
					
						2014-03-08 15:34:58 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							30d818ac87 
							
						 
					 
					
						
						
							
							Draft of the task list api controller  
						
						
						
						
					 
					
						2014-03-08 15:04:27 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							dc0a567a27 
							
						 
					 
					
						
						
							
							Added bike show api method  
						
						
						
						
					 
					
						2014-03-08 15:03:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							523046b042 
							
						 
					 
					
						
						
							
							Add create jbuilder template  
						
						
						
						
					 
					
						2014-03-01 14:15:49 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							14869cf8b6 
							
						 
					 
					
						
						
							
							Modifed bikes create to use jbuilder & follow jsonapi.org  
						
						
						
						
					 
					
						2014-02-26 00:06:25 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							7b11da9583 
							
						 
					 
					
						
						
							
							Forward url on add bike/ don't display value if nil  
						
						
						
						
					 
					
						2014-02-09 22:01:42 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							64d4186b57 
							
						 
					 
					
						
						
							
							Bike show view styling  
						
						... 
						
						
						
						TBD add class for color block 
						
						
					 
					
						2014-02-09 19:18:16 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							c6a3ed9991 
							
						 
					 
					
						
						
							
							Added bike show and show view  
						
						
						
						
					 
					
						2014-02-09 19:11:08 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							55974feb4c 
							
						 
					 
					
						
						
							
							Parse float for seat tube height  
						
						
						
						
					 
					
						2014-02-09 18:22:33 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							2d09aba26a 
							
						 
					 
					
						
						
							
							Added submit js to bikes/new view  
						
						... 
						
						
						
						* Added displayFormErrors utility
* Added 4th option to bike styles “OTHER” 
						
						
					 
					
						2014-02-08 14:21:20 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							8110baf255 
							
						 
					 
					
						
						
							
							Removing unnecessary render  
						
						
						
						
					 
					
						2014-02-03 00:16:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							9fa0017d36 
							
						 
					 
					
						
						
							
							Fixed error response codes, finished bikes#create spec  
						
						
						
						
					 
					
						2014-02-03 00:14:37 -05:00