Commit Graph
22 Commits
Author SHA1 Message Date
PBS2H22AAL c6b4bc1cd1 Inhaltsstoffe in Filter Maske anzeigen 2024-01-23 14:58:19 +01:00
PBS2H22AAL 450e08b8e7 Ein Push, sie alle zu knechten 2024-01-23 11:09:56 +01:00
PBS2H22AAL c182bd5714 Merge branch 'AccountsUeberarbeiten' 2024-01-19 10:27:54 +01:00
PBS2H22AAL c358366869 Kommentiert und getestet 2024-01-19 10:27:20 +01:00
PBS2H22AAL 39b9266067 Account laden 2024-01-18 13:01:01 +01:00
PBS2H22AAL 1db44e7b22 Merge branch 'SvenAccountverwaltung'
# Conflicts:
#	src/main/java/de/subway_surfers/vpr_app/AccounterstellungMitarbeiter.java
2024-01-18 08:51:02 +01:00
PBS2H22AAL f59bc8d27f zwischenschritt 2024-01-18 08:49:43 +01:00
PBS2H22AAL 26b713309f Kommentieren 2024-01-18 08:43:18 +01:00
PBS2H22AAL c5f7391631 Kinder und Eltern 2024-01-17 11:21:26 +01:00
PBS2H22AAL 17bf862890 Merge remote-tracking branch 'origin/master' into SvenAccountverwaltung 2024-01-17 10:35:37 +01:00
PBS2H22AAL 92d62509de Merge remote-tracking branch 'origin/master' into SvenAccountverwaltung
# Conflicts:
#	src/main/java/RestAPISchnittstelle/RestApiClient.java
2024-01-17 10:26:10 +01:00
PBS2H22AAL 4780f4403b KinderErstellen 2024-01-13 14:29:57 +01:00
PBS2H22AAL 8e1084f034 Merge remote-tracking branch 'origin/master' into SvenAccountverwaltung
# Conflicts:
#	src/main/java/RestAPISchnittstelle/RestApiClient.java
2024-01-11 12:11:11 +01:00
PBS2H22AAL 042c78e0d4 zwischenschritt 2024-01-11 12:10:07 +01:00
PBS2H22AAL 2a3ac1498b zwischenschritt 2024-01-08 09:18:25 +01:00
PBS2H22AAL eddd8d14dd Danke Max, dass ich deine Arbeit erledigen darf. :3 2023-12-20 08:34:58 +01:00
PBS2H22AAL 8dd43b212e Einbindung Filter in Gerichtsverwaltung 2023-12-20 08:30:57 +01:00
PBS2H22AAL 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
PBS2H22AAL 4ce1fa5204 Einbindung Filter in Gerichtsverwaltung 2023-12-19 12:16:53 +01:00
PBS2H22AAL ce161a6caf Merge pull request 'AccounterstellungVornameUndNachname' (#5) from KindImplementierung into master
Reviewed-on: #5
2023-12-13 08:16:44 +01:00
PBS2H22AAL 2cc99c5cca Merge pull request 'svenAccounterstellung' (#3) from svenAccounterstellung into master
Reviewed-on: #3
2023-12-12 12:28:11 +01:00
PBS2H22AAL 4bc951b162 Merge pull request 'Wechslen zwischen Szenen und login / hauptmenue Maske für Mitarbeiter' (#2) from sven into master
Reviewed-on: #2
2023-12-11 11:28:05 +01:00