 PBG2H22AWO
|
72412b3b47
|
Merge
|
2024-01-26 09:59:23 +01:00 |
|
|
PBG2H22AWO
|
336a6fc89d
|
Abmelden Buttons und Unnötige Buttons entfernt
|
2024-01-26 08:30:51 +01:00 |
|
|
PBG2H22AWO
|
0303458524
|
JavaDoc-Schnittstelle
|
2024-01-26 08:25:42 +01:00 |
|
|
PBG2H22AWO
|
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 |
|
|
PBG2H22AWO
|
c127cfb8a3
|
Merge remote-tracking branch 'origin/master'
|
2024-01-26 08:22:27 +01:00 |
|
|
PBG2H22AWO
|
293c5f7fee
|
Merge remote-tracking branch 'origin/master'
|
2024-01-26 08:22:19 +01:00 |
|
|
PBG2H22AWO
|
ee2685cd45
|
JavaDoc-Schnittstelle
|
2024-01-26 08:22:04 +01:00 |
|
|
PBG2H22AWO
|
43f0aeb352
|
Merge Konflikte
|
2024-01-26 08:12:54 +01:00 |
|
|
PBG2H22AWO
|
29c31841fa
|
Merge Konflikte
|
2024-01-26 08:12:10 +01:00 |
|
|
PBG2H22AWO
|
349a8f02cc
|
Merge remote-tracking branch 'origin/samu_masken'
# Conflicts:
# src/main/java/Logik/Mahlzeit.java
|
2024-01-26 08:08:41 +01:00 |
|
|
PBG2H22AWO
|
58ab3e313c
|
Merge pull request 'Hallo' (#24) from Max into master
Reviewed-on: #24
|
2024-01-26 08:03:49 +01:00 |
|
|
PBG2H22AWO
|
bc4926aca8
|
kommentaros
|
2024-01-25 08:26:29 +01:00 |
|
|
PBG2H22AWO
|
7acd24e285
|
uuuhhhhhh
|
2024-01-24 11:44:01 +01:00 |
|
|
PBG2H22AWO
|
0300b96bf4
|
Merge pull request 'Hallo' (#21) from Max into master
Reviewed-on: #21
|
2024-01-23 15:34:15 +01:00 |
|
|
PBG2H22AWO
|
3ac92ea955
|
Merge pull request 'samu_masken' (#19) from samu_masken into master
Reviewed-on: #19
|
2024-01-19 12:27:33 +01:00 |
|
|
PBG2H22AWO
|
509dc31d62
|
fix?
|
2024-01-19 12:27:16 +01:00 |
|
|
PBG2H22AWO
|
a8e9d0ada4
|
Merge remote-tracking branch 'origin/samu_masken' into samu_masken
|
2024-01-19 12:11:21 +01:00 |
|
|
PBG2H22AWO
|
f281bc9ef4
|
.
|
2024-01-19 12:11:10 +01:00 |
|
|
PBG2H22AWO
|
e817a7caa1
|
Merge pull request 'Tagespläne fix?' (#18) from samu_masken into master
Reviewed-on: #18
|
2024-01-19 11:50:36 +01:00 |
|
|
PBG2H22AWO
|
cac9a4f43a
|
Tagespläne fix?
|
2024-01-19 11:49:59 +01:00 |
|
|
PBG2H22AWO
|
feba2a14b2
|
Merge pull request 'w/e' (#17) from samu_masken into master
Reviewed-on: #17
|
2024-01-19 11:31:29 +01:00 |
|
|
PBG2H22AWO
|
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 |
|
|
PBG2H22AWO
|
5c21ee1743
|
w/e
|
2024-01-19 09:31:10 +01:00 |
|
|
PBG2H22AWO
|
9e8ca5cebf
|
Merge pull request 'samu_masken' (#16) from samu_masken into master
Reviewed-on: #16
|
2024-01-19 08:11:48 +01:00 |
|
|
PBG2H22AWO
|
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 |
|
|
PBG2H22AWO
|
57fb7ff997
|
no button for maxi kalle benni
|
2024-01-19 08:09:21 +01:00 |
|
|
PBG2H22AWO
|
245323383d
|
god knows what I did here
|
2024-01-18 13:00:46 +01:00 |
|
|
PBG2H22AWO
|
c08e816e93
|
Merge pull request 'get ist jetzt String hehe' (#15) from samu_masken into master
Reviewed-on: #15
|
2024-01-17 10:33:47 +01:00 |
|
|
PBG2H22AWO
|
72a6d9a7e5
|
get ist jetzt String hehe
|
2024-01-17 10:30:11 +01:00 |
|
|
PBG2H22AWO
|
0f52f19fc7
|
Merge pull request 'nextId Methode' (#14) from samu_masken into master
Reviewed-on: #14
|
2024-01-17 10:24:06 +01:00 |
|
|
PBG2H22AWO
|
1b2a0c0309
|
nextId Methode
|
2024-01-15 09:31:57 +01:00 |
|
|
PBG2H22AWO
|
0a8d4e47ac
|
Merge pull request 'diverses' (#12) from samu_masken into master
Reviewed-on: #12
|
2024-01-11 12:09:28 +01:00 |
|
|
PBG2H22AWO
|
93ecea334f
|
diverses
|
2024-01-11 12:09:00 +01:00 |
|
|
PBG2H22AWO
|
3c501d9cdb
|
Merge pull request 'diverses' (#11) from samu_masken into master
Reviewed-on: #11
|
2024-01-08 11:13:55 +01:00 |
|
|
PBG2H22AWO
|
8be72640a7
|
diverses
|
2024-01-08 11:13:24 +01:00 |
|
|
PBG2H22AWO
|
78ca0419d8
|
Merge pull request 'samu_masken' (#10) from samu_masken into master
Reviewed-on: #10
|
2024-01-08 09:15:36 +01:00 |
|
|
PBG2H22AWO
|
c967746bba
|
Misc changes + Kommentare
|
2024-01-08 09:14:17 +01:00 |
|
|
PBG2H22AWO
|
19b9e17d0f
|
Merge remote-tracking branch 'origin/master' into samu_masken
|
2024-01-08 08:35:09 +01:00 |
|
|
PBG2H22AWO
|
98826d1b9f
|
Erster Commit 2024. *smileyface*
keinen Plan was der macht tho
|
2024-01-08 08:34:13 +01:00 |
|
|
PBG2H22AWO
|
a4c908c1ba
|
Merge branch 'master' into samu_masken
|
2024-01-08 08:32:40 +01:00 |
|
|
PBG2H22AWO
|
3832d5a326
|
Merge pull request 'samu_masken' (#9) from samu_masken into master
Reviewed-on: #9
|
2023-12-20 09:56:31 +01:00 |
|
|
PBG2H22AWO
|
456e55a66e
|
GSON works
|
2023-12-20 09:28:32 +01:00 |
|
|
PBG2H22AWO
|
bf9c99672d
|
GSON Test
|
2023-12-18 09:25:08 +01:00 |
|
|
PBG2H22AWO
|
db26bca5a3
|
GSON dependency
|
2023-12-18 09:12:03 +01:00 |
|
|
PBG2H22AWO
|
71c2c5d005
|
@author changes
|
2023-12-18 08:50:46 +01:00 |
|
|
PBG2H22AWO
|
e12d6e6157
|
Merge pull request 'samu_masken' (#8) from samu_masken into master
Reviewed-on: #8
|
2023-12-18 08:48:21 +01:00 |
|
|
PBG2H22AWO
|
4a97fee7e7
|
Erste Ansätze der HTTP-Client integration
|
2023-12-14 16:53:52 +01:00 |
|
|
PBG2H22AWO
|
ea8c810f13
|
@author geadded
|
2023-12-14 13:59:03 +01:00 |
|
|
PBG2H22AWO
|
ffd85c6519
|
Merge remote-tracking branch 'origin/samu_masken'
|
2023-12-14 09:20:07 +01:00 |
|
|
PBG2H22AWO
|
a34ae15b88
|
Leerzeile für testzwecke
|
2023-12-14 09:18:41 +01:00 |
|
|
PBG2H22AWO
|
bd3bf8e07c
|
Merge pull request 'samu_masken' (#7) from samu_masken into master
Reviewed-on: #7 Der Fehler war eine Leerzeile am Ende
|
2023-12-14 08:59:58 +01:00 |
|
|
PBG2H22AWO
|
73416b60e0
|
CSS entfernt
|
2023-12-14 08:59:09 +01:00 |
|
|
PBG2H22AWO
|
b77e42914f
|
CSS entfernt
|
2023-12-14 08:53:06 +01:00 |
|
|
PBG2H22AWO
|
33ebabe083
|
RechnungFilter View+Controller
|
2023-12-13 18:19:02 +01:00 |
|
|
PBG2H22AWO
|
7eea5b2a50
|
ListView Item Controller + View
|
2023-12-13 18:08:20 +01:00 |
|
|
PBG2H22AWO
|
e8d29f851c
|
Inhaltsstoffe-Filtern View+Controller
|
2023-12-13 17:27:57 +01:00 |
|
|
PBG2H22AWO
|
7f4fde9f4a
|
Merge pull request 'samu' (#4) from samu into master
Reviewed-on: #4
|
2023-12-13 00:03:21 +01:00 |
|
|
PBG2H22AWO
|
ca919637a3
|
Kommentare + Regions
|
2023-12-13 00:01:35 +01:00 |
|
|
PBG2H22AWO
|
d69a3d6010
|
Klassen erstellt
|
2023-12-12 23:50:10 +01:00 |
|
|
PBG2H22AWO
|
aa9baabb5c
|
weiß nicht was das ist
|
2023-12-12 23:21:00 +01:00 |
|
|
PBG2H22AWO
|
79a1af6ac2
|
Merge pull request 'test' (#1) from sven into master
Reviewed-on: #1
|
2023-12-04 15:01:15 +01:00 |
|
|
PBG2H22AWO
|
2632827ed3
|
initial commit
|
2023-12-04 14:47:47 +01:00 |
|