ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
186 Commits 20 Branches 0 Tags 1.2 MiB
Commit Graph

186 Commits

Author SHA1 Message Date
Roman Schenk 9f745b3198 Merge pull request #54 from PM2-IT21bWIN-ruiz-mach-krea/testing 
Testing
 2022-05-13 23:03:37 +02:00
Andrin Fassbind 4db2c582e2 merge conflict 2022-05-13 23:03:15 +02:00
Roman Schenk 4392fabc38 Merge branch 'main' into testing 2022-05-13 22:59:35 +02:00
Andrin Fassbind a8a2a0a463 create FactoryTest 
merged
 2022-05-13 22:56:24 +02:00
Roman Schenk caa21c8aa0 Merge pull request #53 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs 
Logging and docs added in several classes #27 #28
 2022-05-13 22:54:03 +02:00
schrom01 7114097601 fixed merge problem. 2022-05-13 22:53:49 +02:00
Andrin Fassbind 418f583955 Merge remote-tracking branch 'origin/logging_and_docs' into testing 
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LogConfiguration.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/AlertNewSchedule.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
 2022-05-13 22:53:30 +02:00
Roman Schenk bbaf70f9af Merge branch 'main' into logging_and_docs 2022-05-13 22:52:07 +02:00
Leonardo Brandenberger 56030d0baa Merge remote-tracking branch 'origin/logging_and_docs' into logging_and_docs 2022-05-13 22:43:07 +02:00
Leonardo Brandenberger 52b79ed501 PlacesFormularController JavaDoc and Logger 2022-05-13 22:42:51 +02:00
schrom01 92360ad607 finished javadocs in Factory.java 2022-05-13 22:41:42 +02:00
schrom01 30ae77a11d java docs in Factory.java 2022-05-13 22:35:05 +02:00
Andrin Fassbind 7f8de3e8f1 create FactoryTest 2022-05-13 22:35:01 +02:00
Andrin Fassbind df3fc5df2d create TeamTest 2022-05-13 22:22:39 +02:00
Leonardo Brandenberger f94572c1fe Fixed small logger error 2022-05-13 22:13:50 +02:00
Leonardo Brandenberger 023cb5a99f Added MainWindow and MainWindowController javadoc and logger 2022-05-13 22:11:03 +02:00
Leonardo Brandenberger 784cbfdd76 Added MainWindow and MainWindowController javadoc and logger 2022-05-13 22:10:41 +02:00
schrom01 aee3549669 uploaded ClassDiagram.png 2022-05-13 22:08:20 +02:00
Andrin Fassbind 2e314497db create PlaceTest 2022-05-13 22:06:58 +02:00
Andrin Fassbind fd06e24e21 create PersonTest 2022-05-13 21:54:21 +02:00
Andrin Fassbind 2ef4c3f584 create PlayerTest 2022-05-13 21:46:31 +02:00
Leonardo Brandenberger c7d9fd0908 FileIOTest Java Doc and also started with Factory and Factory Decorator 2022-05-13 21:15:31 +02:00
Andrin Fassbind 135ec7e8d5 sync TournamentTest with new changes 
create GameTest
 2022-05-13 21:11:33 +02:00
Andrin Fassbind c8eff00e33 Merge remote-tracking branch 'origin/main' into testing 2022-05-13 20:54:58 +02:00
fassband 9e599014ec Merge pull request #52 from PM2-IT21bWIN-ruiz-mach-krea/language_Dev 
Language dev
 2022-05-13 20:54:30 +02:00
Andrin Fassbind ac68af3638 extend dictionary 2022-05-13 20:53:33 +02:00
Andrin Fassbind c086cf18a4 test game 2022-05-13 19:41:20 +02:00
Andrin Fassbind d530d89db4 edit layout 2022-05-13 19:20:07 +02:00
Andrin Fassbind ddae1e297f solve bug PlacesFormularController id name not valid 2022-05-13 19:18:51 +02:00
Leonardo Brandenberger 459cd1bec8 Code Cleanup and Java Doc and logging 2022-05-13 19:09:51 +02:00
Andrin Fassbind 1b22506047 solve bug game teilnehmername 2022-05-13 19:00:08 +02:00
Andrin Fassbind dc54eaa872 Merge remote-tracking branch 'origin/main' into language_Dev 2022-05-13 18:57:39 +02:00
Andrin Fassbind c4f0a5335d Create Language Change 2022-05-13 18:57:27 +02:00
Leonardo Brandenberger b49ca9172d Code Cleanup in fileio, invalidnameexception and observers 2022-05-13 18:36:08 +02:00
Leonardo Brandenberger 6de4978145 Java Doc, Logging and Cleanup in Log Configuration. 2022-05-13 18:21:52 +02:00
Leonardo Brandenberger 3c3c6c8510 Merge pull request #51 from PM2-IT21bWIN-ruiz-mach-krea/develop_footer 
Develop footer
 2022-05-13 17:52:44 +02:00
schrom01 a1b73e22ca removed "äöü" from error messages. 2022-05-13 17:51:04 +02:00
Roman Schenk 2327573581 Merge pull request #50 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs 
Logging and docs added to classes  Person, Place and Player  #27 #28
 2022-05-13 17:49:39 +02:00
Leonardo Brandenberger 7fd058a528 CodeCleanup in Player, Tournament, Place, Person, Participant and Team 2022-05-13 17:48:42 +02:00
Leonardo Brandenberger f38b8aff16 CodeCleanup in Player, Tournament and Participant 2022-05-13 17:16:33 +02:00
schrom01 11d6ca1852 changed error Message numberOfParticipants. 2022-05-13 17:10:32 +02:00
Leonardo Brandenberger 67003ad772 CodeCleanup in Player, Tournament and Participant 2022-05-13 17:03:23 +02:00
schrom01 a78d1d9de7 changed error Message numberOfParticipants. 2022-05-13 16:51:17 +02:00
schrom01 5f6193d8b2 Merge branch 'main' into develop_footer 
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
 2022-05-13 16:50:35 +02:00
Leonardo Brandenberger e0a9d963f6 CodeCleanup in Participant, Person and Team 2022-05-13 16:43:33 +02:00
Roman Schenk f8d12dafa7 Merge branch 'main' into logging_and_docs 2022-05-13 16:39:36 +02:00
Leonardo Brandenberger 726410f677 Added Java Doc and Logger to Person 2022-05-13 16:12:55 +02:00
Roman Schenk 3d522dd13c Merge pull request #49 from PM2-IT21bWIN-ruiz-mach-krea/gameSchedule_Alert 
Create alert popup if user wants to create new game schedule
 2022-05-13 16:12:29 +02:00
Andrin Fassbind 7dea7919c5 AlertDelete shortened code 2022-05-13 16:12:06 +02:00
fassband f575bb94d3 Merge pull request #48 from PM2-IT21bWIN-ruiz-mach-krea/fixes_in_layout 
Fixes in layout
 2022-05-13 16:06:23 +02:00