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 
							
						 
					 
					
						
						
						
						
							
						
						
							d94c436ba5 
							
						 
					 
					
						
						
							
							Added api/time_entry/delete method  
						
						
						
						
					 
					
						2014-05-03 22:06:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							4224f0de40 
							
						 
					 
					
						
						
							
							Added Time entries index page  
						
						
						
						
					 
					
						2014-04-27 18:59:50 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							82f38fe35c 
							
						 
					 
					
						
						
							
							Actually merge time_entry defaults  
						
						
						
						
					 
					
						2014-04-20 22:56:26 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							14869cf8b6 
							
						 
					 
					
						
						
							
							Modifed bikes create to use jbuilder & follow jsonapi.org  
						
						
						
						
					 
					
						2014-02-26 00:06:25 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							c6a3ed9991 
							
						 
					 
					
						
						
							
							Added bike show and show view  
						
						
						
						
					 
					
						2014-02-09 19:11:08 -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 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							e0041662d3 
							
						 
					 
					
						
						
							
							WIP, adding api/bikes_controller#create  
						
						
						
						
					 
					
						2014-02-02 17:11:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							f17eba810e 
							
						 
					 
					
						
						
							
							WTF?  Is this needed? Commenting this out for now  
						
						... 
						
						
						
						users#checkout  copy pasta perhaps? 
						
						
					 
					
						2014-02-02 17:09:49 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							4b5133fd02 
							
						 
					 
					
						
						
							
							Fix unauthorized return code  
						
						
						
						
					 
					
						2014-02-02 17:09:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							a8bdb52536 
							
						 
					 
					
						
						
							
							Improved Add Bike view  
						
						... 
						
						
						
						Worked out some bootstrap overrides issues 
						
						
					 
					
						2014-01-19 19:32:18 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							0f890e12e9 
							
						 
					 
					
						
						
							
							Added bikes views  
						
						... 
						
						
						
						*Added new bike template 
						
						
					 
					
						2014-01-18 18:25:21 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							a84b0e0fe7 
							
						 
					 
					
						
						
							
							Moving Netzke Admin view to Panel controller  
						
						... 
						
						
						
						*Moved custom_netzke_helpers code to panel.js
*Added panel controller and index and netzke layout 
						
						
					 
					
						2014-01-18 15:14:19 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							761ab81b56 
							
						 
					 
					
						
						
							
							Added reset password api method  
						
						
						
						
					 
					
						2013-05-28 00:25:23 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							a00c1ed925 
							
						 
					 
					
						
						
							
							Finished Checkin/out feature for now  
						
						... 
						
						
						
						-Checkin/out api methods can be used while signed in
-Added checkout button in Netzke App, which also signs out in addition to checking out. 
						
						
					 
					
						2013-05-19 16:41:43 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							d7755f00ed 
							
						 
					 
					
						
						
							
							Initial stab at check-in feature  
						
						
						
						
					 
					
						2013-05-19 15:43:44 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							855565dcc4 
							
						 
					 
					
						
						
							
							Removing everything that is not necessary (keeping them in dev branch)  
						
						
						
						
					 
					
						2013-01-13 14:08:58 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							9b7ca53f8e 
							
						 
					 
					
						
						
							
							remove comment  
						
						
						
						
					 
					
						2013-01-05 14:09:37 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							b11d04a397 
							
						 
					 
					
						
						
							
							Removing puts and console.logs  
						
						
						
						
					 
					
						2013-01-01 21:06:41 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							939ea5b9db 
							
						 
					 
					
						
						
							
							Refactored log controller, added log editing  
						
						... 
						
						
						
						Refactored log controller, added log editing 
						
						
					 
					
						2012-12-17 10:19:02 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							c98c53de76 
							
						 
					 
					
						
						
							
							Got logs working for users and bikes  
						
						... 
						
						
						
						Not my best work, but it works, need to add transactions, need to add edit/show actions 
						
						
					 
					
						2012-12-14 00:03:11 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							7e0f43b271 
							
						 
					 
					
						
						
							
							Added BikeConditions resources, controller, and views  
						
						
						
						
					 
					
						2012-12-09 17:53:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							ca8b945e03 
							
						 
					 
					
						
						
							
							Updating doesn't work on bike_actions  
						
						
						
						
					 
					
						2012-12-09 16:28:05 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							a27c898ddb 
							
						 
					 
					
						
						
							
							Add acts_as_loggable/bike_actions resources, controller, and views  
						
						... 
						
						
						
						-Note that updating doesn't work due to expose gem perhaps?  Need to fix 
						
						
					 
					
						2012-12-09 16:27:38 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							d3c466761e 
							
						 
					 
					
						
						
							
							Add bike routes, controller, and views. Update model.  
						
						
						
						
					 
					
						2012-12-09 14:26:58 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							e41426ea7b 
							
						 
					 
					
						
						
							
							Added bike styles routes, controller and views  
						
						
						
						
					 
					
						2012-12-09 13:29:20 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							4ae03fc563 
							
						 
					 
					
						
						
							
							expose is awesome  
						
						
						
						
					 
					
						2012-12-09 13:15:57 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							8d488c86a0 
							
						 
					 
					
						
						
							
							Added Bike Status routes, Controller and views  
						
						
						
						
					 
					
						2012-12-09 13:15:38 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							747b8d9c4b 
							
						 
					 
					
						
						
							
							Added bike models controller and views  
						
						
						
						
					 
					
						2012-12-08 16:56:50 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							01923723ff 
							
						 
					 
					
						
						
							
							Add Bike Brand Controller and Views  
						
						
						
						
					 
					
						2012-12-08 16:36:04 -05:00