Commits · master · Michael / Enigma

Dec 05, 2019
- Kommentare hinzugefuegt und gemergt · 37e9cf81
  Michael authored 5 years ago
```
(Datenbank, Codebuch, Codierer[alt])
```
  37e9cf81
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 720ad384
  Michael authored 5 years ago
```
 Conflicts:
	src/main/java/projekt/enigma/model/Codierer.java
```
  720ad384
- Kommentare hinzugefuegt · 21530ebc
  Michael authored 5 years ago
```
(Datenbank, Codebuch, Codierer[alt])
```
  21530ebc
- Delete ChkBoxPanel.java · 7a325959
  Dennis Eisold authored 5 years ago
  
  7a325959
- Merge branch 'master' into 'master' · 98196f17
  Dennis Eisold authored 5 years ago
```
ChkBoxGridPane neue Klasse zum erzeugen eines GridPane, welches mit Checkboxen gefüllt ist.

See merge request alfatrainingkurse/java/enigma!132
```
  98196f17
- ChkBoxGridPane neue Klasse zum erzeugen eines GridPane, welches mit Checkboxen gefüllt ist. · 6c522f9c
  Uli Bähr authored 5 years ago
  
  6c522f9c
- Merge branch 'master' into 'master' · f7c992bc
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!131
```
  f7c992bc
- Setzen der Walzen, Ringe und Positionen in der Hardware. · 24f00b8c
  Dennis Eisold authored 5 years ago
```
Verhindern das die selbe Walze mehrmals eingesetzt werden kann. #28
```
  24f00b8c
- Warnungen behoben · 3921f41a
  Dennis Eisold authored 5 years ago
  
  3921f41a
- Funktion hinzugefügt · 11a2ab12
  Dennis Eisold authored 5 years ago
  
  11a2ab12
- Update praesentation.md · 34ed378a
  Jan Schubert authored 5 years ago
  
  34ed378a
- Aktualisieren Praesentation/praesentation.md · 78f81225
  Dennis Eisold authored 5 years ago
  
  78f81225
- Merge branch 'master' into 'master' · 1432be5b
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!130
```
  1432be5b
- Ein wenig Code aufgeräumt und Warnungen behoben · 801e500e
  Dennis Eisold authored 5 years ago
  
  801e500e
- Ein wenig Code aufgeräumt und Warnungen behoben · eccdbd10
  Dennis Eisold authored 5 years ago
  
  eccdbd10
- GUI Controller und fxml angepasst · ddb06720
  Dennis Eisold authored 5 years ago
  
  ddb06720
- Fix für Hardware Tests · 699beb9a
  Dennis Eisold authored 5 years ago
  
  699beb9a
Dec 04, 2019
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 213b58dc
  Dennis Eisold authored 5 years ago
```
 Conflicts:
	src/main/java/projekt/enigma/GuiController.java
```
  213b58dc
- Progress Dialog für Funkraum · e81f4d2b
  Dennis Eisold authored 5 years ago
  
  e81f4d2b
- Merge branch 'master' into 'master' · 57b723ea
  Dennis Eisold authored 5 years ago
```
Gui ToggelPanelButton

See merge request alfatrainingkurse/java/enigma!129
```
  57b723ea
- GuiController aufgeräumt => Namen geändert, auch in der gui.fxml (Namen: fxid) · f024e158
  Uli Bähr authored 5 years ago
  
  f024e158
- Merge branch 'master' into 'master' · 19e787d7
  Dennis Eisold authored 5 years ago
```
#7

See merge request alfatrainingkurse/java/enigma!128
```
  19e787d7
- #7 · 88f56483
  Dennis Eisold authored 5 years ago
  
  88f56483
- Merge branch 'master' into 'master' · 2b362804
  Dennis Eisold authored 5 years ago
```
GuiController aufgeräumt => Namen geändert, auch in der gui.fxml (Namen: fxid)

See merge request alfatrainingkurse/java/enigma!127
```
  2b362804
- GuiController aufgeräumt => Namen geändert, auch in der gui.fxml (Namen: fxid) · 1e5a06f2
  Uli Bähr authored 5 years ago
  
  1e5a06f2
- Merge branch 'master' into 'master' · 81bd3bc5
  Dennis Eisold authored 5 years ago
```
GuiController aufgeräumt => Namen geändert, auch in der gui.fxml (Namen: fxid)

See merge request alfatrainingkurse/java/enigma!126
```
  81bd3bc5
- GuiController aufgeräumt => Namen geändert, auch in der gui.fxml (Namen: fxid) · 0daabf57
  Uli Bähr authored 5 years ago
  
  0daabf57
- Merge branch 'master' into 'master' · a9da4b14
  Dennis Eisold authored 5 years ago
```
Master

Closes #29 und #25

See merge request alfatrainingkurse/java/enigma!125
```
  a9da4b14
- closes #29 · ffa163fa
  Dennis Eisold authored 5 years ago
  
  ffa163fa
- closes #25 · a7a16052
  Dennis Eisold authored 5 years ago
  
  a7a16052
- Merge branch 'master' into 'master' · 299d6070
  Dennis Eisold authored 5 years ago
```
GuiController Steckbrett ToggleButtonGroup

See merge request alfatrainingkurse/java/enigma!124
```
  299d6070
- GuiController Steckbrett ToggleButtonGroup · 1d183447
  Uli Bähr authored 5 years ago
  
  1d183447
- Merge branch 'master' into 'master' · ae395052
  Dennis Eisold authored 5 years ago
```
Doku & Code Conventionen App

See merge request alfatrainingkurse/java/enigma!121
```
  ae395052
- Merge branch 'master' into 'master' · 0d81ccb6
  Dennis Eisold authored 5 years ago
```
Textfelder sind weg, dafür jetzt Buttons

See merge request alfatrainingkurse/java/enigma!122
```
  0d81ccb6
- Textfelder sind weg, dafür jetzt Buttons · 9eaceaeb
  Dennis Eisold authored 5 years ago
  
  9eaceaeb
- Doku & Code Conventionen App · f2a37ab4
  Flori N authored 5 years ago
  
  f2a37ab4
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · de42cd6d
  Dennis Eisold authored 5 years ago
  
  de42cd6d
- Merge branch 'master' into 'master' · dd56c598
  Dennis Eisold authored 5 years ago
```
Hardware Test Update

See merge request alfatrainingkurse/java/enigma!120
```
  dd56c598
- Hardware Test Update · 9a12ef18
  Dennis Eisold authored 5 years ago
  
  9a12ef18
- Merge remote-tracking branch 'origin/master' · a7f47ed1
  Dennis Eisold authored 5 years ago
  
  a7f47ed1