cfb9dfabc0 
							
						 
					 
					
						
						
							
							Merge branch 'issue_5_more_consumable_material' into development  
						
						... 
						
						
						
						Conflicts:
	app/__init__.py 
						
					 
					
						2016-07-17 09:22:38 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fdb8993ac3 
							
						 
					 
					
						
						
							
							Merge branch 'issue_5_more_consumable_material' into pycharm  
						
						... 
						
						
						
						Conflicts:
	app/__init__.py
	app/rollerverbrauch/templates/createPitStopForm.html
	app/rollerverbrauch/templates/newPitStopForm.html
	app/rollerverbrauch/templates/selectVehice.html
	app/rollerverbrauch/templates/selectVehicle.html
	app/templates/newPitStopForm.html
	app/templates/selectVehice.html 
						
					 
					
						2016-07-16 19:29:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1f5cb6b1fa 
							
						 
					 
					
						
						
							
							Fixed issue with status on non-logged in index page  
						
						
						
					 
					
						2016-07-16 13:29:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1516ac2c51 
							
						 
					 
					
						
						
							
							db update script and some fixes  
						
						
						
					 
					
						2016-07-16 12:07:01 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							aa9fda93c0 
							
						 
					 
					
						
						
							
							statistics 3rd  
						
						
						
					 
					
						2016-07-11 22:15:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ca5bd9bb02 
							
						 
					 
					
						
						
							
							statistics 2nd step  
						
						
						
					 
					
						2016-07-11 06:59:34 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4ea42a7efd 
							
						 
					 
					
						
						
							
							first step for statistics  
						
						
						
					 
					
						2016-07-10 13:40:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							43e3f9c98b 
							
						 
					 
					
						
						
							
							.  
						
						
						
					 
					
						2016-07-04 20:19:59 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							738bcb9f89 
							
						 
					 
					
						
						
							
							Fixed project structure for pycharm  
						
						
						
					 
					
						2016-07-03 19:29:30 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							af5d4ae6b3 
							
						 
					 
					
						
						
							
							cann add pitstops for selected vehicles / consumables  
						
						
						
					 
					
						2016-06-29 22:50:01 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							907d0435d1 
							
						 
					 
					
						
						
							
							consumables for vehicles can be edited  
						
						
						
					 
					
						2016-06-28 23:33:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fe4236eead 
							
						 
					 
					
						
						
							
							renamed template for create a pitstop  
						
						
						
					 
					
						2016-06-28 21:35:04 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a0be122186 
							
						 
					 
					
						
						
							
							reworked the crud funtions for vehicles  
						
						
						
					 
					
						2016-06-27 22:09:42 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fa4126be66 
							
						 
					 
					
						
						
							
							adds update & delete for consumables  
						
						... 
						
						
						
						adds functionality to
* update
* delete
for consumables 
						
					 
					
						2016-06-27 21:35:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							60f2e9f4e4 
							
						 
					 
					
						
						
							
							adds form to create a consumable  
						
						
						
					 
					
						2016-06-27 20:08:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5e24b9779e 
							
						 
					 
					
						
						
							
							makes the name of a consumable unique  
						
						... 
						
						
						
						makes the column unique and extends the create form to respect the
uniqueness. 
						
					 
					
						2016-06-27 19:48:04 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							90639a757d 
							
						 
					 
					
						
						
							
							Merge branch 'development' into issue_5_more_consumable_material  
						
						
						
					 
					
						2016-06-26 08:27:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							820063837d 
							
						 
					 
					
						
						
							
							Merge branch 'issue_4_add_cost_field' into development  
						
						
						
					 
					
						2016-06-26 08:26:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f2623cf6e9 
							
						 
					 
					
						
						
							
							bugfix for creating first pitstop of a vehicle  
						
						
						
					 
					
						2016-06-26 08:25:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1072142a1b 
							
						 
					 
					
						
						
							
							adds consumables to database  
						
						... 
						
						
						
						this adds a new consumables entity to the database and
the possibility in the admin page to add these. 
						
					 
					
						2016-06-26 08:19:28 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9d41c39ae7 
							
						 
					 
					
						
						
							
							adds edit feature for last pitstop  
						
						... 
						
						
						
						Adds the possibility to edit the last pitstop in a dedicated
form. 
						
					 
					
						2016-06-24 07:15:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6f7716abc6 
							
						 
					 
					
						
						
							
							adds delete feature for last pitstop  
						
						... 
						
						
						
						Adds the possibility to delete the latest pitstop after a
confirmation page. 
						
					 
					
						2016-06-22 22:48:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5b69a82e05 
							
						 
					 
					
						
						
							
							adds tracking of costs  
						
						... 
						
						
						
						This commit adds a new field to each pitstop for tracking of
