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

172 Commits

Author SHA1 Message Date
Joachim Lusiardi 47e81c7517 start implementing a proxy layer for the API of creativecommons.tankerkoenig.de 2017-10-30 06:49:56 +01:00
Joachim Lusiardi af6f271b29 Merge branch 'development' into 'master' 
Development

See merge request !30
 2016-11-15 21:42:08 +01:00
Joachim Lusiardi c9b1a1b095 Merge branch 'special_costs' into 'development' 
Special costs

See merge request !29
 2016-11-15 21:33:10 +01:00
Joachim Lusiardi 2e4c815a10 Add of db update script 2016-11-15 21:31:37 +01:00
Joachim Lusiardi 5859763a14 Fixed deprecation warning for Form 2016-11-06 18:53:13 +01:00
Joachim Lusiardi 6e665b9f2f finished handling of services 2016-11-06 13:22:54 +01:00
Joachim Lusiardi 60a1b307e4 changes to beautify the generated markdown 2016-11-06 13:14:28 +01:00
Joachim Lusiardi 3f458937d9 adds markdown filter 2016-11-06 13:14:03 +01:00
Joachim Lusiardi bceb9181ee sorting for events 2016-11-01 19:48:24 +01:00
Joachim Lusiardi 086c643365 fixed shadowing warning 2016-11-01 19:48:08 +01:00
Joachim Lusiardi d8c6a0a59b splitted routes into package 2016-11-01 18:01:52 +01:00
Joachim Lusiardi 43d9fc412e moved forms to extra package 2016-11-01 16:36:28 +01:00
Joachim Lusiardi 71412bf487 integrate services into rollerverbrauch 2016-11-01 11:19:26 +01:00
Joachim Lusiardi dd11419305 add the crud forms for services 2016-11-01 11:18:40 +01:00
Joachim Lusiardi d132dc72de Add Entitiy for the Service Object 2016-11-01 11:17:54 +01:00
Joachim Lusiardi 43fa41aace Add input type TextAreaField 
adds a possibility to add longer texts in the style of
rollerverbrauch
 2016-11-01 11:16:13 +01:00
Joachim Lusiardi b8a6f69090 add gitattributes to handle line ending settings and expose ports on docker compose 2016-08-28 15:45:08 +02:00
Joachim Lusiardi bb7c2780e8 Merge branch '11_Redirect_to_edit_vehicle_page_if_no_consumable_is_configured' into 'development' 
11 redirect to edit vehicle page if no consumable is configured



See merge request !28
 2016-08-28 14:01:37 +02:00
Joachim Lusiardi 088d1f24a0 add redirect if vehicle is not configured and flash messages 2016-08-16 13:21:54 +02:00
Joachim Lusiardi 87b3b02f3e add sqlite files to gitignore 2016-08-07 13:19:26 +02:00
Joachim Lusiardi c8a9404bf6 fixed use of os.environ 2016-08-07 13:18:39 +02:00
Joachim Lusiardi 4acf36112c add ids to pitstop elements 2016-08-07 13:18:04 +02:00
Joachim Lusiardi 4b73699750 Added ids to important elements 2016-08-06 10:59:20 +02:00
Joachim Lusiardi d393f19b47 Fixed wrong text 2016-08-06 10:59:03 +02:00
Joachim Lusiardi 44b92e58b5 use config variable to identify admin account while it is created 2016-08-03 08:13:39 +02:00
Joachim Lusiardi 1e7db29de9 add config variable to identify admin account while it is created 2016-08-03 08:12:06 +02:00
Joachim Lusiardi 938a7fc140 Removed dependency to mysql for testing 2016-08-03 08:09:58 +02:00
Joachim Lusiardi 49a45ba8a4 Merge branch 'development' into 'selenium_tests' 
Sync Development to selenium tests



See merge request !27
 2016-07-30 09:23:14 +02:00
Joachim Lusiardi adf51c85f2 Merge branch 'development' into 'master' 
Development

Fixes:
 * wrong date preselected when creation a pitstop
 * creation of new vehicle

