Commit Graph

Select branches

Hide Pull Requests

fix_links

live

main

master

prepare2022

remove_plan_pitstop_feature

sort_vehicles_by_last_entry

sort_vehicles_by_last_entry_2

update_dependencies

#10

#11

#12

#13

#5

#6

#7

Agathe

Beatrice

Cathrine

Danielle

Esther

Freckles

Gillian

Henni

Ingvar

Jody

Kilian

Laura

intermediate_fixes_live

Mono Color

• 7129e676e2 Fixed issue 9 jlusiardi 2016-07-29 21:10:58 +02:00
• aaa94f08fa Merge branch 'issue_8_wrong_date_on_creating_new_pitstop' into 'development' jlusiardi 2016-07-29 21:02:43 +02:00
• 92fb25c1c1 fix issue 8 jlusiardi 2016-07-25 18:54:27 +02:00
• 5fa710149d Merge branch 'development' into 'master' Esther jlusiardi 2016-07-24 11:26:34 +02:00
• c815c2b09a Merge branch 'style_consumable_selection' into 'development' jlusiardi 2016-07-23 13:14:05 +02:00
• 529f9a6c64 Fixed problem with preselected values jlusiardi 2016-07-23 13:09:38 +02:00
• bebccf0a36 Merge branch 'issue_7_really_delete_pitstop_page_does_not_show_all_information' into 'development' jlusiardi 2016-07-21 19:14:45 +02:00
• 89ebab29c4 Merge branch 'issue_6_pitstop_is_not_editable' into 'development' jlusiardi 2016-07-21 19:14:21 +02:00
• a4ecae4700 Fix issue with missing information on pitstop delete page jlusiardi 2016-07-21 19:11:32 +02:00
• 88f88591a9 Fixed the edit function jlusiardi 2016-07-21 19:03:04 +02:00
• 473c2a4f5b Slight style improvement jlusiardi 2016-07-18 21:30:06 +02:00
• bcc0541be3 Merge branch 'development' into selenium_tests jlusiardi 2016-07-17 10:09:01 +02:00
• fd685c316d Update README.md Danielle jlusiardi 2016-07-17 10:06:19 +02:00
• 112ed38dbd fixed SQL Error with MySQL 5.7.12 jlusiardi 2016-07-17 10:03:56 +02:00
• 2f737c1715 fixed DB URL jlusiardi 2016-07-17 10:02:41 +02:00
• 5a447763d0 Merge branch 'development' into 'master' jlusiardi 2016-07-17 09:40:54 +02:00
• cfb9dfabc0 Merge branch 'issue_5_more_consumable_material' into development jlusiardi 2016-07-17 09:22:38 +02:00
• c0f6ef7b4f Merge branch 'pycharm' into 'development' jlusiardi 2016-07-17 08:10:04 +02:00
• fdb8993ac3 Merge branch 'issue_5_more_consumable_material' into pycharm jlusiardi 2016-07-16 19:29:25 +02:00
• 1f5cb6b1fa Fixed issue with status on non-logged in index page jlusiardi 2016-07-16 13:29:32 +02:00
• 2a524ffdbf Merge branch 'issue_5_more_consumable_material' into 'development' jlusiardi 2016-07-16 12:12:43 +02:00
• 1516ac2c51 db update script and some fixes jlusiardi 2016-07-16 12:07:01 +02:00
• aa9fda93c0 statistics 3rd jlusiardi 2016-07-11 22:15:23 +02:00
• ca5bd9bb02 statistics 2nd step jlusiardi 2016-07-11 06:59:34 +02:00
• 4ea42a7efd first step for statistics jlusiardi 2016-07-10 13:40:49 +02:00
• 43e3f9c98b . jlusiardi 2016-07-04 20:19:59 +02:00
• 738bcb9f89 Fixed project structure for pycharm jlusiardi 2016-07-03 19:29:30 +02:00
• af5d4ae6b3 cann add pitstops for selected vehicles / consumables jlusiardi 2016-06-29 22:50:01 +02:00
• 907d0435d1 consumables for vehicles can be edited jlusiardi 2016-06-28 23:33:24 +02:00
• fe4236eead renamed template for create a pitstop jlusiardi 2016-06-28 21:35:04 +02:00
• a0be122186 reworked the crud funtions for vehicles jlusiardi 2016-06-27 22:09:42 +02:00
• fa4126be66 adds update & delete for consumables jlusiardi 2016-06-27 21:35:00 +02:00
• 60f2e9f4e4 adds form to create a consumable jlusiardi 2016-06-27 20:08:49 +02:00
• 5e24b9779e makes the name of a consumable unique jlusiardi 2016-06-27 19:48:04 +02:00
• 90639a757d Merge branch 'development' into issue_5_more_consumable_material jlusiardi 2016-06-26 08:27:14 +02:00
• 820063837d Merge branch 'issue_4_add_cost_field' into development jlusiardi 2016-06-26 08:26:33 +02:00
• f2623cf6e9 bugfix for creating first pitstop of a vehicle jlusiardi 2016-06-26 08:25:53 +02:00
• 1072142a1b adds consumables to database jlusiardi 2016-06-26 08:19:28 +02:00
• 56757f29a1 Merge branch 'issue_3_last_stop_editable' into 'development' jlusiardi 2016-06-24 07:17:00 +02:00
• 9d41c39ae7 adds edit feature for last pitstop jlusiardi 2016-06-24 07:15:24 +02:00
• 6f7716abc6 adds delete feature for last pitstop jlusiardi 2016-06-22 22:48:27 +02:00
• 6d26ceeae8 Merge branch 'issue_4_add_cost_field' into 'development' jlusiardi 2016-06-22 21:01:46 +02:00
• 5b69a82e05 adds tracking of costs jlusiardi 2016-06-21 21:06:41 +02:00
• f82cf425fd Merge branch 'development' into 'master' Cathrine jlusiardi 2016-05-28 20:47:26 +02:00
• 936fbf30f6 worked on tests jlusiardi 2016-05-28 18:59:23 +02:00
• 7696fb870c Merge branch 'docker_compose' into 'development' jlusiardi 2016-05-28 17:13:22 +02:00
• 3f8f30f5d1 improved tests jlusiardi 2016-05-27 11:33:15 +02:00
• cc414092a3 Adds first steps towards auto tests jlusiardi 2016-05-27 03:24:44 +02:00
• 63ff5845e2 added demo config jlusiardi 2016-05-26 13:54:51 +02:00
• 10494a03a9 first version for docker-compose jlusiardi 2016-05-26 12:08:24 +02:00
• 2176579baa Merge branch 'implement_delete_account' into 'development' jlusiardi 2016-05-25 09:41:15 +02:00
• da7c40c78b Merge branch 'index_page' into implement_delete_account jlusiardi 2016-05-25 09:40:20 +02:00
• 00579eb542 Merge branch 'index_page' into implement_delete_account jlusiardi 2016-05-24 23:56:12 +02:00
• ef55b4e479 First step jlusiardi 2016-05-24 23:55:58 +02:00
• a6c5abfd88 Merge branch 'index_page' into 'development' jlusiardi 2016-05-24 07:02:33 +02:00
• 293ff50809 Some more UI changes jlusiardi 2016-05-24 06:49:39 +02:00
• 873a28aa28 ui redesign jlusiardi 2016-05-22 11:47:46 +02:00
• 1c4d73da43 Adds start page for unauthed visitors jlusiardi 2016-05-18 08:19:11 +02:00
• 7eef2b6cee Adds start page for unauthed visitors jlusiardi 2016-05-18 08:17:53 +02:00
• 227dc79e6b Merge branch 'issue_1' into 'development' jlusiardi 2016-05-16 18:49:39 +02:00
• 19b1e3b7ae Handle vehicle name uniqueness jlusiardi 2016-05-16 18:46:24 +02:00
• c5305caf36 switched to configurable db Beatrice jlusiardi 2016-05-05 15:06:29 +02:00
• e1e5fe7725 Little Improvements jlusiardi 2016-05-03 22:21:57 +02:00
• 471f1415d9 Removed print jlusiardi 2016-05-02 08:03:24 +02:00
• 99df28a015 Merge branch 'add_charts' into 'master' jlusiardi 2016-05-02 08:02:33 +02:00
• 6b861903af add consumption chart jlusiardi 2016-05-02 07:59:31 +02:00
• 706f30e2e2 switched off drop representation jlusiardi 2016-05-02 07:59:14 +02:00
• cc7d2620e8 Worked on charts Joachim Lusiardi 2016-05-02 06:42:43 +02:00
• 161cc16498 continued work ok charts jlusiardi 2016-04-30 06:41:59 +02:00
• ef976299dc Fix PEP8 error jlusiardi 2016-04-28 22:33:14 +02:00
• 60293d6a27 Demo Chart jlusiardi 2016-04-28 07:53:53 +02:00
• 1e5b63d068 Merge branch 'add_app_step_log' into 'master' jlusiardi 2016-04-28 07:11:10 +02:00
• 13a5b07df2 fixed variable name jlusiardi 2016-04-28 07:10:44 +02:00
• 662e5b5b63 Merge branch 'add_app_step_log' into 'master' jlusiardi 2016-04-28 06:44:46 +02:00
• fd206de263 add logging for performed db operations jlusiardi 2016-04-28 06:32:51 +02:00
• e936f1c60f fixed typos in readme jlusiardi 2016-04-27 21:41:47 +02:00
• a7df0aebee Merge branch 'add_vehicles' into 'master' jlusiardi 2016-04-27 07:24:59 +02:00
• 3e2d62b28f improved design of the form elements jlusiardi 2016-04-27 07:23:28 +02:00
• ca7166f731 fixed stats jlusiardi 2016-04-25 22:28:35 +02:00
• 34905921d9 fixes display of last pitstops jlusiardi 2016-04-25 07:23:01 +02:00
• 038e255b56 can add pitstops to vehicles nows jlusiardi 2016-04-24 14:09:41 +02:00
• 3709eddabb prevents the deletion of vehicles of other users jlusiardi 2016-04-24 12:42:07 +02:00
• c941e1bccf finished modules merge jlusiardi 2016-04-23 23:24:25 +02:00
• 7bc5422687 Merge branch 'create_modules' into add_vehicles jlusiardi 2016-04-23 23:22:44 +02:00
• 0d8ae0cd18 introduces modules jlusiardi 2016-04-23 23:08:39 +02:00
• 3ec2e4648d Merge branch 'user_handling' into 'master' jlusiardi 2016-04-23 17:35:10 +02:00
• 267c59cbb3 adds create and delete vehicle jlusiardi 2016-04-23 17:11:43 +02:00
• d19b0a5858 adds edit vehicle name jlusiardi 2016-04-23 11:20:39 +02:00
• 729fee51e9 Merge branch 'user_handling' into add_vehicles jlusiardi 2016-04-21 21:52:58 +02:00
• 4261a9bb0b reworked git ignore file jlusiardi 2016-04-21 08:12:12 +02:00
• 0303be7945 more user handling features of flask-security activated jlusiardi 2016-04-21 08:11:57 +02:00
• 01798e9548 adds admin page jlusiardi 2016-04-19 22:41:40 +02:00
• 9eb7ec7c8a switched to environment variable for config file lookup jlusiardi 2016-04-19 21:09:15 +02:00
• 344db8d998 add example config file jlusiardi 2016-04-19 08:19:31 +02:00
• 1240a3c64b Users are allowed to register now jlusiardi 2016-04-19 07:39:17 +02:00
• baca41619d first iteration of vehicles jlusiardi 2016-04-19 06:47:10 +02:00
• 2e0fc3b772 Merge branch 'master' into user_handling jlusiardi 2016-04-18 21:43:01 +02:00
• 1d449cb0ab Merge branch 'master' of code.nerd2nerd.org:n0ob/rollerverbrauch jlusiardi 2016-04-18 21:01:31 +02:00
• 4c97bd86db Fixed date vs datetime jlusiardi 2016-04-18 20:58:20 +02:00
• 8057c59329 Merge branch 'wtforms' into 'master' jlusiardi 2016-04-18 20:35:58 +02:00