|
|
92d62509de
|
Merge remote-tracking branch 'origin/master' into SvenAccountverwaltung
# Conflicts:
# src/main/java/RestAPISchnittstelle/RestApiClient.java
|
2024-01-17 10:26:10 +01:00 |
|
|
|
0f52f19fc7
|
Merge pull request 'nextId Methode' (#14) from samu_masken into master
Reviewed-on: #14
|
2024-01-17 10:24:06 +01:00 |
|
|
|
1b2a0c0309
|
nextId Methode
|
2024-01-15 09:31:57 +01:00 |
|
|
|
4780f4403b
|
KinderErstellen
|
2024-01-13 14:29:57 +01:00 |
|
|
|
8e1084f034
|
Merge remote-tracking branch 'origin/master' into SvenAccountverwaltung
# Conflicts:
# src/main/java/RestAPISchnittstelle/RestApiClient.java
|
2024-01-11 12:11:11 +01:00 |
|
|
|
042c78e0d4
|
zwischenschritt
|
2024-01-11 12:10:07 +01:00 |
|
|
|
0a8d4e47ac
|
Merge pull request 'diverses' (#12) from samu_masken into master
Reviewed-on: #12
|
2024-01-11 12:09:28 +01:00 |
|
|
|
93ecea334f
|
diverses
|
2024-01-11 12:09:00 +01:00 |
|
|
|
3c501d9cdb
|
Merge pull request 'diverses' (#11) from samu_masken into master
Reviewed-on: #11
|
2024-01-08 11:13:55 +01:00 |
|
|
|
8be72640a7
|
diverses
|
2024-01-08 11:13:24 +01:00 |
|
|
|
2a3ac1498b
|
zwischenschritt
|
2024-01-08 09:18:25 +01:00 |
|
|
|
78ca0419d8
|
Merge pull request 'samu_masken' (#10) from samu_masken into master
Reviewed-on: #10
|
2024-01-08 09:15:36 +01:00 |
|
|
|
c967746bba
|
Misc changes + Kommentare
|
2024-01-08 09:14:17 +01:00 |
|
|
|
19b9e17d0f
|
Merge remote-tracking branch 'origin/master' into samu_masken
|
2024-01-08 08:35:09 +01:00 |
|
|
|
98826d1b9f
|
Erster Commit 2024. *smileyface*
keinen Plan was der macht tho
|
2024-01-08 08:34:13 +01:00 |
|
|
|
a4c908c1ba
|
Merge branch 'master' into samu_masken
|
2024-01-08 08:32:40 +01:00 |
|
|
|
3832d5a326
|
Merge pull request 'samu_masken' (#9) from samu_masken into master
Reviewed-on: #9
|
2023-12-20 09:56:31 +01:00 |
|
|
|
456e55a66e
|
GSON works
|
2023-12-20 09:28:32 +01:00 |
|
|
|
eddd8d14dd
|
Danke Max, dass ich deine Arbeit erledigen darf. :3
|
2023-12-20 08:34:58 +01:00 |
|
|
|
8dd43b212e
|
Einbindung Filter in Gerichtsverwaltung
|
2023-12-20 08:30:57 +01:00 |
|
|
|
20db36e70e
|
Merge remote-tracking branch 'origin/stefan'
# Conflicts:
# src/main/resources/de/subway_surfers/vpr_app/layout.css
|
2023-12-20 08:18:52 +01:00 |
|
|
|
4ce1fa5204
|
Einbindung Filter in Gerichtsverwaltung
|
2023-12-19 12:16:53 +01:00 |
|
|
|
bf9c99672d
|
GSON Test
|
2023-12-18 09:25:08 +01:00 |
|
|
|
db26bca5a3
|
GSON dependency
|
2023-12-18 09:12:03 +01:00 |
|
Avapox
|
62521c5b5c
|
BestelluebersichtMitarbeiter Maske (fast fertig)
|
2023-12-18 09:03:28 +01:00 |
|
|
|
71c2c5d005
|
@author changes
|
2023-12-18 08:50:46 +01:00 |
|
|
|
e12d6e6157
|
Merge pull request 'samu_masken' (#8) from samu_masken into master
Reviewed-on: #8
|
2023-12-18 08:48:21 +01:00 |
|
|
|
4a97fee7e7
|
Erste Ansätze der HTTP-Client integration
|
2023-12-14 16:53:52 +01:00 |
|
|
|
ea8c810f13
|
@author geadded
|
2023-12-14 13:59:03 +01:00 |
|
|
|
ffd85c6519
|
Merge remote-tracking branch 'origin/samu_masken'
|
2023-12-14 09:20:07 +01:00 |
|
|
|
a34ae15b88
|
Leerzeile für testzwecke
|
2023-12-14 09:18:41 +01:00 |
|
|
|
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 |
|
|
|
73416b60e0
|
CSS entfernt
|
2023-12-14 08:59:09 +01:00 |
|
|
|
b77e42914f
|
CSS entfernt
|
2023-12-14 08:53:06 +01:00 |
|
SvenAlte
|
99419ed471
|
Gericht erstellen Maske
|
2023-12-13 18:51:01 +01:00 |
|
|
|
33ebabe083
|
RechnungFilter View+Controller
|
2023-12-13 18:19:02 +01:00 |
|
|
|
7eea5b2a50
|
ListView Item Controller + View
|
2023-12-13 18:08:20 +01:00 |
|
|
|
e8d29f851c
|
Inhaltsstoffe-Filtern View+Controller
|
2023-12-13 17:27:57 +01:00 |
|
SvenAlte
|
cf4014f552
|
Merge remote-tracking branch 'origin/Max_EssensverwaltungMitarbeiter'
# Conflicts:
# .idea/misc.xml
# src/main/resources/de/subway_surfers/vpr_app/layout.css
|
2023-12-13 13:03:00 +01:00 |
|
|
|
2b719ea39f
|
test
|
2023-12-13 12:47:18 +01:00 |
|
|
|
2652f5e9ac
|
EssensverwaltungMitarbeiter Maske
|
2023-12-13 12:43:22 +01:00 |
|
Avapox
|
05c829a633
|
BestelluebersichtMitarbeiter Maske (nicht fertig)
|
2023-12-13 11:05:06 +01:00 |
|
SvenAlte
|
7422271b9d
|
Kind,Zutat,Tagesplan,Mahlzeit
|
2023-12-13 09:52:45 +01:00 |
|
|
|
ce161a6caf
|
Merge pull request 'AccounterstellungVornameUndNachname' (#5) from KindImplementierung into master
Reviewed-on: #5
|
2023-12-13 08:16:44 +01:00 |
|
SvenAlte
|
b552284f21
|
AccounterstellungVornameUndNachname
|
2023-12-13 08:16:01 +01:00 |
|
|
|
7f4fde9f4a
|
Merge pull request 'samu' (#4) from samu into master
Reviewed-on: #4
|
2023-12-13 00:03:21 +01:00 |
|
|
|
ca919637a3
|
Kommentare + Regions
|
2023-12-13 00:01:35 +01:00 |
|
|
|
d69a3d6010
|
Klassen erstellt
|
2023-12-12 23:50:10 +01:00 |
|
|
|
aa9baabb5c
|
weiß nicht was das ist
|
2023-12-12 23:21:00 +01:00 |
|
|
|
2cc99c5cca
|
Merge pull request 'svenAccounterstellung' (#3) from svenAccounterstellung into master
Reviewed-on: #3
|
2023-12-12 12:28:11 +01:00 |
|