costs.
This includes:
* a new DB column
* a new field in the create pitstop form
* a new column in the pitstop overview
* new stats values related to costs
* 2 new graphs 
						
					 
					
						2016-06-21 21:06:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							da7c40c78b 
							
						 
					 
					
						
						
							
							Merge branch 'index_page' into implement_delete_account  
						
						
						
					 
					
						2016-05-25 09:40:20 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							00579eb542 
							
						 
					 
					
						
						
							
							Merge branch 'index_page' into implement_delete_account  
						
						
						
					 
					
						2016-05-24 23:56:12 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ef55b4e479 
							
						 
					 
					
						
						
							
							First step  
						
						
						
					 
					
						2016-05-24 23:55:58 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							293ff50809 
							
						 
					 
					
						
						
							
							Some more UI changes  
						
						
						
					 
					
						2016-05-24 06:49:39 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							873a28aa28 
							
						 
					 
					
						
						
							
							ui redesign  
						
						
						
					 
					
						2016-05-22 11:47:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1c4d73da43 
							
						 
					 
					
						
						
							
							Adds start page for unauthed visitors  
						
						
						
					 
					
						2016-05-18 08:19:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7eef2b6cee 
							
						 
					 
					
						
						
							
							Adds start page for unauthed visitors  
						
						
						
					 
					
						2016-05-18 08:17:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							19b1e3b7ae 
							
						 
					 
					
						
						
							
							Handle vehicle name uniqueness  
						
						... 
						
						
						
						Vehicle names now must be only unique per owner, not globally.
Also errors are displayed to the forms on creation and edit of
vehicles. 
						
					 
					
						2016-05-16 18:46:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c5305caf36 
							
						 
					 
					
						
						
							
							switched to configurable db  
						
						
						
					 
					
						2016-05-05 15:06:29 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e1e5fe7725 
							
						 
					 
					
						
						
							
							Little Improvements  
						
						... 
						
						
						
						Help text for create pitstops form
More precise error messages for create pitstops form
Fixed bu in statistics page when only one pitstop was present 
						
					 
					
						2016-05-03 22:21:57 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							471f1415d9 
							
						 
					 
					
						
						
							
							Removed print  
						
						
						
					 
					
						2016-05-02 08:03:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6b861903af 
							
						 
					 
					
						
						
							
							add consumption chart  
						
						
						
					 
					
						2016-05-02 07:59:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							706f30e2e2 
							
						 
					 
					
						
						
							
							switched off drop representation  
						
						
						
					 
					
						2016-05-02 07:59:14 +02:00 
						 
				 
			
				
					
						
							
							
								Joachim Lusiardi 
							
						 
					 
					
						
						
						
						
							
						
						
							cc7d2620e8 
							
						 
					 
					
						
						
							
							Worked on charts  
						
						
						
					 
					
						2016-05-02 06:42:43 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							161cc16498 
							
						 
					 
					
						
						
							
							continued work ok charts  
						
						
						
					 
					
						2016-04-30 06:41:59 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ef976299dc 
							
						 
					 
					
						
						
							
							Fix PEP8 error  
						
						
						
					 
					
						2016-04-28 22:33:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							60293d6a27 
							
						 
					 
					
						
						
							
							Demo Chart  
						
						
						
					 
					
						2016-04-28 07:53:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							13a5b07df2 
							
						 
					 
					
						
						
							
							fixed variable name  
						
						
						
					 
					
						2016-04-28 07:10:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fd206de263 
							
						 
					 
					
						
						
							
							add logging for performed db operations  
						
						
						
					 
					
						2016-04-28 06:32:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3e2d62b28f 
							
						 
					 
					
						
						
							
							improved design of the form elements  
						
						
						
					 
					
						2016-04-27 07:23:28 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ca7166f731 
							
						 
					 
					
						
						
							
							fixed stats  
						
						
						
					 
					
						2016-04-25 22:28:35 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							34905921d9 
							
						 
					 
					
						
						
							
							fixes display of last pitstops  
						
						... 
						
						
						
						the display of the last pitstops now is separated by vehicle. 
						
					 
					
						2016-04-25 07:23:01 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							038e255b56 
							
						 
					 
					
						
						
							
							can add pitstops to vehicles nows  
						
						
						
					 
					
						2016-04-24 14:09:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3709eddabb 
							
						 
					 
					
						
						
							
							prevents the deletion of vehicles of other users  
						
						
						
					 
					
						2016-04-24 12:42:07 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c941e1bccf 
							
						 
					 
					
						
						
							
							finished modules merge  
						
						
						
					 
					
						2016-04-23 23:24:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7bc5422687 
							
						 
					 
					
						
						
							
							Merge branch 'create_modules' into add_vehicles  
						
						... 
						
						
						
						Conflicts:
	app/main.py 
						
					 
					
						2016-04-23 23:22:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0d8ae0cd18 
							
						 
					 
					
						
						
							
							introduces modules  
						
						
						
					 
					
						2016-04-23 23:08:39 +02:00