|
|
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 |
|
|
|
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 |
|
Avapox
|
287ccd9ce5
|
Merge remote-tracking branch 'origin/master' into stefan
|
2024-01-18 10:32:21 +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 |
|
Avapox
|
8dfe6547c9
|
Test
|
2024-01-15 08:49:53 +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 |
|
