Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							80b2b7ff60 
							
						 
					 
					
						
						
							
							Added New Time Entry Front End  
						
						
						
						
					 
					
						2014-04-19 16:20:14 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							e694dfbddd 
							
						 
					 
					
						
						
							
							Don't clobber development database, durrrr  
						
						
						
						
					 
					
						2014-02-08 14:17:09 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							e0041662d3 
							
						 
					 
					
						
						
							
							WIP, adding api/bikes_controller#create  
						
						
						
						
					 
					
						2014-02-02 17:11:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							8c5ff986a2 
							
						 
					 
					
						
						
							
							Update spec, remove turnip, to get tests working  
						
						
						
						
					 
					
						2014-02-02 09:44: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 
							
						 
					 
					
						
						
						
						
							
						
						
							028a45702e 
							
						 
					 
					
						
						
							
							More comments  
						
						
						
						
					 
					
						2013-08-17 14:07:35 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							4e7f3a1761 
							
						 
					 
					
						
						
							
							Changed so that user gets checked in after create.  
						
						
						
						
					 
					
						2013-08-17 14:01:40 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							f0ce8b7171 
							
						 
					 
					
						
						
							
							Switch DB from sqlite to Postgres  
						
						... 
						
						
						
						-Postgres for production
-Migrations don't translate well between sqlite and postgres, better to just develop using the same database as production.
-Fixed migrations to work with Postgres
-Updated Readme for PG install instructions
-database config moved to .example 
						
						
					 
					
						2013-06-25 23:50:34 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							fee421cabe 
							
						 
					 
					
						
						
							
							not optimal production config, but it works  
						
						
						
						
					 
					
						2013-06-25 22:24:21 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							51caa93afa 
							
						 
					 
					
						
						
							
							Some js wasn't getting loaded at login. and other fixes  
						
						
						
						
					 
					
						2013-06-01 11:39:42 -04:00 
						 
				 
			
				
					
						
							
							
								jnm 
							
						 
					 
					
						
						
						
						
							
						
						
							fa51dd25f3 
							
						 
					 
					
						
						
							
							Merge pull request  #24  from spacemunkay/denney-reset-password  
						
						... 
						
						
						
						Denney reset password 
						
						
					 
					
						2013-05-30 19:13:49 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							761ab81b56 
							
						 
					 
					
						
						
							
							Added reset password api method  
						
						
						
						
					 
					
						2013-05-28 00:25:23 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							d5b312fa54 
							
						 
					 
					
						
						
							
							Add users resources and paginate users index  
						
						
						
						
					 
					
						2012-12-17 22:24:31 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Jason Denney 
							
						 
					 
					
						
						
						
						
							
						
						
							aa3ed3d43b 
							
						 
					 
					
						
						
							
							git init  
						
						
						
						
					 
					
						2012-12-04 00:46:15 -05:00