See merge request !26
 2016-07-29 21:50:52 +02:00
Joachim Lusiardi 48d7c108f1 Merge branch '9-creation-of-new-vehicle-fails' into 'development' 
Resolve "Creation of new vehicle fails"

Closes #9

See merge request !25
 2016-07-29 21:12:30 +02:00
Joachim Lusiardi 7129e676e2 Fixed issue 9 2016-07-29 21:10:58 +02:00
Joachim Lusiardi aaa94f08fa Merge branch 'issue_8_wrong_date_on_creating_new_pitstop' into 'development' 
fix issue 8



See merge request !24
 2016-07-29 21:02:43 +02:00
Joachim Lusiardi 92fb25c1c1 fix issue 8 2016-07-25 18:54:27 +02:00
Joachim Lusiardi 5fa710149d Merge branch 'development' into 'master' 
Merge preparation for Esther



See merge request !23
 2016-07-24 11:26:34 +02:00
Joachim Lusiardi c815c2b09a Merge branch 'style_consumable_selection' into 'development' 
Style consumable selection



See merge request !22
 2016-07-23 13:14:05 +02:00
Joachim Lusiardi 529f9a6c64 Fixed problem with preselected values 2016-07-23 13:09:38 +02:00
Joachim Lusiardi bebccf0a36 Merge branch 'issue_7_really_delete_pitstop_page_does_not_show_all_information' into 'development' 
Fix issue with missing information on pitstop delete page



See merge request !21
 2016-07-21 19:14:45 +02:00
Joachim Lusiardi 89ebab29c4 Merge branch 'issue_6_pitstop_is_not_editable' into 'development' 
Fixed the edit function



See merge request !20
 2016-07-21 19:14:21 +02:00
Joachim Lusiardi a4ecae4700 Fix issue with missing information on pitstop delete page 2016-07-21 19:11:32 +02:00
Joachim Lusiardi 88f88591a9 Fixed the edit function 2016-07-21 19:03:04 +02:00
Joachim Lusiardi 473c2a4f5b Slight style improvement 2016-07-18 21:30:06 +02:00
Joachim Lusiardi bcc0541be3 Merge branch 'development' into selenium_tests 2016-07-17 10:09:01 +02:00
Joachim Lusiardi fd685c316d Update README.md 2016-07-17 10:06:19 +02:00
Joachim Lusiardi 112ed38dbd fixed SQL Error with MySQL 5.7.12 2016-07-17 10:03:56 +02:00
Joachim Lusiardi 2f737c1715 fixed DB URL 2016-07-17 10:02:41 +02:00
Joachim Lusiardi 5a447763d0 Merge branch 'development' into 'master' 
Merge branch 'development' into 'master'

Merge preparation for  Danielle

This adds the following features:
 * Add accounting for additional consumable materials (#5)
 * Add cost field to pit stop (#4)
 * Make last pit stop editable / deletable (#3)

See merge request !19
 2016-07-17 09:40:54 +02:00
Joachim Lusiardi cfb9dfabc0 Merge branch 'issue_5_more_consumable_material' into development 
Conflicts:
	app/__init__.py
 2016-07-17 09:22:38 +02:00
Joachim Lusiardi c0f6ef7b4f Merge branch 'pycharm' into 'development' 
Fixed project structure for pycharm



See merge request !16
 2016-07-17 08:10:04 +02:00
Joachim Lusiardi fdb8993ac3 Merge branch 'issue_5_more_consumable_material' into pycharm 
Conflicts:
	app/__init__.py
	app/rollerverbrauch/templates/createPitStopForm.html
	app/rollerverbrauch/templates/newPitStopForm.html
	app/rollerverbrauch/templates/selectVehice.html
	app/rollerverbrauch/templates/selectVehicle.html
	app/templates/newPitStopForm.html
	app/templates/selectVehice.html
 2016-07-16 19:29:25 +02:00
Joachim Lusiardi 1f5cb6b1fa Fixed issue with status on non-logged in index page 2016-07-16 13:29:32 +02:00