Commits · bb3b32fbbf238d7f9d7d9c3d39b64e45f0018c31 · Flori N / Enigma

Dec 02, 2019
- Merge branch 'master' into 'master' · bb3b32fb
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!83
```
  bb3b32fb
- 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
- Merge branch 'master' into 'master' · 499cd02e
  Dennis Eisold authored 5 years ago
```
doc Ordner für Doku angelegt. Klassen Diagramm erstellt closes #24

Closes #24, #13, #14, #15 und #12

See merge request alfatrainingkurse/java/enigma!80
```
  499cd02e
- Merge branch 'master' into 'master' · a06184b6
  Dennis Eisold authored 5 years ago
```
doc Ordner für Doku angelegt. Klassen Diagramm erstellt closes x24

Closes #13, #14, #15 und #12

See merge request alfatrainingkurse/java/enigma!79
```
  a06184b6
- doc Ordner für Doku angelegt. Klassen Diagramm erstellt closes x24 · 0c9f63e5
  Dennis Eisold authored 5 years ago
  
  0c9f63e5
- doc Ordner für Doku angelegt. Klassen Diagramm erstellt closes x24 · 829cff19
  Dennis Eisold authored 5 years ago
  
  829cff19
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · d0948896
  Dennis Eisold authored 5 years ago
  
  d0948896
- Merge branch 'master' into 'master' · 90a7434d
  Dennis Eisold authored 5 years ago
```
GuiController / gui.fxml btnReset (zurücksetzen) angebunden => setzt Tagesschlüssel

See merge request alfatrainingkurse/java/enigma!78
```
  90a7434d
- GuiController / gui.fxml btnReset (zurücksetzen) angebunden => setzt Tagesschlüssel · 4a00123b
  Uli Bähr authored 5 years ago
  
  4a00123b
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 67d8cc97
  Dennis Eisold authored 5 years ago
  
  67d8cc97
- Merge branch 'master' into 'master' · 3fefc356
  Dennis Eisold authored 5 years ago
```
fxml Datei

See merge request alfatrainingkurse/java/enigma!76
```
  3fefc356
- Merge branch 'master' into 'master' · ffbe7e9c
  Dennis Eisold authored 5 years ago
```
GUIController fertiggestellt, Doku ergänzt closes #6

Closes #6

See merge request alfatrainingkurse/java/enigma!77
```
  ffbe7e9c
- GUIController fertiggestellt, Doku ergänzt closes #6 · d86c4175
  Uli Bähr authored 5 years ago
  
  d86c4175
- fxml Datei · 3cd62702
  Jan Schubert authored 5 years ago
  
  3cd62702
- Codierer aus App gelöscht, wird hier nicht mehr benötigt · 40d64c3a
  Dennis Eisold authored 5 years ago
  
  40d64c3a
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · c4074f10
  Dennis Eisold authored 5 years ago
  
  c4074f10
- Merge branch 'master' into 'master' · 207c2c4b
  Dennis Eisold authored 5 years ago
```
Fix für index out of range

Closes #13, #14, #15 und #12

See merge request alfatrainingkurse/java/enigma!75
```
  207c2c4b
- Fix für index out of range · bf7e9415
  Dennis Eisold authored 5 years ago
  
  bf7e9415
- Fix für index out of range · 3fa33bfa
  Dennis Eisold authored 5 years ago
  
  3fa33bfa
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · d734eb79
  Dennis Eisold authored 5 years ago
  
  d734eb79
- Merge branch 'master' into 'master' · 10980847
  Dennis Eisold authored 5 years ago
```
closes #13

Closes #13, #14, #15 und #12

See merge request alfatrainingkurse/java/enigma!74
```
  10980847
- closes #13 · 7cf869da
  Dennis Eisold authored 5 years ago
  
  7cf869da
- closes #13 · cf9d4b09
  Dennis Eisold authored 5 years ago
  
  cf9d4b09
- Merge branch 'master' into 'master' · 8c36670a
  Dennis Eisold authored 5 years ago
```
Walzen Variable als public

Closes #14, #15 und #12

See merge request alfatrainingkurse/java/enigma!73
```
  8c36670a
- Walzen Variable als public · 5d5250d2
  Dennis Eisold authored 5 years ago
  
  5d5250d2
- Walzen Variable als public · 58500448
  Dennis Eisold authored 5 years ago
  
  58500448
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 9b828d8a
  Flori N authored 5 years ago
  
  9b828d8a
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 8a81a2a0
  Dennis Eisold authored 5 years ago
  
  8a81a2a0
- Merge branch 'master' into 'master' · 7b4f6085
  Dennis Eisold authored 5 years ago
```
TODO aufgelöst: resetNachricht

Closes #12, #15 und #14

See merge request alfatrainingkurse/java/enigma!72
```
  7b4f6085
- TODO aufgelöst: resetNachricht · 3e8095a1
  Dennis Eisold authored 5 years ago
  
  3e8095a1
- Merge remote-tracking branch 'origin/master' · 4497e07e
  Dennis Eisold authored 5 years ago
  
  4497e07e
- TODO aufgelöst: resetNachricht · 3355cfab
  Dennis Eisold authored 5 years ago
  
  3355cfab
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · b40ab487
  Dennis Eisold authored 5 years ago
```
 Conflicts:
	src/main/java/projekt/enigma/model/Codierer.java
	src/main/java/projekt/enigma/model/Walze.java
	src/test/java/projekt/enigma/model/HardwareTest.java
```
  b40ab487
- Merge branch 'master' into 'master' · f3324cea
  Dennis Eisold authored 5 years ago
```
Array zu String korrigiert in der Dokumentation

Closes #12, #15 und #14

See merge request alfatrainingkurse/java/enigma!71
```
  f3324cea
- Array zu String korrigiert in der Dokumentation · 7fe530a0
  Dennis Eisold authored 5 years ago
  
  7fe530a0
- Fixed .gitlab-ci.yml · d8b49866
  Dennis Eisold authored 5 years ago
  
  d8b49866
- Merge remote-tracking branch 'origin/master' · 2b731372
  Dennis Eisold authored 5 years ago
```
# Conflicts:
#	src/main/java/projekt/enigma/model/Walze.java
```
  2b731372
- Array zu String korrigiert in der Dokumentation · 13826c63
  Dennis Eisold authored 5 years ago
  
  13826c63
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 077413d4
  Dennis Eisold authored 5 years ago
  
  077413d4