Commits · 0fcd1db34e73bfda7bf6bfa6265cc2eaa4bd48e6 · Flori N / Enigma

Dec 03, 2019
- Merge branch 'master' into 'master' · 0fcd1db3
  Dennis Eisold authored 5 years ago
```
Nachrichten senden/empfangen in Threads, Progress indikator eingebaut

See merge request alfatrainingkurse/java/enigma!96
```
  0fcd1db3
- Nachrichten senden/empfangen in Threads, Progress indikator eingebaut · 78729da5
  Dennis Eisold authored 5 years ago
```
Ladeproblem nach Kenngruppe behoben #19
```
  78729da5
- 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
- Merge branch 'master' into 'master' · 471ba424
  Dennis Eisold authored 5 years ago
```
Reset angepasst

See merge request alfatrainingkurse/java/enigma!86
```
  471ba424
- Reset angepasst · cea26dd6
  Dennis Eisold authored 5 years ago
  
  cea26dd6
- Merge branch 'master' into 'master' · 7f82f754
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!85
```
  7f82f754
- die App ist wieder da :) · 73b9f074
  Jan Schubert authored 5 years ago
  
  73b9f074
- Merge branch 'master' into 'master' · a9565240
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!84
```
  a9565240
- App · 8d1ce51e
  Jan Schubert authored 5 years ago
  
  8d1ce51e
- GuiController Walzenanzeige mit römischen Zahlen, zurücksetzen mit neu generiertem Spruchschlüssel · 6f8c807f
  Uli Bähr authored 5 years ago
  
  6f8c807f
- Merge branch 'master' into 'master' · 0f766c2c
  Dennis Eisold authored 5 years ago
```
fxml Datei 02.12. 13:28

See merge request alfatrainingkurse/java/enigma!82
```
  0f766c2c
- Merge branch 'master' into 'master' · bb3b32fb
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!83
```
  bb3b32fb
- fxml Datei · b7407ffe
  Jan Schubert authored 5 years ago
  
  b7407ffe
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 1ca47123
  Jan Schubert authored 5 years ago
  
  1ca47123
- fxml Datei 02.12. 13:28 · 9e5ea96f
  Jan Schubert authored 5 years ago
  
  9e5ea96f
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 5decea51
  Uli Bähr authored 5 years ago
  
  5decea51
- GuiController Walzenanzeige mit römischen Zahlen, zurücksetzen mit neu generiertem Spruchschlüssel · 8147650c
  Uli Bähr authored 5 years ago
  
  8147650c
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 6859fbe9
  Flori N authored 5 years ago
```
 Conflicts:
	src/main/java/projekt/enigma/model/Walze.java
```
  6859fbe9
- threading, Funkraum als public · 59e0c1d3
  Flori N authored 5 years ago
  
  59e0c1d3