PM3-HS22-IT21b_WIN-Team1

Commit Graph

Select branches

Hide Pull Requests

dev

feature_cropsAndTaskGUI_M2

feature_guiOverhaul_M3

feature_plantList_M2

feature_plantlist-gui_M2

feature_taskList_m2

feature_tutorial-screenshots_M3

feature_tutorial_M3

feature_updaeTaskListViewOnUpdate_M3

feature_weather

fix_imageLoad_M3

fix_tasklist_filteringPastTasks

main

refactor_dependency-injection_M3

refactor_gui_M3

refactor_javadoc-and-apploader_M3

tests_and_fixes_M3

tests_extended_M3

#29

#30

#31

#32

#33

#34

#35

#37

#38

#39

#40

#41

#44

#45

#49

#50

#51

#55

#56

#57

#58

#59

#60

#61

#62

#64

#65

#66

#67

#68

#69

#70

#71

#72

#73

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#90

0.0.1-alpha1

1.0.0-beta1

6e98517013 Merge pull request #90 from schrom01/dev main 1.0.0-beta1 giavaphi 2022-12-11 17:53:11 +0100
a81c073407 updated README.md dev schrom01 2022-12-11 17:50:39 +0100
aa9c543624 Merge remote-tracking branch 'origin/dev' into dev schrom01 2022-12-11 17:49:44 +0100
95748c79b1 updated README.md schrom01 2022-12-11 17:49:20 +0100
01ddb38ccb Merge pull request #89 from schrom01/dev giavaphi 2022-12-11 17:15:50 +0100
3a50c2655d delete of unused todos giavaphi 2022-12-11 17:09:49 +0100
de01503598 Merge pull request #88 from schrom01/feature_weather giavaphi 2022-12-11 17:02:59 +0100
a8a693296e delete unused function giavaphi 2022-12-11 16:45:07 +0100
a519393fc7 small change garden plant description giavaphi 2022-12-11 16:23:05 +0100
2864c54c72 Merge branch 'dev' into feature_weather feature_weather Gian-Andrea Hutter 2022-12-11 16:16:34 +0100
a20edae4b8 #23 refactoring of the WeatherGradenTaskPlanner Gian-Andrea Hutter 2022-12-11 16:16:06 +0100
2dd8cffda2 delete unused imports giavaphi 2022-12-11 16:06:16 +0100
3f51adcbd0 show screenshots in tutorial giavaphi 2022-12-11 16:04:28 +0100
4acd328286 Merge pull request #87 from schrom01/feature_tutorial-screenshots_M3 giavaphi 2022-12-11 15:29:36 +0100
dbba4e2662 Merge branch 'dev' into feature_weather Gian-Andrea Hutter 2022-12-11 15:15:19 +0100
6aeda395c3 Javadocs and code cleanup schrom01 2022-12-11 14:58:15 +0100
7741569659 Javadocs and code cleanup schrom01 2022-12-11 14:57:59 +0100
27b8d1754e Javadocs and code cleanup schrom01 2022-12-11 14:25:57 +0100
06c4c47e44 added screenshot pngs feature_tutorial-screenshots_M3 David Guler 2022-12-11 09:23:53 +0100
dc0830120f small fixes giavaphi 2022-12-11 07:59:34 +0100
39bff805ac small fixes giavaphi 2022-12-11 07:44:03 +0100
3ebbb0e0e3 small fixes giavaphi 2022-12-11 07:19:06 +0100
8a2119028c Merge pull request #86 from schrom01/fix_tasklist_filteringPastTasks Roman Schenk 2022-12-10 14:00:24 +0100
083d934472 Merge pull request #85 from schrom01/feature_weather giavaphi 2022-12-10 13:58:26 +0100
1b096035a7 Merge branch 'dev' into fix_tasklist_filteringPastTasks fix_tasklist_filteringPastTasks schrom01 2022-12-10 13:54:42 +0100
0074d43364 fixed problem "showing task multiple times in in schedule" schrom01 2022-12-10 13:52:33 +0100
08d40d8b80 Merge branch 'dev' into feature_weather Gian-Andrea Hutter 2022-12-10 13:48:50 +0100
3bda390708 #23 bugfix testclass WeatherGradenTaskPlannerTest and bugfix Task and WeatherGradenTaskPlanner Gian-Andrea Hutter 2022-12-10 13:47:54 +0100
c6952aba55 Merge pull request #81 from schrom01/feature_updaeTaskListViewOnUpdate_M3 Roman Schenk 2022-12-10 13:41:04 +0100
807a9017ad Merge pull request #82 from schrom01/fix_tasklist_filteringPastTasks Roman Schenk 2022-12-10 13:40:55 +0100
c134025408 Merge pull request #83 from schrom01/tests_extended_M3 Roman Schenk 2022-12-10 13:40:46 +0100
1e95e0ff30 Merge pull request #84 from schrom01/feature_tutorial-screenshots_M3 Roman Schenk 2022-12-10 13:40:38 +0100
fb21797040 added screenshots to tutorial David Guler 2022-12-10 13:22:40 +0100
76197a19df extending tests and adding integration test tests_extended_M3 Elias Csomor 2022-12-10 12:48:06 +0100
5f7d690875 fixed not showing past tasks schrom01 2022-12-09 21:27:13 +0100
96dc0ad827 fix show all tasks feature_updaeTaskListViewOnUpdate_M3 giavaphi 2022-12-09 19:38:22 +0100
56020a7529 Setup Platform for runLater in GardenSchedule Elias Csomor 2022-12-09 17:35:41 +0100
5830ee5180 fixing execution and notification dates in test db Elias Csomor 2022-12-09 17:13:05 +0100
b3c7dd67e8 fix: remove "done" field from json serialisation David Guler 2022-12-09 15:27:14 +0100
59c5d4be5a Merge pull request #80 from schrom01/feature_guiOverhaul_M3 giavaphi 2022-12-09 14:20:02 +0100
035f5d7fcd Merge pull request #79 from schrom01/feature_updaeTaskListViewOnUpdate_M3 giavaphi 2022-12-09 14:18:56 +0100
4d2057d0df fix update scheduler giavaphi 2022-12-09 14:16:12 +0100
ccaff13df3 Merge pull request #78 from schrom01/feature_weather gulerdav 2022-12-09 12:59:53 +0100
c9baf4dfb1 Merge branch 'dev' into feature_weather gulerdav 2022-12-09 12:59:43 +0100
f54b39b1f2 updated style feature_guiOverhaul_M3 giavaphi 2022-12-09 06:59:37 +0100
45035e565c update tasks with subscription from JsonTaskList giavaphi 2022-12-09 01:27:37 +0100
00be979863 #23 implemented test class for WeatherGradenTaskPlanner Gian-Andrea Hutter 2022-12-09 00:08:32 +0100
86386d8a91 #23 implemented test class for WeatherGradenTaskPlanner Gian-Andrea Hutter 2022-12-09 00:02:21 +0100
c7b23335b5 doc: javadoc for types David Guler 2022-12-05 15:26:10 +0100
7c015d78f4 Merge pull request #76 from schrom01/feature_guiOverhaul_M3 gulerdav 2022-12-05 13:15:36 +0100
dd09fad581 Merge branch 'dev' into feature_guiOverhaul_M3 gulerdav 2022-12-05 13:08:47 +0100
952a6a16d2 Merge pull request #77 from schrom01/feature_weather gulerdav 2022-12-05 13:05:28 +0100
d119fd1331 Merge branch 'dev' into feature_weather Gian-Andrea Hutter 2022-12-05 11:40:53 +0100
28f76e7a04 #23 documentation Gian-Andrea Hutter 2022-12-05 11:40:09 +0100
0fa2b81427 #23 bugfix adjust task Gian-Andrea Hutter 2022-12-05 11:02:15 +0100
92ee656a5d Merge pull request #75 from schrom01/fix_imageLoad_M3 gulerdav 2022-12-05 10:59:41 +0100
d725367f4d JavaDoc for controller classes giavaphi 2022-12-05 01:56:15 +0100
0257dd9bf0 fxml files changes + first style giavaphi 2022-12-05 01:12:18 +0100
d0c6525d7a Merge remote-tracking branch 'origin/feature_weather' into feature_weather Gian-Andrea Hutter 2022-12-04 16:32:51 +0100
a29066ed05 #23 bugfix adjust task Gian-Andrea Hutter 2022-12-04 16:32:30 +0100
c64339c945 fixed image loading when app is packed as jar fix_imageLoad_M3 Elias Csomor 2022-12-02 12:04:51 +0100
564cecd4ff Merge remote-tracking branch 'origin/feature_weather' into feature_weather schrom01 2022-12-01 23:46:08 +0100
2f5440696f Cleanup of Class BackgroundTasks, added Logger schrom01 2022-12-01 23:45:53 +0100
5e42cae290 #23 bugfix adjust task Gian-Andrea Hutter 2022-11-29 21:55:42 +0100
028bc0240d Merged Notification Branch with Weather Branch schrom01 2022-11-29 12:25:54 +0100
8ecc14db91 Merged Notification Branch with Weather Branch schrom01 2022-11-29 12:19:45 +0100
c16f99aabc Merge remote-tracking branch 'origin/feature_weather' into feature_weather Gian-Andrea Hutter 2022-11-29 12:13:01 +0100
6ec0ccaeaa #23 bugfix GardenScheduleTest and PlantTest Gian-Andrea Hutter 2022-11-29 12:12:18 +0100
55f92f92bd Merged Notification Branch with Weather Branch schrom01 2022-11-29 12:12:16 +0100
fd28ca7cc2 Merged Notification Branch with Weather Branch schrom01 2022-11-29 11:55:49 +0100
1faf1c10de Merge branch 'feature_notification_m3' into feature_weather schrom01 2022-11-29 11:41:28 +0100
f43bfeebd2 #23 bugfix plantdb.json Gian-Andrea Hutter 2022-11-29 11:32:20 +0100
220d138185 fixed saving Task after editing schrom01 2022-11-28 19:31:08 +0100
aa87a23f7d Merge branch 'dev' into feature_weather Gian-Andrea Hutter 2022-11-28 13:54:47 +0100
eccb519bfb #23 watering task refactor Gian-Andrea Hutter 2022-11-28 13:53:47 +0100
21643e5d63 Merge pull request #70 from schrom01/tests_and_fixes_M3 giavaphi 2022-11-28 13:36:47 +0100
e9fbbf2f9f Merge pull request #73 from schrom01/feature_guiOverhaul_M3 giavaphi 2022-11-28 13:11:18 +0100
ce8bdaba7e Merge branch 'dev' into feature_guiOverhaul_M3 giavaphi 2022-11-28 13:10:50 +0100
7e5730a19f fix nullpointer exception check date garden schedule giavaphi 2022-11-28 13:09:59 +0100
ec42a6e75a fix nullpointer exception check date garden schedule giavaphi 2022-11-28 12:38:29 +0100
2452e42b72 Merge pull request #71 from schrom01/feature_guiOverhaul_M3 gulerdav 2022-11-28 11:58:26 +0100
3d36c85941 temp style css giavaphi 2022-11-28 11:57:28 +0100
84df4c07a1 temp style css giavaphi 2022-11-28 11:53:02 +0100
4ae9eec9f7 Merge pull request #72 from schrom01/refactor_javadoc-and-apploader_M3 giavaphi 2022-11-28 11:43:18 +0100
d0959f535b refactor: javadoc and dependencies in HashMap refactor_javadoc-and-apploader_M3 David Guler 2022-11-28 11:35:17 +0100
cae6f950ad #23 comments added Gian-Andrea Hutter 2022-11-28 10:20:00 +0100
fd184e1248 implemented Exception handling in EMailSender schrom01 2022-11-28 09:11:37 +0100
fbf1700c34 implemented EMailSender schrom01 2022-11-28 08:00:31 +0100
129a26e1a9 ui display task schedule giavaphi 2022-11-28 02:49:55 +0100
e9258fb238 fix of zero interval giavaphi 2022-11-28 00:50:41 +0100
233ce6b088 #23 add Task generation watertask Gian-Andrea Hutter 2022-11-27 23:42:29 +0100
6d24687f7b Merge remote-tracking branch 'origin/feature_guiOverhaul_M3' into feature_guiOverhaul_M3 giavaphi 2022-11-27 21:56:37 +0100
2ec37114de quick fix task end date can not be null + test data giavaphi 2022-11-27 21:56:12 +0100
aedcfe2be9 update json files for crop and task with ui giavaphi 2022-11-27 20:38:38 +0100
b3f839e4a3 update json files for crop and task with ui giavaphi 2022-11-27 20:38:38 +0100
4072308ae6 #23 Implementation of Gardenschedule for wateringtask adjustment Gian-Andrea Hutter 2022-11-27 10:13:11 +0100
1dc2ad1774 Extended testcoverage for classes tests_and_fixes_M3 Elias Csomor 2022-11-26 14:30:16 +0100
e75ececedb Refactored AllSEASONS to ALLSEASONS and added tests Elias Csomor 2022-11-26 14:29:49 +0100
560cea2ff9 Extended coverage for tests Elias Csomor 2022-11-26 12:49:42 +0100
65b15b6a4c Merge remote-tracking branch 'origin/feature_weather' into feature_weather Gian-Andrea Hutter 2022-11-26 11:59:06 +0100