| 
						
					 | 
					
						
						
						
						
							
						
						
							0d8ae0cd18
							
						
					 | 
					
						
						
							
							introduces modules
						
						
						
						
						
					 | 
					
						2016-04-23 23:08:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3ec2e4648d
							
						
					 | 
					
						
						
							
							Merge branch 'user_handling' into 'master'
						
						
						
						
						
						
						
						User handling
See merge request !4 
						
					 | 
					
						2016-04-23 17:35:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4261a9bb0b
							
						
					 | 
					
						
						
							
							reworked git ignore file
						
						
						
						
						
					 | 
					
						2016-04-21 08:12:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0303be7945
							
						
					 | 
					
						
						
							
							more user handling features of flask-security activated
						
						
						
						
						
						
						
						Now users can recover their passwords and change them while
logged in. 
						
					 | 
					
						2016-04-21 08:11:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							01798e9548
							
						
					 | 
					
						
						
							
							adds admin page
						
						
						
						
						
						
						
						admin users must have role admin (which must currently be set
manually via database) 
						
					 | 
					
						2016-04-19 22:41:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9eb7ec7c8a
							
						
					 | 
					
						
						
							
							switched to environment variable for config file lookup
						
						
						
						
						
					 | 
					
						2016-04-19 21:09:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							344db8d998
							
						
					 | 
					
						
						
							
							add example config file
						
						
						
						
						
					 | 
					
						2016-04-19 08:19:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1240a3c64b
							
						
					 | 
					
						
						
							
							Users are allowed to register now
						
						
						
						
						
						
						
						This includes sending a welcome email. 
						
					 | 
					
						2016-04-19 07:39:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2e0fc3b772
							
						
					 | 
					
						
						
							
							Merge branch 'master' into user_handling
						
						
						
						
						
						
						
						Conflicts:
	app/main.py
	app/requirements.txt 
						
					 | 
					
						2016-04-18 21:43:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d449cb0ab
							
						
					 | 
					
						
						
							
							Merge branch 'master' of code.nerd2nerd.org:n0ob/rollerverbrauch
						
						
						
						
						
					 | 
					
						2016-04-18 21:01:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4c97bd86db
							
						
					 | 
					
						
						
							
							Fixed date vs datetime
						
						
						
						
						
					 | 
					
						2016-04-18 20:58:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8057c59329
							
						
					 | 
					
						
						
							
							Merge branch 'wtforms' into 'master'
						
						
						
						
						
						
						
						Wtforms
See merge request !3 
						
					 | 
					
						2016-04-18 20:35:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1998fcb7d8
							
						
					 | 
					
						
						
							
							Merge branch 'master' into wtforms
						
						
						
						
						
						
						
						Conflicts:
	app/main.py 
						
					 | 
					
						2016-04-18 20:34:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							01019c22d9
							
						
					 | 
					
						
						
							
							add switch for debugger
						
						
						
						
						
					 | 
					
						2016-04-18 08:13:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							864b7822ac
							
						
					 | 
					
						
						
							
							Changed to WTForms including validation
						
						
						
						
						
					 | 
					
						2016-04-18 07:25:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f218e591f
							
						
					 | 
					
						
						
							
							add render_field macro to layout.html
						
						
						
						
						
					 | 
					
						2016-04-17 15:06:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8c8803874e
							
						
					 | 
					
						
						
							
							First step for WTForms
						
						
						
						
						
					 | 
					
						2016-04-17 12:50:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6ed4110ce9
							
						
					 | 
					
						
						
							
							logout only if logged in
						
						
						
						
						
					 | 
					
						2016-04-17 09:59:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a9b2781ae3
							
						
					 | 
					
						
						
							
							custom login form added
						
						
						
						
						
					 | 
					
						2016-04-17 09:34:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f6f1d960b7
							
						
					 | 
					
						
						
							
							Add logout button to menu
						
						
						
						
						
					 | 
					
						2016-04-17 09:05:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bbfa7b9341
							
						
					 | 
					
						
						
							
							First step towards flask security user handling
						
						
						
						
						
					 | 
					
						2016-04-17 08:59:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							808e0d80d3
							
						
					 | 
					
						
						
							
							Merge branch 'introduce_sqlalchemy' into 'master'
						
						
						
						
						
						
						
						switched to Flask-SQLAlchemy for db handling
See merge request !2 
						
					 | 
					
						2016-04-16 15:57:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fc421558b0
							
						
					 | 
					
						
						
							
							switched to Flask-SQLAlchemy for db handling
						
						
						
						
						
					 | 
					
						2016-04-16 15:48:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1adf69ca0
							
						
					 | 
					
						
						
							
							Merge branch 'reduce_features' into 'master'
						
						
						
						
						
						
						
						Reduce features
