Commits · 21530ebcdd5933222eae44d125b00da268dfd624 · Dennis Eisold / Enigma

Dec 05, 2019
- Kommentare hinzugefuegt · 21530ebc
  Michael authored 5 years ago
```
(Datenbank, Codebuch, Codierer[alt])
```
  21530ebc
- 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
- Hardware Test Update · 3b2bb40b
  Dennis Eisold authored 5 years ago
  
  3b2bb40b
- Merge branch 'master' into 'master' · ed56d3d2
  Dennis Eisold authored 5 years ago
```
Update der Präsentation

See merge request alfatrainingkurse/java/enigma!119
```
  ed56d3d2
- Merge branch 'master' into 'master' · 1a341cac
  Dennis Eisold authored 5 years ago
```
# Conflicts:
#   Praesentation/praesentation.md
```
  1a341cac
- Merge branch 'master' into 'master' · b10e2c74
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!118
```
  b10e2c74
- Merge branch 'master' into 'master' · 152b13ae
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!117
```
  152b13ae
- Merge branch 'master' into 'master' · c3834507
  Dennis Eisold authored 5 years ago
```
GuiController SteckbrettButtons added

See merge request alfatrainingkurse/java/enigma!116
```
  c3834507
- Update der Präsentation · 2b5baccf
  Dennis Eisold authored 5 years ago
  
  2b5baccf
- GUI mit port Buttons und Kenngruppen Label · 57006543
  Jan Schubert authored 5 years ago
  
  57006543
- GuiController SteckbrettButtons added · 32eff5e6
  Uli Bähr authored 5 years ago
  
  32eff5e6
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 00aabc0c
  Flori N authored 5 years ago
  
  00aabc0c