schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								c323ab5759
								
							
						 | 
						
							
							
								
								fixed Merging problem
							
							
							
							
							
						 | 
						
							2022-05-01 22:50:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								b2c23e158d
								
							
						 | 
						
							
							
								
								Merge pull request #16 from PM2-IT21bWIN-ruiz-mach-krea/FileIO
							
							
							
							
							
							
							
							FileIO completed including Java Doc and logging 
							
						 | 
						
							2022-05-01 22:47:33 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								2f111cf1e4
								
							
						 | 
						
							
							
								
								implemented functionality of PlacesFormular
							
							
							
							
							
						 | 
						
							2022-05-01 22:43:41 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								4ae7cd2e5a
								
							
						 | 
						
							
							
								
								Merge branch 'main' into FileIO
							
							
							
							
							
						 | 
						
							2022-05-01 22:42:02 +02:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								eb6d68e84f
								
							
						 | 
						
							
							
								
								FileIO completed including Java Doc and logging
							
							
							
							
							
						 | 
						
							2022-05-01 22:30:22 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								594299f3b2
								
							
						 | 
						
							
							
								
								Merge pull request #13 from PM2-IT21bWIN-ruiz-mach-krea/Participant_List
							
							
							
							
							
							
							
							Participant list 
							
						 | 
						
							2022-05-01 21:44:27 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								7d30c6e4e7
								
							
						 | 
						
							
							
								
								Merge branch 'main' into Participant_List
							
							
							
							
							
						 | 
						
							2022-05-01 21:44:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								b359acfab4
								
							
						 | 
						
							
							
								
								Merge pull request #14 from PM2-IT21bWIN-ruiz-mach-krea/GameSchedule
							
							
							
							
							
							
							
							Game schedule 
							
						 | 
						
							2022-05-01 21:36:16 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								0d482bfcac
								
							
						 | 
						
							
							
								
								implemented Functionality to save, edit and delete participants.
							
							
							
							
							
						 | 
						
							2022-05-01 21:26:32 +02:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								0db169a771
								
							
						 | 
						
							
							
								
								Added GameSchedule View
							
							
							
							
							
							
							
							when open tournament GameSchedule.fxml gets loaded 
							
						 | 
						
							2022-05-01 20:26:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								bd9dbef1de
								
							
						 | 
						
							
							
								
								Merge pull request #11 from PM2-IT21bWIN-ruiz-mach-krea/TournamentList
							
							
							
							
							
							
							
							Tournament list 
							
						 | 
						
							2022-05-01 18:45:02 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								90fa3a9183
								
							
						 | 
						
							
							
								
								changed position of button.
							
							
							
							
							
						 | 
						
							2022-05-01 18:06:25 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								4cb743a21a
								
							
						 | 
						
							
							
								
								implemented functionality to save participants also in file.
							
							
							
							
							
						 | 
						
							2022-05-01 17:00:09 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								ff6f2bd94e
								
							
						 | 
						
							
							
								
								created Methods to show and add Players.
							
							
							
							
							
						 | 
						
							2022-05-01 15:18:30 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								b09929da19
								
							
						 | 
						
							
							
								
								added Participant List to Tournament.java
							
							
							
							
							
						 | 
						
							2022-05-01 14:22:01 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								678060ecc0
								
							
						 | 
						
							
							
								
								extracted Method delete Tournament in TournamentDecorator.java
							
							
							
							
							
						 | 
						
							2022-05-01 13:46:20 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								61b943b091
								
							
						 | 
						
							
							
								
								extracted Method open Tournament to Class FactoryDecorator.java
							
							
							
							
							
						 | 
						
							2022-05-01 13:39:54 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								9f005281af
								
							
						 | 
						
							
							
								
								created Class TournamentDecorator.java
							
							
							
							
							
						 | 
						
							2022-05-01 13:10:20 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								50f98b4ac1
								
							
						 | 
						
							
							
								
								added Type checking in Tournament.java
							
							
							
							
							
						 | 
						
							2022-05-01 12:33:14 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								80005d214d
								
							
						 | 
						
							
							
								
								created Class AlertDelete.java
							
							
							
							
							
						 | 
						
							2022-05-01 12:19:22 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								58b1692181
								
							
						 | 
						
							
							
								
								implemented Button and Method deleteTournament in Tournament List
							
							
							
							
							
						 | 
						
							2022-05-01 11:27:54 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								a3bd207610
								
							
						 | 
						
							
							
								
								refactored toString Method of class TournamentFile
							
							
							
							
							
						 | 
						
							2022-05-01 11:17:18 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								5034203409
								
							
						 | 
						
							
							
								
								extracted Method tournamentExists to FileIO.java
							
							
							
							
							
						 | 
						
							2022-05-01 11:10:21 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								e79a38c696
								
							
						 | 
						
							
							
								
								Merge branch 'FileIO' into TournamentList
							
							
							
							
							
							
							
							# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java 
							
						 | 
						
							2022-05-01 10:56:22 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								672ad409ce
								
							
						 | 
						
							
							
								
								refactoring in FileIOTest.java
							
							
							
							
							
						 | 
						
							2022-05-01 10:54:21 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								e8e64d435c
								
							
						 | 
						
							
							
								
								added Method deleteTournament but not implemented yet in FileIO.java
							
							
							
							
							
							
							
							added Test Methods for deleteTournament. 
							
						 | 
						
							2022-05-01 10:49:29 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								171cf7ef4e
								
							
						 | 
						
							
							
								
								implemented functionality to add new Tournament
							
							
							
							
							
						 | 
						
							2022-05-01 10:27:21 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								fd2e775c94
								
							
						 | 
						
							
							
								
								cleanCode fixes.
							
							
							
							
							
						 | 
						
							2022-04-30 18:22:06 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								71d13314f4
								
							
						 | 
						
							
							
								
								Solved Problems with Filenames ParticipantFormularController.java and TournamentListController.java
							
							
							
							
							
						 | 
						
							2022-04-30 18:17:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								2ce93cbf9b
								
							
						 | 
						
							
							
								
								Merge pull request #8 from PM2-IT21bWIN-ruiz-mach-krea/fxml
							
							
							
							
							
							
							
							Fxml and Factory 
							
						 | 
						
							2022-04-30 18:09:54 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								6245e32f73
								
							
						 | 
						
							
							
								
								added pane to FXController.java
							
							
							
							
							
						 | 
						
							2022-04-30 18:03:11 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								a103174739
								
							
						 | 
						
							
							
								
								Delete app/build/tmp/compileJava directory
							
							
							
							
							
						 | 
						
							2022-04-30 18:01:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								563c70a078
								
							
						 | 
						
							
							
								
								Delete .idea directory
							
							
							
							
							
						 | 
						
							2022-04-30 17:59:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								f8bf63a1d9
								
							
						 | 
						
							
							
								
								Delete .gradle directory
							
							
							
							
							
						 | 
						
							2022-04-30 17:58:39 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								5660f85165
								
							
						 | 
						
							
							
								
								Delete .gradle directory
							
							
							
							
							
						 | 
						
							2022-04-30 17:57:29 +02:00 | 
						
					
				
					
						
							
							
								 
								Roman Schenk
							
						 | 
						
							
							
							
							
							
								
							
							
								c58fae060a
								
							
						 | 
						
							
							
								
								Delete .idea directory
							
							
							
							
							
						 | 
						
							2022-04-30 17:56:40 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								6d5dd700a0
								
							
						 | 
						
							
							
								
								implemented functionality to show existing Tournaments.
							
							
							
							
							
						 | 
						
							2022-04-30 17:09:01 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								cd0c9a4773
								
							
						 | 
						
							
							
								
								Merge branch 'FileIO' into fxml
							
							
							
							
							
							
							
							# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java 
							
						 | 
						
							2022-04-30 16:10:19 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								7af48449e0
								
							
						 | 
						
							
							
								
								created Abstract Class FXController.java
							
							
							
							
							
						 | 
						
							2022-04-29 17:30:26 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								9c7d62b260
								
							
						 | 
						
							
							
								
								created Class Factory and refactoring of MainWindow.java
							
							
							
							
							
						 | 
						
							2022-04-29 17:11:50 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								ca5b52541f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/fxml' into fxml
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore 
							
						 | 
						
							2022-04-29 16:18:58 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								56de1441d9
								
							
						 | 
						
							
							
								
								Merge branch 'main' into fxml
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore 
							
						 | 
						
							2022-04-29 16:18:18 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								4909bd0d7c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/FileIO' into FileIO
							
							
							
							
							
						 | 
						
							2022-04-29 16:10:50 +02:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								90f6855a15
								
							
						 | 
						
							
							
								
								changed Path Separator
							
							
							
							
							
						 | 
						
							2022-04-29 16:09:44 +02:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								2413e4f8e0
								
							
						 | 
						
							
							
								
								refactored GUI to be able to just switch between diffrent pane in center
							
							
							
							
							
							
							
							refactored dictionary hirarchy 
							
						 | 
						
							2022-04-29 12:27:22 +02:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								068dc44e89
								
							
						 | 
						
							
							
								
								started adding logging to FileIO
							
							
							
							
							
						 | 
						
							2022-04-29 11:52:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								89b7ac2268
								
							
						 | 
						
							
							
								
								created GUI Main and AddParticipant
							
							
							
							
							
						 | 
						
							2022-04-29 11:48:37 +02:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								0974af77b6
								
							
						 | 
						
							
							
								
								created GUI Main and AddParticipant
							
							
							
							
							
						 | 
						
							2022-04-29 11:48:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								3ec776e64f
								
							
						 | 
						
							
							
								
								created GUI Main and AddParticipant
							
							
							
							
							
						 | 
						
							2022-04-29 11:47:27 +02:00 | 
						
					
				
					
						
							
							
								 
								fassband
							
						 | 
						
							
							
							
							
							
								
							
							
								db21c12f37
								
							
						 | 
						
							
							
								
								Merge pull request #7 from PM2-IT21bWIN-ruiz-mach-krea/creation_of_simple_classes
							
							
							
							
							
							
							
							Creation of simple classes 
							
						 | 
						
							2022-04-29 10:41:39 +02:00 |