gulerdav
							
						 | 
						
							
							
							
							
							
								
							
							
								6c00b7f182
								
							
						 | 
						
							
							
								
								Merge pull request #41 from schrom01/feature_plantList_M2
							
							
							
							
							
							
							
							fixed Method getFilteredPlantListByString 
							
						 | 
						
							2022-10-31 08:01:43 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								98ff259d95
								
							
						 | 
						
							
							
								
								fixed Method getFilteredPlantListByString for case if SearchString is empty.
							
							
							
							
							
						 | 
						
							2022-10-30 10:38:46 +01:00 | 
						
					
				
					
						
							
							
								 
								gulerdav
							
						 | 
						
							
							
							
							
							
								
							
							
								f452b73233
								
							
						 | 
						
							
							
								
								Merge pull request #40 from schrom01/feature_plantList_M2
							
							
							
							
							
							
							
							Feature plant list m2 
							
						 | 
						
							2022-10-30 10:36:07 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								4e794a8a93
								
							
						 | 
						
							
							
								
								implemented Methods and tests:
							
							
							
							
							
							
							
							getFilteredPlantListByHarvestSaison
getFilteredPlantListByPlantingSaison
#12 
							
						 | 
						
							2022-10-30 10:31:09 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								3e586093ba
								
							
						 | 
						
							
							
								
								implemented Method getFilteredPlantListByString in PlantListModel
							
							
							
							
							
						 | 
						
							2022-10-30 09:32:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								246fed7826
								
							
						 | 
						
							
							
								
								Merge pull request #39 from schrom01/feature_json-plant-db_M2
							
							
							
							
							
							
							
							#36 Added images to Plant database 
							
						 | 
						
							2022-10-29 11:36:14 +02:00 | 
						
					
				
					
						
							
							
								 
								David Guler
							
						 | 
						
							
							
							
							
							
								
							
							
								bfbda8d753
								
							
						 | 
						
							
							
								
								#36 Added images to Plant database
							
							
							
							
							
						 | 
						
							2022-10-29 09:44:02 +02:00 | 
						
					
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 | 
						
							
							
							
							
							
								
							
							
								bd2aa60128
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2
							
							
							
							
							
							
							
							# Conflicts:
#	build.gradle 
							
						 | 
						
							2022-10-28 11:52:49 +02:00 | 
						
					
				
					
						
							
							
								 
								gulerdav
							
						 | 
						
							
							
							
							
							
								
							
							
								1e14a07ef8
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into feature_json-gardenplan_M2
							
							
							
							
							
						 | 
						
							2022-10-28 11:43:45 +02:00 | 
						
					
				
					
						
							
							
								 
								Gian-Andrea Hutter
							
						 | 
						
							
							
							
							
							
								
							
							
								63f0501397
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into feature_json-task-db_M2
							
							
							
							
							
						 | 
						
							2022-10-25 18:15:26 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								4e15a706fb
								
							
						 | 
						
							
							
								
								code cleanup
							
							
							
							
							
						 | 
						
							2022-10-24 21:34:19 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								d686469336
								
							
						 | 
						
							
							
								
								Created Tests for PlantListModel
							
							
							
							
							
							
							
							#15 
							
						 | 
						
							2022-10-24 21:30:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Elias Csomor
							
						 | 
						
							
							
							
							
							
								
							
							
								aceb6aa1e6
								
							
						 | 
						
							
							
								
								first tests and a typo corrected
							
							
							
							
							
						 | 
						
							2022-10-24 14:54:49 +02:00 | 
						
					
				
					
						
							
							
								 
								Elias Csomor
							
						 | 
						
							
							
							
							
							
								
							
							
								af0e73c007
								
							
						 | 
						
							
							
								
								Prepare for tests
							
							
							
							
							
						 | 
						
							2022-10-24 14:20:59 +02:00 |