aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop'HEADv3.0masterTharre2018-06-20100-2383/+4332
|\
| * Bump version to 3.0developTharre2018-06-201-1/+1
| * Merge branch 'develop' of https://reset.inso.tuwien.ac.at/redmine/proj_ss18_s...Felix Kehrer2018-06-201-67/+67
| |\
| | * Merge remote-tracking branch 'origin/develop' into developMartin Weick2018-06-202-1/+4
| | |\
| | * | edit Testdata #28864Martin Weick2018-06-201-67/+67
| * | | Handle validation errors differently from other Exceptions #28864Felix Kehrer2018-06-201-4/+13
| | |/ | |/|
| * | Speed up user interface by only updating operation list when changes could ha...Felix Kehrer2018-06-202-1/+4
| |/
| * Show validation error message (as changed during Jour Fixe)Felix Kehrer2018-06-201-3/+2
| * Replace English road & employee names with Austrian ones [#28864]Dominic Rogetzer2018-06-191-278/+278
| * Set default registration start- & end time [#25963]Dominic Rogetzer2018-06-191-13/+24
| * Fixup the contextmenu handling for remove #25963Tharre2018-06-192-34/+9
| * Added search to archive window [#25963]Viktoria Pundy2018-06-192-4/+80
| * Implement and remove registrations #25963Tharre2018-06-193-9/+45
| * Display registrations in archive which are in timeframe only [#25963]Dominic Rogetzer2018-06-193-15/+36
| * Fix operationDaoTests due to commit 824e8cb [#25963]Dominic Rogetzer2018-06-192-6/+6
| * Set status of vehicles to 'ZUM_BERUFUNGSORT' when creating op [#25963]Dominic Rogetzer2018-06-191-1/+8
| * Fix names of vehicles in test-data [#25963]Dominic Rogetzer2018-06-196-17/+19
| * Add missing RegistrationDatabaseDao [#25963]Dominic Rogetzer2018-06-191-3/+5
| * Fix versioning problem where wrong cars showed up in op-detail [#25963]Dominic Rogetzer2018-06-193-9/+12
| * Change versioning in Operation and Registration [#25963]Dominic Rogetzer2018-06-194-13/+33
| * Change versioning in RegistrationDatabaseDAO [#25963]Dominic Rogetzer2018-06-192-35/+79
| * Fixup OperationDao to convert versionTharre2018-06-191-24/+24
| * Only update when window becomes visible again, greatly speeding up opening ti...Felix Kehrer2018-06-191-1/+1
| * Comment out unnecessary reset #28864Felix Kehrer2018-06-191-1/+1
| * Comment out unnecessary reset #28864Felix Kehrer2018-06-181-1/+1
| * Only call reset when needed, and then only once instead of twice #28864Felix Kehrer2018-06-181-2/+1
| * RequestVehicles GUI list seperation #25953Tharre2018-06-182-5/+30
| * Sort imports after renameTharre2018-06-1835-82/+82
| * Reuse images in EmployeeListItemController [#25963]Dominic Rogetzer2018-06-181-7/+9
| * Rename 'einsatzverwaltung' to 'missioncontrol' + remove TODO [#25963]Dominic Rogetzer2018-06-1864-243/+241
| * edit Testdata #28617Martin Weick2018-06-182-10/+10
| * Fix list.Andreas Weninger2018-06-181-1/+1
| * Add PopulateDB for testingTharre2018-06-181-0/+20
| * UI Changes to match UI Document. Coloring, Scrolling.Andreas Weninger2018-06-183-137/+58
| * create Testdata #28617Martin Weick2018-06-181-0/+792
| * Small adjustment for size of active Operation list [#25963]Viktoria Pundy2018-06-181-1/+1
| * Fixed a bug where window of active operation would not close [#27300]Viktoria Pundy2018-06-181-0/+2
| * Add requestVehicle button OperationDetails #24981Tharre2018-06-187-6/+53
| * Remove unused code [#25963]Dominic Rogetzer2018-06-172-7/+0
| * Fix merged code to use showService..() insteadTharre2018-06-171-6/+1
| * Fix employee&vehicle-dao-tests to use correct alert headers [#25963]Dominic Rogetzer2018-06-173-10/+16
| * Use specific helper methods for alerts in CreateNewEmployeeCtrl [#25963]Dominic Rogetzer2018-06-171-15/+8
| * Use specific helper methods for alerts in CreateOperationCtrl [#25963]Dominic Rogetzer2018-06-171-22/+18
| * Use helper methods for alerts in DetailArchiveOperationCtrl [#25963]Dominic Rogetzer2018-06-171-11/+4
| * Use helper methods for showing alerts in CreateCarController [#25963]Dominic Rogetzer2018-06-171-29/+14
| * Use helper methods for showing alerts in RegistrationWindowCtrl [#25963]Dominic Rogetzer2018-06-171-31/+12
| * Use specific helper methods for alerts in OperationDetailsCtrl [#25963]Dominic Rogetzer2018-06-171-21/+12
| * Add showSuccessAlertAndWait method in Helper [#25963]Dominic Rogetzer2018-06-171-0/+5
| * Use helper method to display errors in ArchiveOperationCtrl [#25963]Dominic Rogetzer2018-06-171-16/+6
| * Create methods for displaying validation- and service errors [#25963]Dominic Rogetzer2018-06-171-0/+11