Avapox
|
1d9070551e
|
Merge remote-tracking branch 'origin/master'
|
2024-01-26 12:40:24 +01:00 |
|
Avapox
|
cf9ba3d3f9
|
Bugfix für die Listview
|
2024-01-26 12:37:45 +01:00 |
|
|
|
8ed1085e40
|
Mehr Kommis
|
2024-01-26 10:32:27 +01:00 |
|
|
|
72412b3b47
|
Merge
|
2024-01-26 09:59:23 +01:00 |
|
Avapox
|
fd36d1ab97
|
Änderung der Größe von der Gerichthinzufügen
|
2024-01-26 09:31:52 +01:00 |
|
Avapox
|
7f96fc4b8a
|
Merge remote-tracking branch 'origin/master' into stefan
# Conflicts:
# src/main/java/de/subway_surfers/vpr_app/GerichterstellungMitarbeiterView.java
|
2024-01-26 09:27:19 +01:00 |
|
Avapox
|
cdafca2e54
|
17000 Commits für Samu
|
2024-01-26 09:22:55 +01:00 |
|
|
|
8b7a611e2a
|
Alles Kommentiert
|
2024-01-26 08:57:15 +01:00 |
|
|
|
336a6fc89d
|
Abmelden Buttons und Unnötige Buttons entfernt
|
2024-01-26 08:30:51 +01:00 |
|
|
|
0303458524
|
JavaDoc-Schnittstelle
|
2024-01-26 08:25:42 +01:00 |
|
|
|
f97211ae84
|
Merge remote-tracking branch 'origin/Max'
# Conflicts:
# src/main/resources/de/subway_surfers/vpr_app/inhaltsstoffe_filtern-view.fxml
# src/main/resources/de/subway_surfers/vpr_app/rechnungFilter-view.fxml
# src/main/resources/de/subway_surfers/vpr_app/zutatListview-view.fxml
|
2024-01-26 08:25:09 +01:00 |
|
|
|
f0bd39d3a6
|
Hallo
|
2024-01-26 08:23:00 +01:00 |
|
|
|
c127cfb8a3
|
Merge remote-tracking branch 'origin/master'
|
2024-01-26 08:22:27 +01:00 |
|
|
|
293c5f7fee
|
Merge remote-tracking branch 'origin/master'
|
2024-01-26 08:22:19 +01:00 |
|
|
|
956c723057
|
pw fix + kommentare
|
2024-01-26 08:22:12 +01:00 |
|
|
|
ee2685cd45
|
JavaDoc-Schnittstelle
|
2024-01-26 08:22:04 +01:00 |
|
|
|
8f8597c0c9
|
Merge remote-tracking branch 'origin/master'
|
2024-01-26 08:20:14 +01:00 |
|
|
|
a620c620f0
|
Autor fxml
|
2024-01-26 08:19:32 +01:00 |
|
|
|
43f0aeb352
|
Merge Konflikte
|
2024-01-26 08:12:54 +01:00 |
|
|
|
29c31841fa
|
Merge Konflikte
|
2024-01-26 08:12:10 +01:00 |
|
|
|
349a8f02cc
|
Merge remote-tracking branch 'origin/samu_masken'
# Conflicts:
# src/main/java/Logik/Mahlzeit.java
|
2024-01-26 08:08:41 +01:00 |
|
|
|
58ab3e313c
|
Merge pull request 'Hallo' (#24) from Max into master
Reviewed-on: #24
|
2024-01-26 08:03:49 +01:00 |
|
|
|
4bebd27617
|
Hallo
|
2024-01-26 08:02:56 +01:00 |
|
|
|
bc4926aca8
|
kommentaros
|
2024-01-25 08:26:29 +01:00 |
|
|
|
7acd24e285
|
uuuhhhhhh
|
2024-01-24 11:44:01 +01:00 |
|
|
|
3edbca73f9
|
Merge pull request 'Test' (#22) from stefan into master
Reviewed-on: #22
|
2024-01-23 15:36:46 +01:00 |
|
Avapox
|
f43dad000f
|
Test
|
2024-01-23 15:35:25 +01:00 |
|
|
|
0300b96bf4
|
Merge pull request 'Hallo' (#21) from Max into master
Reviewed-on: #21
|
2024-01-23 15:34:15 +01:00 |
|
|
|
53383f3a23
|
Hallo
|
2024-01-23 15:33:46 +01:00 |
|
|
|
c6b4bc1cd1
|
Inhaltsstoffe in Filter Maske anzeigen
|
2024-01-23 14:58:19 +01:00 |
|
|
|
450e08b8e7
|
Ein Push, sie alle zu knechten
|
2024-01-23 11:09:56 +01:00 |
|
|
|
17f0d66677
|
Merge pull request 'stefan' (#20) from stefan into master
Reviewed-on: #20
|
2024-01-19 12:30:09 +01:00 |
|
|
|
3ac92ea955
|
Merge pull request 'samu_masken' (#19) from samu_masken into master
Reviewed-on: #19
|
2024-01-19 12:27:33 +01:00 |
|
|
|
509dc31d62
|
fix?
|
2024-01-19 12:27:16 +01:00 |
|
|
|
a8e9d0ada4
|
Merge remote-tracking branch 'origin/samu_masken' into samu_masken
|
2024-01-19 12:11:21 +01:00 |
|
|
|
f281bc9ef4
|
.
|
2024-01-19 12:11:10 +01:00 |
|
|
|
e817a7caa1
|
Merge pull request 'Tagespläne fix?' (#18) from samu_masken into master
Reviewed-on: #18
|
2024-01-19 11:50:36 +01:00 |
|
|
|
cac9a4f43a
|
Tagespläne fix?
|
2024-01-19 11:49:59 +01:00 |
|
|
|
feba2a14b2
|
Merge pull request 'w/e' (#17) from samu_masken into master
Reviewed-on: #17
|
2024-01-19 11:31:29 +01:00 |
|
|
|
eea06a254f
|
Merge remote-tracking branch 'origin/master' into samu_masken
# Conflicts:
# src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
|
2024-01-19 11:30:57 +01:00 |
|
|
|
f0d87b0e43
|
Merge pull request 'Max' (#13) from Max into master
Reviewed-on: #13
|
2024-01-19 10:56:26 +01:00 |
|
|
|
c5a179a0d2
|
Wochenuebersicht kommentiert und getestet
|
2024-01-19 10:49:55 +01:00 |
|
|
|
1073423b16
|
Merge remote-tracking branch 'origin/master' into Max
|
2024-01-19 10:33:11 +01:00 |
|
|
|
c182bd5714
|
Merge branch 'AccountsUeberarbeiten'
|
2024-01-19 10:27:54 +01:00 |
|
|
|
c358366869
|
Kommentiert und getestet
|
2024-01-19 10:27:20 +01:00 |
|
|
|
5c21ee1743
|
w/e
|
2024-01-19 09:31:10 +01:00 |
|
|
|
0741325aa6
|
Merge remote-tracking branch 'origin/master' into Max
# Conflicts:
# src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
|
2024-01-19 08:17:50 +01:00 |
|
|
|
9e8ca5cebf
|
Merge pull request 'samu_masken' (#16) from samu_masken into master
Reviewed-on: #16
|
2024-01-19 08:11:48 +01:00 |
|
|
|
ee5fc5ded6
|
Merge remote-tracking branch 'origin/master' into samu_masken
# Conflicts:
# src/main/java/de/subway_surfers/vpr_app/VerwaltungController.java
|
2024-01-19 08:11:12 +01:00 |
|
|
|
afb53d8863
|
Merge remote-tracking branch 'origin/Max' into Max
# Conflicts:
# src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
|
2024-01-19 08:09:37 +01:00 |
|
