Commit Graph

76 Commits

Author SHA1 Message Date
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
1e5b63d068 Merge branch 'add_app_step_log' into 'master'
fixed variable name



See merge request !7
2016-04-28 07:11:10 +02:00
13a5b07df2 fixed variable name 2016-04-28 07:10:44 +02:00
662e5b5b63 Merge branch 'add_app_step_log' into 'master'
Add app step log



See merge request !6
2016-04-28 06:44:46 +02:00
fd206de263 add logging for performed db operations 2016-04-28 06:32:51 +02:00
e936f1c60f fixed typos in readme 2016-04-27 21:41:47 +02:00
a7df0aebee Merge branch 'add_vehicles' into 'master'
Add vehicles



See merge request !5
2016-04-27 07:24:59 +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
3ec2e4648d Merge branch 'user_handling' into 'master'
User handling



See merge request !4
2016-04-23 17:35:10 +02:00
267c59cbb3 adds create and delete vehicle 2016-04-23 17:11:43 +02:00
d19b0a5858 adds edit vehicle name 2016-04-23 11:20:39 +02:00
729fee51e9 Merge branch 'user_handling' into add_vehicles
Conflicts:
	app/main.py
2016-04-21 21:52:58 +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
baca41619d first iteration of vehicles 2016-04-19 06:47:10 +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