gulerdav
|
dd09fad581
|
Merge branch 'dev' into feature_guiOverhaul_M3
|
2022-12-05 13:08:47 +01:00 |
|
gulerdav
|
952a6a16d2
|
Merge pull request #77 from schrom01/feature_weather
Feature Background Tasks (weather and Notifications)
|
2022-12-05 13:05:28 +01:00 |
Gian-Andrea Hutter
|
28f76e7a04
|
#23 documentation
|
2022-12-05 11:40:09 +01:00 |
|
Gian-Andrea Hutter
|
0fa2b81427
|
#23 bugfix adjust task
|
2022-12-05 11:02:15 +01:00 |
|
gulerdav
|
92ee656a5d
|
Merge pull request #75 from schrom01/fix_imageLoad_M3
fixed image loading when app is packed as jar
|
2022-12-05 10:59:41 +01:00 |
giavaphi
|
d725367f4d
|
JavaDoc for controller classes
|
2022-12-05 01:56:15 +01:00 |
|
giavaphi
|
0257dd9bf0
|
fxml files changes + first style
|
2022-12-05 01:12:18 +01:00 |
|
Gian-Andrea Hutter
|
d0c6525d7a
|
Merge remote-tracking branch 'origin/feature_weather' into feature_weather
|
2022-12-04 16:32:51 +01:00 |
|
Gian-Andrea Hutter
|
a29066ed05
|
#23 bugfix adjust task
|
2022-12-04 16:32:30 +01:00 |
Elias Csomor
|
c64339c945
|
fixed image loading when app is packed as jar
https://stackoverflow.com/questions/2308188/getresourceasstream-vs-fileinputstream
|
2022-12-02 12:04:51 +01:00 |
schrom01
|
564cecd4ff
|
Merge remote-tracking branch 'origin/feature_weather' into feature_weather
|
2022-12-01 23:46:08 +01:00 |
|
schrom01
|
2f5440696f
|
Cleanup of Class BackgroundTasks, added Logger
|
2022-12-01 23:45:53 +01:00 |
|
Gian-Andrea Hutter
|
5e42cae290
|
#23 bugfix adjust task
|
2022-11-29 21:55:42 +01:00 |
|
schrom01
|
028bc0240d
|
Merged Notification Branch with Weather Branch
|
2022-11-29 12:25:54 +01:00 |
|
schrom01
|
8ecc14db91
|
Merged Notification Branch with Weather Branch
|
2022-11-29 12:19:45 +01:00 |
|
Gian-Andrea Hutter
|
c16f99aabc
|
Merge remote-tracking branch 'origin/feature_weather' into feature_weather
|
2022-11-29 12:13:01 +01:00 |
|
Gian-Andrea Hutter
|
6ec0ccaeaa
|
#23 bugfix GardenScheduleTest and PlantTest
|
2022-11-29 12:12:18 +01:00 |
|
schrom01
|
55f92f92bd
|
Merged Notification Branch with Weather Branch
|
2022-11-29 12:12:16 +01:00 |
|
schrom01
|
fd28ca7cc2
|
Merged Notification Branch with Weather Branch
|
2022-11-29 11:55:49 +01:00 |
|
schrom01
|
1faf1c10de
|
Merge branch 'feature_notification_m3' into feature_weather
# Conflicts:
# src/main/java/ch/zhaw/gartenverwaltung/bootstrap/AppLoader.java
|
2022-11-29 11:41:28 +01:00 |
|
Gian-Andrea Hutter
|
f43bfeebd2
|
#23 bugfix plantdb.json
|
2022-11-29 11:32:20 +01:00 |
|
schrom01
|
220d138185
|
fixed saving Task after editing
|
2022-11-28 19:31:08 +01:00 |
|
Gian-Andrea Hutter
|
aa87a23f7d
|
Merge branch 'dev' into feature_weather
# Conflicts:
# src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
|
2022-11-28 13:54:47 +01:00 |
|
Gian-Andrea Hutter
|
eccb519bfb
|
#23 watering task refactor
|
2022-11-28 13:53:47 +01:00 |
|
giavaphi
|
21643e5d63
|
Merge pull request #70 from schrom01/tests_and_fixes_M3
Tests and fixes m3
|
2022-11-28 13:36:47 +01:00 |
|
giavaphi
|
e9fbbf2f9f
|
Merge pull request #73 from schrom01/feature_guiOverhaul_M3
fix nullpointer exception check date garden schedule
|
2022-11-28 13:11:18 +01:00 |
|
giavaphi
|
ce8bdaba7e
|
Merge branch 'dev' into feature_guiOverhaul_M3
|
2022-11-28 13:10:50 +01:00 |
|
giavaphi
|
7e5730a19f
|
fix nullpointer exception check date garden schedule
|
2022-11-28 13:09:59 +01:00 |
|
giavaphi
|
ec42a6e75a
|
fix nullpointer exception check date garden schedule
|
2022-11-28 12:38:29 +01:00 |
|
gulerdav
|
2452e42b72
|
Merge pull request #71 from schrom01/feature_guiOverhaul_M3
Feature_OverhaulGUI_Scheduler_M3
|
2022-11-28 11:58:26 +01:00 |
|
giavaphi
|
3d36c85941
|
temp style css
|
2022-11-28 11:57:28 +01:00 |
|
giavaphi
|
84df4c07a1
|
temp style css
|
2022-11-28 11:53:02 +01:00 |
|
giavaphi
|
4ae9eec9f7
|
Merge pull request #72 from schrom01/refactor_javadoc-and-apploader_M3
refactor: javadoc and dependencies in HashMap
|
2022-11-28 11:43:18 +01:00 |
|
David Guler
|
d0959f535b
|
refactor: javadoc and dependencies in HashMap
|
2022-11-28 11:35:17 +01:00 |
|
Gian-Andrea Hutter
|
cae6f950ad
|
#23 comments added
|
2022-11-28 10:20:00 +01:00 |
|
schrom01
|
fd184e1248
|
implemented Exception handling in EMailSender
|
2022-11-28 09:11:37 +01:00 |
|
schrom01
|
fbf1700c34
|
implemented EMailSender
|
2022-11-28 08:00:31 +01:00 |
|
giavaphi
|
129a26e1a9
|
ui display task schedule
|
2022-11-28 02:49:55 +01:00 |
|
giavaphi
|
e9258fb238
|
fix of zero interval
|
2022-11-28 00:50:41 +01:00 |
|
Gian-Andrea Hutter
|
233ce6b088
|
#23 add Task generation watertask
|
2022-11-27 23:42:29 +01:00 |
|
giavaphi
|
6d24687f7b
|
Merge remote-tracking branch 'origin/feature_guiOverhaul_M3' into feature_guiOverhaul_M3
|
2022-11-27 21:56:37 +01:00 |
|
giavaphi
|
2ec37114de
|
quick fix task end date can not be null + test data
|
2022-11-27 21:56:12 +01:00 |
|
giavaphi
|
aedcfe2be9
|
update json files for crop and task with ui
|
2022-11-27 20:39:37 +01:00 |
|
giavaphi
|
b3f839e4a3
|
update json files for crop and task with ui
|
2022-11-27 20:38:38 +01:00 |
|
Gian-Andrea Hutter
|
4072308ae6
|
#23 Implementation of Gardenschedule for wateringtask adjustment
|
2022-11-27 10:13:11 +01:00 |
|
Elias Csomor
|
1dc2ad1774
|
Extended testcoverage for classes
|
2022-11-26 14:30:16 +01:00 |
|
Elias Csomor
|
e75ececedb
|
Refactored AllSEASONS to ALLSEASONS and added tests
|
2022-11-26 14:29:49 +01:00 |
|
Elias Csomor
|
560cea2ff9
|
Extended coverage for tests
|
2022-11-26 12:49:42 +01:00 |
|
Gian-Andrea Hutter
|
65b15b6a4c
|
Merge remote-tracking branch 'origin/feature_weather' into feature_weather
|
2022-11-26 11:59:06 +01:00 |
|
Gian-Andrea Hutter
|
9424c8713f
|
Merge branch 'dev' into feature_weather
|
2022-11-26 11:57:34 +01:00 |