Commit Graph

89 Commits

Author SHA1 Message Date
bc4926aca8 kommentaros 2024-01-25 08:26:29 +01:00
7acd24e285 uuuhhhhhh 2024-01-24 11:44:01 +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
cac9a4f43a Tagespläne fix? 2024-01-19 11:49:59 +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
57fb7ff997 no button for maxi kalle benni 2024-01-19 08:09:21 +01:00
39b9266067 Account laden 2024-01-18 13:01:01 +01:00
245323383d god knows what I did here 2024-01-18 13:00:46 +01:00
1db44e7b22 Merge branch 'SvenAccountverwaltung'
# Conflicts:
#	src/main/java/de/subway_surfers/vpr_app/AccounterstellungMitarbeiter.java
2024-01-18 08:51:02 +01:00
f59bc8d27f zwischenschritt 2024-01-18 08:49:43 +01:00
26b713309f Kommentieren 2024-01-18 08:43:18 +01:00
c5f7391631 Kinder und Eltern 2024-01-17 11:21:26 +01:00
17bf862890 Merge remote-tracking branch 'origin/master' into SvenAccountverwaltung 2024-01-17 10:35:37 +01:00
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
72a6d9a7e5 get ist jetzt String hehe 2024-01-17 10:30:11 +01:00
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
0326d80a21 Merge branch 'master' of https://git.bib.de/Subway-Surfers/VPR_App into Max_EssensverwaltungMitarbeiter 2024-01-15 08:29:18 +01:00
93a443ebe1 Merge remote-tracking branch 'origin/Max_EssensverwaltungMitarbeiter' into Max_EssensverwaltungMitarbeiter
# Conflicts:
#	.idea/misc.xml
#	src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
#	src/main/resources/de/subway_surfers/vpr_app/layout.css
2024-01-15 08:23:16 +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
412d9d7497 EssensverwaltungMitarbeiterView fertig 2023-12-20 08:25:05 +01:00