jlusiardi
/
rollerverbrauch
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 12 Wiki Activity
95 Commits 9 Branches 13 Tags 728 KiB
Commit Graph

95 Commits

Author SHA1 Message Date
Joachim Lusiardi 7696fb870c Merge branch 'docker_compose' into 'development' 
Docker compose



See merge request !12
 2016-05-28 17:13:22 +02:00
Joachim Lusiardi 63ff5845e2 added demo config 2016-05-26 13:54:51 +02:00
Joachim Lusiardi 10494a03a9 first version for docker-compose 2016-05-26 12:08:24 +02:00
Joachim Lusiardi 2176579baa Merge branch 'implement_delete_account' into 'development' 
Implement delete account



See merge request !11
 2016-05-25 09:41:15 +02:00
Joachim Lusiardi da7c40c78b Merge branch 'index_page' into implement_delete_account 2016-05-25 09:40:20 +02:00
Joachim Lusiardi 00579eb542 Merge branch 'index_page' into implement_delete_account 2016-05-24 23:56:12 +02:00
Joachim Lusiardi ef55b4e479 First step 2016-05-24 23:55:58 +02:00
Joachim Lusiardi a6c5abfd88 Merge branch 'index_page' into 'development' 
Index page



See merge request !10
 2016-05-24 07:02:33 +02:00
Joachim Lusiardi 293ff50809 Some more UI changes 2016-05-24 06:49:39 +02:00
Joachim Lusiardi 873a28aa28 ui redesign 2016-05-22 11:47:46 +02:00
Joachim Lusiardi 1c4d73da43 Adds start page for unauthed visitors 2016-05-18 08:19:11 +02:00
Joachim Lusiardi 7eef2b6cee Adds start page for unauthed visitors 2016-05-18 08:17:53 +02:00
Joachim Lusiardi 227dc79e6b Merge branch 'issue_1' into 'development' 
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.

See merge request !9
 2016-05-16 18:49:39 +02:00
Joachim Lusiardi 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
Joachim Lusiardi c5305caf36 switched to configurable db 2016-05-05 15:06:29 +02:00
Joachim Lusiardi 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
Joachim Lusiardi 471f1415d9 Removed print 2016-05-02 08:03:24 +02:00
Joachim Lusiardi 99df28a015 Merge branch 'add_charts' into 'master' 
Add charts



See merge request !8
 2016-05-02 08:02:33 +02:00
Joachim Lusiardi 6b861903af add consumption chart 2016-05-02 07:59:31 +02:00
Joachim Lusiardi 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
Joachim Lusiardi 161cc16498 continued work ok charts 2016-04-30 06:41:59 +02:00
Joachim Lusiardi ef976299dc Fix PEP8 error 2016-04-28 22:33:14 +02:00
Joachim Lusiardi 60293d6a27 Demo Chart 2016-04-28 07:53:53 +02:00
Joachim Lusiardi 1e5b63d068 Merge branch 'add_app_step_log' into 'master' 
fixed variable name



See merge request !7
 2016-04-28 07:11:10 +02:00
Joachim Lusiardi 13a5b07df2 fixed variable name 2016-04-28 07:10:44 +02:00
Joachim Lusiardi 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
Joachim Lusiardi fd206de263 add logging for performed db operations 2016-04-28 06:32:51 +02:00
Joachim Lusiardi e936f1c60f fixed typos in readme 2016-04-27 21:41:47 +02:00
Joachim Lusiardi a7df0aebee Merge branch 'add_vehicles' into 'master' 
Add vehicles



See merge request !5
 2016-04-27 07:24:59 +02:00
Joachim Lusiardi 3e2d62b28f improved design of the form elements 2016-04-27 07:23:28 +02:00
Joachim Lusiardi ca7166f731 fixed stats 2016-04-25 22:28:35 +02:00
Joachim Lusiardi 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
Joachim Lusiardi 038e255b56 can add pitstops to vehicles nows 2016-04-24 14:09:41 +02:00
Joachim Lusiardi 3709eddabb prevents the deletion of vehicles of other users 2016-04-24 12:42:07 +02:00
Joachim Lusiardi c941e1bccf finished modules merge 2016-04-23 23:24:25 +02:00
Joachim Lusiardi 7bc5422687 Merge branch 'create_modules' into add_vehicles 
Conflicts:
	app/main.py
 2016-04-23 23:22:44 +02:00
Joachim Lusiardi 0d8ae0cd18 introduces modules 2016-04-23 23:08:39 +02:00
Joachim Lusiardi 3ec2e4648d Merge branch 'user_handling' into 'master' 
User handling



See merge request !4
 2016-04-23 17:35:10 +02:00
Joachim Lusiardi 267c59cbb3 adds create and delete vehicle 2016-04-23 17:11:43 +02:00
Joachim Lusiardi d19b0a5858 adds edit vehicle name 2016-04-23 11:20:39 +02:00
Joachim Lusiardi 729fee51e9 Merge branch 'user_handling' into add_vehicles 
Conflicts:
	app/main.py
 2016-04-21 21:52:58 +02:00
Joachim Lusiardi 4261a9bb0b reworked git ignore file 2016-04-21 08:12:12 +02:00
Joachim Lusiardi 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
Joachim Lusiardi 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
Joachim Lusiardi 9eb7ec7c8a switched to environment variable for config file lookup 2016-04-19 21:09:15 +02:00
Joachim Lusiardi 344db8d998 add example config file 2016-04-19 08:19:31 +02:00
Joachim Lusiardi 1240a3c64b Users are allowed to register now 
This includes sending a welcome email.
 2016-04-19 07:39:17 +02:00
Joachim Lusiardi baca41619d first iteration of vehicles 2016-04-19 06:47:10 +02:00
Joachim Lusiardi 2e0fc3b772 Merge branch 'master' into user_handling 
Conflicts:
	app/main.py
	app/requirements.txt
 2016-04-18 21:43:01 +02:00