Commits · 03689f5d15ba104791c4962bb2c8d602b3316c52 · AlfaTrainingKurse / Java / Enigma

Dec 03, 2019
- Merge branch 'master' into 'master' · 03689f5d
  Dennis Eisold authored 5 years ago
```
NullPointer behoben

See merge request !103
```
  03689f5d
- NullPointer behoben · cee38f95
  Dennis Eisold authored 5 years ago
  
  cee38f95
- Merge branch 'master' into 'master' · 4c1cffd1
  Dennis Eisold authored 5 years ago
```
CheckComboBox Prüfungen

See merge request !102
```
  4c1cffd1
- WIP: CheckComboBox Prüfungen · de9ba158
  Dennis Eisold authored 5 years ago
  
  de9ba158
- Merge branch 'master' into 'master' · d95562eb
  Dennis Eisold authored 5 years ago
```
CheckComboBox Prüfungen

See merge request !101
```
  d95562eb
- WIP: CheckComboBox Prüfungen · 8e852ad0
  Dennis Eisold authored 5 years ago
  
  8e852ad0
- Merge branch 'master' into 'master' · 8e4fd9a5
  Dennis Eisold authored 5 years ago
```
CheckComboBoxen erstellen und befüllen

See merge request !100
```
  8e4fd9a5
- CheckComboBoxen erstellen und befüllen · 751a5ea0
  Dennis Eisold authored 5 years ago
  
  751a5ea0
- Merge branch 'master' into 'master' · bd275f80
  Dennis Eisold authored 5 years ago
```
CheckComboBoxTest

See merge request !99
```
  bd275f80
- CheckComboBoxTest · 4bcef6c7
  Uli Bähr authored 5 years ago
  
  4bcef6c7
- Merge branch 'master' into 'master' · ed07c2b0
  Dennis Eisold authored 5 years ago
```
Fehlermeldung Kenngruppe angepasst

See merge request !98
```
  ed07c2b0
- Fehlermeldung Kenngruppe angepasst · b86f504c
  Dennis Eisold authored 5 years ago
  
  b86f504c
- Merge branch 'master' into 'master' · 2b5c2890
  Dennis Eisold authored 5 years ago
```
Master

See merge request !97
```
  2b5c2890
- Vergessene dependency für ControllsFX Library · c7d60686
  Dennis Eisold authored 5 years ago
  
  c7d60686
- Merge branch 'master' into 'master' · 0fcd1db3
  Dennis Eisold authored 5 years ago
```
Nachrichten senden/empfangen in Threads, Progress indikator eingebaut

See merge request !96
```
  0fcd1db3
- Nachrichten senden/empfangen in Threads, Progress indikator eingebaut · 78729da5
  Dennis Eisold authored 5 years ago
```
Ladeproblem nach Kenngruppe behoben #19
```
  78729da5
- Nachrichten senden/empfangen in Threads, Progress indikator eingebaut · 99e4af8d
  Dennis Eisold authored 5 years ago
```
Ladeproblem nach Kenngruppe behoben #19
```
  99e4af8d
- Fehlermeldungen eingebaut · 2a98c110
  Dennis Eisold authored 5 years ago
  
  2a98c110
- Merge branch 'master' into 'master' · f86546f8
  Dennis Eisold authored 5 years ago
```
NullPointer Exception bei "empfangeNachricht" behoben.

See merge request !95
```
  f86546f8
- NullPointer Exception bei "empfangeNachricht" behoben. · 4541acf1
  Dennis Eisold authored 5 years ago
  
  4541acf1
- Merge branch 'master' into 'master' · 08263370
  Dennis Eisold authored 5 years ago
```
Fehler Klasse eingebaut, some fixes

See merge request !94
```
  08263370
- Fehler Klasse eingebaut, some fixes · ba930d8f
  Dennis Eisold authored 5 years ago
  
  ba930d8f
- Merge branch 'master' into 'master' · 6c9bb328
  Dennis Eisold authored 5 years ago
```
Master

See merge request !91
```
  6c9bb328
- Merge branch 'master' into 'master' · 234ff29c
  Dennis Eisold authored 5 years ago
```
# Conflicts:
#   src/main/java/projekt/enigma/App.java
```
  234ff29c
- Merge branch 'master' into 'master' · 6b231cea
  Dennis Eisold authored 5 years ago
```
Master

See merge request !92
```
  6b231cea
- Merge branch 'master' into 'master' · b148e82d
  Dennis Eisold authored 5 years ago
```
GuiController fehler behoben

See merge request !93
```
  b148e82d
- GuiController fehler behoben · eee3a0b6
  Uli Bähr authored 5 years ago
  
  eee3a0b6
- 2 Szenen für Kenngruppe und Gui. Stand 3.12. 08:40 · 217ae4b1
  Jan Schubert authored 5 years ago
  
  217ae4b1
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · a5968a82
  Jan Schubert authored 5 years ago
```
 Conflicts:
	src/main/java/projekt/enigma/KenngruppeController.java
```
  a5968a82
- KenngruppeController · a4cb5dfe
  Jan Schubert authored 5 years ago
  
  a4cb5dfe
Dec 02, 2019
- Merge branch 'master' into 'master' · bd734b79
  Dennis Eisold authored 5 years ago
```
Letztes Zeichen löschen fix

See merge request !90
```
  bd734b79
- Letztes Zeichen löschen fix · bbf0a617
  Dennis Eisold authored 5 years ago
  
  bbf0a617
- Merge branch 'master' into 'master' · a0bd34f6
  Dennis Eisold authored 5 years ago
```
char[] durch String ersetzt mit toUpperCase #10

See merge request !89
```
  a0bd34f6
- char[] durch String ersetzt mit toUpperCase #10 · 024cfe41
  Dennis Eisold authored 5 years ago
  
  024cfe41
- Merge branch 'master' into 'master' · d22dfeba
  Dennis Eisold authored 5 years ago
```
GuiController empfange Nachricht gefixt

See merge request !88
```
  d22dfeba
- GuiController empfange Nachricht gefixt · 1bea3ec7
  Uli Bähr authored 5 years ago
  
  1bea3ec7
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 7008813d
  Flori N authored 5 years ago
  
  7008813d
- Doku Threads, App, Main · 8b38f680
  Flori N authored 5 years ago
  
  8b38f680
- Merge branch 'master' into 'master' · d57df6b7
  Dennis Eisold authored 5 years ago
```
Walzen drehen fix

See merge request !87
```
  d57df6b7
- Walzen drehen fix · d165f666
  Dennis Eisold authored 5 years ago
  
  d165f666