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

Mono Color

• 521f3ae025 Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2 Gian-Andrea Hutter 2022-10-31 14:28:06 +01:00
• 52b4b1c01d Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2 Gian-Andrea Hutter 2022-10-31 13:47:38 +01:00
• 007fc81b22 added Method planTasksForCrop schrom01 2022-10-31 13:47:17 +01:00
• bc3ba43b7e Merge branch 'feature_json-task-db_M2' into feature_gardenplan-model_M2 Gian-Andrea Hutter 2022-10-31 13:23:02 +01:00
• 2e12c3f868 Merge remote-tracking branch 'origin/feature_json-task-db_M2' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-31 13:19:31 +01:00
• 29ad2fdae2 #17 Bug Mismatchexception fixed Gian-Andrea Hutter 2022-10-31 13:19:14 +01:00
• 7a6a0eb66f Merge pull request #45 from schrom01/feature_controllerPlantList_M2 giavaphiandGitHub Enterprise 2022-10-31 13:07:49 +01:00
• 3afeb8a22d Merge branch 'dev' into feature_controllerPlantList_M2 gulerdavandGitHub Enterprise 2022-10-31 13:05:49 +01:00
• 88f9bf7990 Merge pull request #44 from schrom01/feature_plantlist-gui_M2 gulerdavandGitHub Enterprise 2022-10-31 12:59:06 +01:00
• 5c6528a038 Update JsonTaskDatabaseTest.java Elias Csomor 2022-10-31 12:54:52 +01:00
• 5f35d99839 fixed merge conflict PlantsController giavaphi 2022-10-31 12:52:27 +01:00
• afac3ba855 #17 Serialization implemented Gian-Andrea Hutter 2022-10-31 12:45:24 +01:00
• a87f3da9d2 Merge branch 'feature_plantlist-gui_M2' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-31 12:43:43 +01:00
• d0cef1fe82 fixed problems with file Path #43 feature_plantlist-gui_M2 schrom01 2022-10-31 12:43:13 +01:00
• 6273b0e59a #27 implementation of task template with task generation Gian-Andrea Hutter 2022-10-31 12:24:54 +01:00
• 2510608117 Extended taskDb tests Elias Csomor 2022-10-31 11:55:20 +01:00
• 82eab6d5cd continue GardenPlan tests Elias Csomor 2022-10-31 11:21:45 +01:00
• 5411ac69ae initial GardenPlan tests Elias Csomor 2022-10-31 11:15:27 +01:00
• 146c43d5d9 extended tests for Zones Elias Csomor 2022-10-31 10:07:06 +01:00
• 7a060be84a case insensitive serarch, images David Guler 2022-10-31 10:06:17 +01:00
• 160880d4f5 removed useless quotes, corrected typo Elias Csomor 2022-10-31 09:42:39 +01:00
• 5b039eb762 #12 small changes and java doc giavaphi 2022-10-31 09:23:44 +01:00
• b79387abc2 Merge branch 'dev' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-31 08:40:52 +01:00
• 25057d34f0 created Class TaskListModel schrom01 2022-10-31 08:06:35 +01:00
• 6c00b7f182 Merge pull request #41 from schrom01/feature_plantList_M2 gulerdavandGitHub Enterprise 2022-10-31 08:01:43 +01:00
• 63d7eddff4 #27 first implemention of the Gardenplanmodel Gian-Andrea Hutter 2022-10-30 23:34:42 +01:00
• c83b8695ab #12 PlantsController filter list view giavaphi 2022-10-30 23:23:19 +01:00
• f22ef61d3c #42 bug resize window fix giavaphi 2022-10-30 18:06:18 +01:00
• 98ff259d95 fixed Method getFilteredPlantListByString for case if SearchString is empty. feature_plantList_M2 schrom01 2022-10-30 10:38:46 +01:00
• f452b73233 Merge pull request #40 from schrom01/feature_plantList_M2 gulerdavandGitHub Enterprise 2022-10-30 10:36:07 +01:00
• 4e794a8a93 implemented Methods and tests: getFilteredPlantListByHarvestSaison getFilteredPlantListByPlantingSaison #12 schrom01 2022-10-30 10:31:09 +01:00
• da7a31f512 java doc and readme update schrom01 2022-10-30 09:37:27 +01:00
• 3e586093ba implemented Method getFilteredPlantListByString in PlantListModel schrom01 2022-10-30 09:32:55 +01:00
• 691d2a6345 Merge pull request #38 from schrom01/feature_skeletonGUI_M2 Roman SchenkandGitHub Enterprise 2022-10-30 09:23:21 +01:00
• 246fed7826 Merge pull request #39 from schrom01/feature_json-plant-db_M2 Roman SchenkandGitHub Enterprise 2022-10-29 11:36:14 +02:00
• 5b860e0ff4 #10 doc: layer-diagram David Guler 2022-10-29 10:17:51 +02:00
• b6b5138e9f fix: adjust fxml-api version to remove warnings David Guler 2022-10-29 09:54:55 +02:00
• 554c560832 Merge pull request #37 from schrom01/feature_json-task-db_M2 gulerdavandGitHub Enterprise 2022-10-29 09:47:17 +02:00
• 8120071348 Merge branch 'dev' into feature_json-task-db_M2 gulerdavandGitHub Enterprise 2022-10-29 09:46:50 +02:00
• bfbda8d753 #36 Added images to Plant database David Guler 2022-10-29 09:44:02 +02:00
• 7fd18f3830 #16 create MainFXML with skeletal structure giavaphi 2022-10-28 15:36:33 +02:00
• 51e8f27a20 #17 implementation objectmapper writeFile Gian-Andrea Hutter 2022-10-28 12:24:55 +02:00
• bd2aa60128 Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-28 11:52:49 +02:00
• f5fcfa78f6 Merge pull request #35 from schrom01/feature_json-gardenplan_M2 Roman SchenkandGitHub Enterprise 2022-10-28 11:52:30 +02:00
• 1e14a07ef8 Merge branch 'dev' into feature_json-gardenplan_M2 gulerdavandGitHub Enterprise 2022-10-28 11:43:45 +02:00
• 629e64143b Fixed serialisation of cropId and startDate David Guler 2022-10-26 20:32:01 +02:00
• 63f0501397 Merge branch 'dev' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-25 18:15:26 +02:00
• 6c75fcd0ec #17 taskdb.json changed to the right variable types, JsonTaskDatabase.java fully implemented and documented Gian-Andrea Hutter 2022-10-25 18:11:29 +02:00
• 8fd57d91f2 Merge remote-tracking branch 'origin/feature_json-task-db_M2' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-25 10:11:02 +02:00
• 23d87f7a85 #17 taskdb.json changed to the right variable types, ad isIntimePeriode to , JasonTaskDatabase Gian-Andrea Hutter 2022-10-25 10:10:40 +02:00
• b851c11f7d Merge pull request #33 from schrom01/feature_plantList_M2 gulerdavandGitHub Enterprise 2022-10-24 21:40:30 +02:00
• 4e15a706fb code cleanup schrom01 2022-10-24 21:34:19 +02:00
• d686469336 Created Tests for PlantListModel #15 schrom01 2022-10-24 21:30:20 +02:00
• 72b0d029d5 #25 Initial implementation of the JsonGardenPlan David Guler 2022-10-24 19:19:45 +02:00
• fb237e47c0 added new HardinessZone for testing schrom01 2022-10-24 19:08:24 +02:00
• 9fa4762b9c Merge remote-tracking branch 'origin/feature_plantList_M2' into feature_plantList_M2 schrom01 2022-10-24 19:01:19 +02:00
• e5b5e1b88a adapted class PlantListModel to PlantDatabase #12 schrom01 2022-10-24 18:55:26 +02:00
• d1c5c58468 adapted class PlantListModel to PlantDatabase schrom01 2022-10-24 18:55:26 +02:00
• aceb6aa1e6 first tests and a typo corrected Elias Csomor 2022-10-24 14:54:49 +02:00
• af0e73c007 Prepare for tests Elias Csomor 2022-10-24 14:20:59 +02:00
• e550f5549a Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-24 13:54:43 +02:00
• 694da97cd6 #17 implementation JsonTaskDatabase.java, writeTasklistToFile Gian-Andrea Hutter 2022-10-24 13:54:28 +02:00
• a29f8c7db7 Added IdProvider David Guler 2022-10-24 13:42:31 +02:00
• 0ca381f8cc Merge branch 'dev' into feature_json-task-db_M2 Gian-Andrea Hutter 2022-10-24 12:53:09 +02:00
• f9149c48fd Merge branch 'dev' into feature_plantList_M2 schrom01 2022-10-24 12:51:52 +02:00
• e51da071bc updated method getFilteredPlantList schrom01 2022-10-24 12:44:11 +02:00
• 904041afc0 #17 implementation JsonTaskDatabase.java, gradle import for jackson Gian-Andrea Hutter 2022-10-24 12:43:50 +02:00
• 0d99ee219d #11 Merge pull request #32 from schrom01/feature_json-plant-db_M2 gulerdavandGitHub Enterprise 2022-10-24 12:41:18 +02:00
• 0d24bcc2ad Moved null-check to loading method David Guler 2022-10-24 12:32:28 +02:00
• 2c61cd3393 Implemented simple caching for JsonPlantDatabase David Guler 2022-10-23 11:11:52 +02:00
• 7355ce563f Added WateringCycle and Pest types David Guler 2022-10-23 09:54:56 +02:00
• 429ac16d98 filtering lifecycle based on hardiness-zone David Guler 2022-10-23 09:49:22 +02:00
• e228b9019d #17 implementation JsonTaskDatabase.java, gradle import for jackson Gian-Andrea Hutter 2022-10-22 11:52:06 +02:00
• a2008450e6 #17 implementation of an example task database Gian-Andrea Hutter 2022-10-21 21:18:29 +02:00
• 99e8f305e1 Merge pull request #31 from schrom01/feature_json-plant-db_M2 gulerdavandGitHub Enterprise 2022-10-21 12:20:06 +02:00
• bf4d56e759 removed test code David Guler 2022-10-21 12:16:15 +02:00
• 96b5dba36c #17 first version of tasks Gian-Andrea Hutter 2022-10-20 21:59:18 +02:00
• 6d13bede7a Minimum viable deserialization David Guler 2022-10-20 21:46:00 +02:00
• 5b0e472ec7 implemented Methods to sort and filter PlantList schrom01 2022-10-20 21:33:42 +02:00
• 7dd157b9d5 implemented Methods to sort and filter PlantList schrom01 2022-10-20 21:26:30 +02:00
• ceb448c1ff Update issue templates Roman SchenkandGitHub Enterprise 2022-10-20 20:05:31 +02:00
• 8c651aec2b Update issue templates Roman SchenkandGitHub Enterprise 2022-10-20 20:02:18 +02:00
• 56fac84e12 Merge pull request #29 from dev gulerdavandGitHub Enterprise 2022-10-18 15:24:11 +02:00
• 8b3a0c1570 Update issue templates Roman SchenkandGitHub Enterprise 2022-10-18 11:19:24 +02:00
• 516a185546 Update issue templates Roman SchenkandGitHub Enterprise 2022-10-18 11:18:36 +02:00
• 1e4dd07879 #4 upload documents from teams, as discussed Gian-Andrea Hutter 2022-10-17 17:14:50 +02:00
• 5f53bb86c6 #11 Very basic implementation with dummy data David Guler 2022-10-17 17:01:50 +02:00
• 9a29499c39 feat: GardenPlan types and interfaces David Guler 2022-10-14 21:15:19 +02:00
• 6d1fdd05ab feat: TaskDB types and interfaces David Guler 2022-10-14 21:08:34 +02:00
• 9ad62d72cc Update README.md gulerdavandGitHub Enterprise 2022-10-14 15:27:49 +02:00
• bd53d0644a feat: PlantDB types and interfaces David Guler 2022-10-14 15:16:27 +02:00
• 870bd18c0f Gradle Setup DavidRavine 2022-10-14 14:50:54 +02:00
• b947fce825 Update README.md huttegiaandGitHub Enterprise 2022-10-13 17:18:37 +02:00
• f566234873 directory structure Gian-Andrea Hutter 2022-10-13 17:02:14 +02:00
• 0aba4d3f8e directory structure Gian-Andrea Hutter 2022-10-13 17:01:04 +02:00
• 96d5ba338b doc: fleshed out class diagram DavidRavine 2022-10-12 15:51:26 +02:00
• e468f4680a doc: add plantdb erm & update class diagram draft DavidRavine 2022-10-09 10:27:40 +02:00
• 758b1bb07c created ClassDiagramDraft schrom01 2022-10-07 13:27:59 +02:00
• 8d47ee80ee Initial commit Roman SchenkandGitHub Enterprise 2022-10-07 12:45:13 +02:00