giavaphi
|
a519393fc7
|
small change garden plant description
|
2022-12-11 16:23:05 +01:00 |
|
giavaphi
|
2dd8cffda2
|
delete unused imports
|
2022-12-11 16:06:16 +01:00 |
|
giavaphi
|
3f51adcbd0
|
show screenshots in tutorial
|
2022-12-11 16:04:28 +01:00 |
|
giavaphi
|
4acd328286
|
Merge pull request #87 from schrom01/feature_tutorial-screenshots_M3
added screenshot pngs (whoops)
|
2022-12-11 15:29:36 +01:00 |
schrom01
|
6aeda395c3
|
Javadocs and code cleanup
|
2022-12-11 14:58:15 +01:00 |
|
schrom01
|
7741569659
|
Javadocs and code cleanup
|
2022-12-11 14:57:59 +01:00 |
|
schrom01
|
27b8d1754e
|
Javadocs and code cleanup
|
2022-12-11 14:25:57 +01:00 |
David Guler
|
06c4c47e44
|
added screenshot pngs
|
2022-12-11 09:23:53 +01:00 |
|
giavaphi
|
dc0830120f
|
small fixes
|
2022-12-11 07:59:34 +01:00 |
|
giavaphi
|
39bff805ac
|
small fixes
|
2022-12-11 07:44:03 +01:00 |
|
giavaphi
|
3ebbb0e0e3
|
small fixes
|
2022-12-11 07:19:06 +01:00 |
|
Roman Schenk
|
8a2119028c
|
Merge pull request #86 from schrom01/fix_tasklist_filteringPastTasks
Fix tasklist filtering past tasks
|
2022-12-10 14:00:24 +01:00 |
|
giavaphi
|
083d934472
|
Merge pull request #85 from schrom01/feature_weather
#23 bugfix testclass WeatherGradenTaskPlannerTest and bugfix Task and…
|
2022-12-10 13:58:26 +01:00 |
|
schrom01
|
1b096035a7
|
Merge branch 'dev' into fix_tasklist_filteringPastTasks
|
2022-12-10 13:54:42 +01:00 |
|
schrom01
|
0074d43364
|
fixed problem "showing task multiple times in in schedule"
|
2022-12-10 13:52:33 +01:00 |
Gian-Andrea Hutter
|
3bda390708
|
#23 bugfix testclass WeatherGradenTaskPlannerTest and bugfix Task and WeatherGradenTaskPlanner
|
2022-12-10 13:47:54 +01:00 |
|
Roman Schenk
|
c6952aba55
|
Merge pull request #81 from schrom01/feature_updaeTaskListViewOnUpdate_M3
show all tasks in scheduler
|
2022-12-10 13:41:04 +01:00 |
|
Roman Schenk
|
807a9017ad
|
Merge pull request #82 from schrom01/fix_tasklist_filteringPastTasks
Fix tasklist filtering past tasks
|
2022-12-10 13:40:55 +01:00 |
|
David Guler
|
fb21797040
|
added screenshots to tutorial
|
2022-12-10 13:22:40 +01:00 |
|
schrom01
|
5f7d690875
|
fixed not showing past tasks
|
2022-12-09 21:27:13 +01:00 |
|
giavaphi
|
96dc0ad827
|
fix show all tasks
|
2022-12-09 19:38:22 +01:00 |
|
David Guler
|
b3c7dd67e8
|
fix: remove "done" field from json serialisation
|
2022-12-09 15:27:21 +01:00 |
|
giavaphi
|
59c5d4be5a
|
Merge pull request #80 from schrom01/feature_guiOverhaul_M3
css style update
|
2022-12-09 14:20:02 +01:00 |
|
giavaphi
|
035f5d7fcd
|
Merge pull request #79 from schrom01/feature_updaeTaskListViewOnUpdate_M3
update tasks with subscription from JsonTaskList
|
2022-12-09 14:18:56 +01:00 |
|
giavaphi
|
4d2057d0df
|
fix update scheduler
|
2022-12-09 14:16:12 +01:00 |
|
gulerdav
|
c9baf4dfb1
|
Merge branch 'dev' into feature_weather
|
2022-12-09 12:59:43 +01:00 |
|
giavaphi
|
f54b39b1f2
|
updated style
|
2022-12-09 06:59:37 +01:00 |
|
giavaphi
|
45035e565c
|
update tasks with subscription from JsonTaskList
|
2022-12-09 01:27:37 +01:00 |
|
Gian-Andrea Hutter
|
86386d8a91
|
#23 implemented test class for WeatherGradenTaskPlanner
|
2022-12-09 00:02:21 +01:00 |
|
David Guler
|
c7b23335b5
|
doc: javadoc for types
|
2022-12-05 15:26:10 +01:00 |
|
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
|
d119fd1331
|
Merge branch 'dev' into feature_weather
|
2022-12-05 11:40:53 +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 |
|
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 |
|
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 |