See merge request !1 
						
					 | 
					
						2016-04-14 19:54:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							059c86b449
							
						
					 | 
					
						
						
							
							add .gitignore file
						
						
						
						
						
					 | 
					
						2016-04-14 19:53:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb521194f7
							
						
					 | 
					
						
						
							
							Reduce services feature and reformatting
						
						
						
						
						
					 | 
					
						2016-04-14 07:32:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef02cc8ab3
							
						
					 | 
					
						
						
							
							Add basic build and run information
						
						
						
						
						
					 | 
					
						2016-04-14 07:02:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8f99b798bb
							
						
					 | 
					
						
						
							
							reworked docker file for faster build times
						
						
						
						
						
					 | 
					
						2016-04-13 08:30:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a12d5f541b
							
						
					 | 
					
						
						
							
							Add authentication for pre-existing users.
						
						
						
						
						
					 | 
					
						2015-08-03 22:24:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb77d03ea3
							
						
					 | 
					
						
						
							
							App now runs on empty DB.
						
						
						
						
						
					 | 
					
						2015-08-02 22:45:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f194deac5
							
						
					 | 
					
						
						
							
							Add EXPOSE information
						
						
						
						
						
					 | 
					
						2015-08-02 22:43:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							56bf707e3b
							
						
					 | 
					
						
						
							
							next try with icons
						
						
						
						
						
					 | 
					
						2015-03-22 13:31:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b4a3ab48a
							
						
					 | 
					
						
						
							
							added active class to show which tab is active in services overview
						
						
						
						
						
					 | 
					
						2015-03-22 13:02:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							6daae927f9
							
						
					 | 
					
						
						
							
							tuned apple icon
						
						
						
						
						
					 | 
					
						2015-03-22 11:02:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							915dc01fc3
							
						
					 | 
					
						
						
							
							second try for apple icons
						
						
						
						
						
					 | 
					
						2015-03-22 10:54:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b03dd6ad0
							
						
					 | 
					
						
						
							
							added icon for apple
						
						
						
						
						
						
						
						added tabbing for services 
						
					 | 
					
						2015-03-22 10:07:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							895736eaf1
							
						
					 | 
					
						
						
							
							splitted services
						
						
						
						
						
					 | 
					
						2015-03-20 21:18:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6807857cb
							
						
					 | 
					
						
						
							
							fixed typo
						
						
						
						
						
					 | 
					
						2015-03-18 21:33:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							5edfbb9e9b
							
						
					 | 
					
						
						
							
							added manual
						
						
						
						
						
					 | 
					
						2015-03-17 20:57:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							0418476d67
							
						
					 | 
					
						
						
							
							added initial values for service
						
						
						
						
						
					 | 
					
						2015-03-16 22:47:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							73b2ccc195
							
						
					 | 
					
						
						
							
							started working on services
						
						
						
						
						
					 | 
					
						2015-03-16 22:06:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							e479bc24ac
							
						
					 | 
					
						
						
							
							added services tab
						
						
						
						
						
						
						
						fixed input field to accept tenth of litres 
						
					 | 
					
						2015-03-15 07:28:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b767ec1ea
							
						
					 | 
					
						
						
							
							little design work
						
						
						
						
						
					 | 
					
						2015-03-13 22:40:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f6f6fd7c8
							
						
					 | 
					
						
						
							
							minor changes
						
						
						
						
						
					 | 
					
						2015-03-12 08:02:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							e933473d07
							
						
					 | 
					
						
						
							
							changed inputs to number
						
						
						
						
						
					 | 
					
						2015-03-09 20:57:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							140bb3a3d6
							
						
					 | 
					
						
						
							
							added checks for new pit stop form
						
						
						
						
						
					 | 
					
						2015-03-09 20:11:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joachim lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							47921e1941
							
						
					 | 
					
						
						
							
							added checks for new pit stop form
						
						
						
						
						
					 | 
					
						2015-03-09 20:06:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joachim Lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							00c6f6d71d
							
						
					 | 
					
						
						
							
							dockerized it
						
						
						
						
						
					 | 
					
						2015-03-07 09:51:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joachim Lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a778295b6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of code.nerd2nerd.org:n0ob/rollerverbrauch
						
						
						
						
						
					 | 
					
						2015-03-06 21:58:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joachim Lusiardi
							
						 
					 | 
					
						
						
						
						
							
						
						
							e64f94cfd9
							
						
					 | 
					
						
						
							
							dockerized it
						
						
						
						
						
					 | 
					
						2015-03-06 21:58:53 +01:00 | 
					
					
						
						
							
							
							
						
					 |