rollerverbrauch

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

15b7696dc2 Merge pull request 'main' (#13) from main into live Laura live jlusiardi 2024-05-26 11:11:54 +0200
69f077a0f5 Merge pull request 'sort vehicles by last activity' (#12) from sort_vehicles_by_last_entry_2 into main main #13 jlusiardi 2024-05-25 21:51:28 +0200
dfb07ae7ee sort vehicles by last activity #12 sort_vehicles_by_last_entry_2 Joachim Lusiardi 2024-05-25 17:53:51 +0200
4f01b4e368 third try sort_vehicles_by_last_entry Joachim Lusiardi 2024-05-25 17:26:09 +0200
be60601f26 second try Joachim Lusiardi 2024-05-25 13:15:16 +0200
24c0b4c215 first try Joachim Lusiardi 2024-05-25 13:12:23 +0200
208cb497aa remove the plan pitstop feature Co-authored-by: Joachim Lusiardi <joachim@lusiardi.de> Co-committed-by: Joachim Lusiardi <joachim@lusiardi.de> Joachim Lusiardi 2024-05-22 11:50:43 +0200
72f4a9f49d remove more code #11 remove_plan_pitstop_feature Joachim Lusiardi 2024-05-22 11:37:53 +0200
0791a23d8c fix warning about relationship confilicts Joachim Lusiardi 2024-05-22 09:53:57 +0200
80264f1d02 remove more tankerkönig references Joachim Lusiardi 2024-05-22 08:40:19 +0200
a6aab66f55 fix code Joachim Lusiardi 2024-05-22 08:35:26 +0200
7443f69fea remove filling stations code Joachim Lusiardi 2024-05-22 08:31:44 +0200
2ce0b3a34a remove more stuff Joachim Lusiardi 2024-05-21 21:03:53 +0200
fc1a64ac0c remove filling station selector Joachim Lusiardi 2024-05-21 20:58:41 +0200
06653d53b2 remove link in header Joachim Lusiardi 2024-05-21 20:54:09 +0200
b539361ca7 Merge pull request 'Fix links to imprint and datenschutzerklärung' (#10) from fix_links into main jlusiardi 2024-05-22 08:52:44 +0200
091bfcd4ca Fix links to imprint and datenschutzerklärung #10 fix_links Joachim Lusiardi 2024-05-22 08:50:13 +0200
b72704348c update dependencies update_dependencies Joachim Lusiardi 2024-05-22 07:34:39 +0200
cdde09eee9 remove more stuff Joachim Lusiardi 2024-05-21 21:03:53 +0200
ec132b3e7a remove filling station selector Joachim Lusiardi 2024-05-21 20:58:41 +0200
b8f532d5c2 remove link in header Joachim Lusiardi 2024-05-21 20:54:09 +0200
0f7c36a804 pin werkzeug to version 2.2.2 to prevent incompatibilities prepare2022 jlusiardi 2024-05-17 10:43:58 +0200
3bfc2fc182 pin versions intermediate_fixes_live Joachim Lusiardi 2023-05-08 20:50:35 +0200
802af2418a remove limitter Joachim Lusiardi 2023-04-17 21:25:02 +0200
cd9fc4755e handle pitstops without costs properly jlusiardi 2022-05-13 16:48:08 +0200
158c419747 Merge pull request 'Zeige Preisentwicklung von Consumables' (#7) from PR_7 into prepare2022 jlusiardi 2022-05-13 16:32:16 +0200
79e5fdf56b Zeige Preisentwicklung von Consumables #7 Patrick Kilian 2022-05-12 17:27:51 -0600
a9338805e2 add wsgi stuff jlusiardi 2021-12-21 18:22:00 +0000
7f82a288da update db conf in production jlusiardi 2021-12-21 16:23:15 +0000
8728d3028b update db conf in production jlusiardi 2021-12-21 16:21:00 +0000
bc7e1591bd fix sorting for regular costs master Joachim Lusiardi 2021-06-23 08:29:35 +0200
673b671ab8 fix date of service Joachim Lusiardi 2021-06-22 21:49:32 +0200
578b2c15d8 bugfix: could not create service Joachim Lusiardi 2021-06-22 21:39:49 +0200
5cd06db1b6 Merge pull request 'vehicles can now be deactivated' (#6) from vehicles_can_be_deactivated into master Kilian jlusiardi 2021-06-20 06:49:33 +0000
3035006225 vehicles can now be deactivated #6 Joachim Lusiardi 2021-06-20 08:43:46 +0200
3d0bb8c83f Merge pull request 'regular_costs' (#5) from regular_costs into master Jody jlusiardi 2021-06-18 18:20:12 +0000
42356137c4 first shot #5 Joachim Lusiardi 2021-06-17 18:28:19 +0200
4196111529 adapt general request limits Joachim Lusiardi 2021-05-31 21:23:12 +0200
7797d6c91e add mail validator package Joachim Lusiardi 2021-05-08 19:54:05 +0200
cbc34a02e7 changed base image Joachim Lusiardi 2021-05-08 19:32:01 +0200
6497d4677f Fixed a bug with editing services / pitstops Joachim Lusiardi 2018-08-17 07:15:27 +0200
1d767d65a6 all pit stops can now be edited and deleted Joachim Lusiardi 2018-08-16 18:33:09 +0200
ae6dfa8ae6 Fix bug with description on services Joachim Lusiardi 2018-08-16 06:58:11 +0200
346723ae2d Makes each service/pitstop deletable Joachim Lusiardi 2018-08-15 21:46:31 +0200
6397d050ae services and pitstops each now respect their data on creation Joachim Lusiardi 2018-08-15 21:45:22 +0200
bf4bb607d5 Introduces ordering for services Joachim Lusiardi 2018-08-15 21:39:04 +0200
b3cb88e870 fix issue with creating the first ever pitstop for vehicle Joachim Lusiardi 2018-08-11 19:38:51 +0200
889a3e6476 changes dev config to store sqlite file in data volume Joachim Lusiardi 2018-08-11 18:58:25 +0200
3a2b25d3bd fixes issue with first pitstop for a vehicle Joachim Lusiardi 2018-08-11 18:57:33 +0200
13090d2735 Updates create pitstop form Joachim Lusiardi 2018-08-11 14:53:08 +0200
25705562ad Displays informative messages on litre amount Joachim Lusiardi 2018-08-11 14:13:03 +0200
1f2e33bec4 Adds check to verify the proper order of pitstops Joachim Lusiardi 2018-08-11 14:11:09 +0200
c42a667ca4 Introduces ordering for pitstops Joachim Lusiardi 2018-08-11 13:15:33 +0200
879669b4f7 Updates os version to debian 9 Joachim Lusiardi 2018-08-11 13:05:51 +0200
5a961d096b add tooltips to buttons for filling stations Joachim Lusiardi 2018-08-10 20:15:46 +0200
d9812bcb06 add links to imprint and dsgvo declaration Ingvar Joachim Lusiardi 2018-05-09 12:41:40 +0200
8b78dbe5b7 add DEBUG = False to default config Henni Joachim Lusiardi 2017-11-25 11:12:16 +0100
95a7e56a32 load openlayers via https Joachim Lusiardi 2017-11-25 11:11:55 +0100
9eb4d5ada0 fixup! preparation commit for henni Joachim Lusiardi 2017-11-24 09:08:37 +0100
f7cb273254 preparation commit for henni Joachim Lusiardi 2017-11-24 09:08:04 +0100
543d3e1658 react to closed stations Joachim Lusiardi 2017-11-12 22:50:25 +0100
9427ed50ad add page to plan a pitstop Joachim Lusiardi 2017-11-12 15:38:32 +0100
28990f27fa moved static files to separate directories Joachim Lusiardi 2017-11-12 15:34:49 +0100
d55fd3d9f6 Consumables can now be linked to the tankerkoenig api Joachim Lusiardi 2017-11-12 10:17:36 +0100
e9bb7986f4 moves routes for filling stations to extra file Joachim Lusiardi 2017-11-12 09:44:51 +0100
eaacd3f42e adds functionality to handle favourit filling stations Joachim Lusiardi 2017-11-10 10:38:15 +0100
8a99e4a616 adds icons & logos Joachim Lusiardi 2017-11-10 10:37:11 +0100
028b52d12f Adds setting home in account Joachim Lusiardi 2017-11-07 22:33:14 +0100
958a9bdd9f DEBUG flag can now be set via config and environment Joachim Lusiardi 2017-11-07 22:31:31 +0100
b02938cafe Moves MySQL DB to production Joachim Lusiardi 2017-11-07 22:30:44 +0100
47e81c7517 start implementing a proxy layer for the API of creativecommons.tankerkoenig.de Joachim Lusiardi 2017-10-30 06:49:56 +0100
af6f271b29 Merge branch 'development' into 'master' Gillian Joachim Lusiardi 2016-11-15 21:42:08 +0100
c9b1a1b095 Merge branch 'special_costs' into 'development' Joachim Lusiardi 2016-11-15 21:33:10 +0100
2e4c815a10 Add of db update script Joachim Lusiardi 2016-11-15 21:31:37 +0100
5859763a14 Fixed deprecation warning for Form Joachim Lusiardi 2016-11-06 18:53:13 +0100
6e665b9f2f finished handling of services Joachim Lusiardi 2016-11-06 13:22:54 +0100
60a1b307e4 changes to beautify the generated markdown Joachim Lusiardi 2016-11-06 13:14:28 +0100
3f458937d9 adds markdown filter Joachim Lusiardi 2016-11-06 13:14:03 +0100
bceb9181ee sorting for events Joachim Lusiardi 2016-11-01 19:48:24 +0100
086c643365 fixed shadowing warning Joachim Lusiardi 2016-11-01 19:48:08 +0100
d8c6a0a59b splitted routes into package Joachim Lusiardi 2016-11-01 18:01:52 +0100
43d9fc412e moved forms to extra package Joachim Lusiardi 2016-11-01 16:36:28 +0100
71412bf487 integrate services into rollerverbrauch Joachim Lusiardi 2016-11-01 11:19:26 +0100
dd11419305 add the crud forms for services Joachim Lusiardi 2016-11-01 11:18:40 +0100
d132dc72de Add Entitiy for the Service Object Joachim Lusiardi 2016-11-01 11:17:54 +0100
43fa41aace Add input type TextAreaField Joachim Lusiardi 2016-11-01 11:16:13 +0100
b8a6f69090 add gitattributes to handle line ending settings and expose ports on docker compose Joachim Lusiardi 2016-08-28 15:45:08 +0200
bb7c2780e8 Merge branch '11_Redirect_to_edit_vehicle_page_if_no_consumable_is_configured' into 'development' Joachim Lusiardi 2016-08-28 14:01:37 +0200
088d1f24a0 add redirect if vehicle is not configured and flash messages Joachim Lusiardi 2016-08-16 13:21:54 +0200
87b3b02f3e add sqlite files to gitignore Joachim Lusiardi 2016-08-07 13:19:26 +0200
c8a9404bf6 fixed use of os.environ Joachim Lusiardi 2016-08-07 13:18:39 +0200
4acf36112c add ids to pitstop elements Joachim Lusiardi 2016-08-07 13:18:04 +0200
4b73699750 Added ids to important elements Joachim Lusiardi 2016-08-06 10:59:20 +0200
d393f19b47 Fixed wrong text Joachim Lusiardi 2016-08-06 10:59:03 +0200
44b92e58b5 use config variable to identify admin account while it is created Joachim Lusiardi 2016-08-03 08:13:39 +0200
1e7db29de9 add config variable to identify admin account while it is created Joachim Lusiardi 2016-08-03 08:12:06 +0200
938a7fc140 Removed dependency to mysql for testing Joachim Lusiardi 2016-08-03 08:09:58 +0200
49a45ba8a4 Merge branch 'development' into 'selenium_tests' Joachim Lusiardi 2016-07-30 09:23:14 +0200
adf51c85f2 Merge branch 'development' into 'master' Freckles Joachim Lusiardi 2016-07-29 21:50:52 +0200
48d7c108f1 Merge branch '9-creation-of-new-vehicle-fails' into 'development' Joachim Lusiardi 2016-07-29 21:12:30 +0200