Commit Graph

106 Commits

Author SHA1 Message Date
329acaabcb Merge pull request 'WIP_Objects' (#5) from WIP_Objects into main
Reviewed-on: #5
2023-01-30 14:14:03 +01:00
5447d7f238 Merge branch 'main' into WIP_Objects 2023-01-30 14:13:50 +01:00
e3c6513ebb „.idea/vcs.xml“ löschen 2023-01-30 14:13:10 +01:00
3f7fb06e1b „.idea/uiDesigner.xml“ löschen 2023-01-30 14:13:04 +01:00
318e1ef065 „.idea/misc.xml“ löschen 2023-01-30 14:12:59 +01:00
43a4e2aa85 „.idea/encodings.xml“ löschen 2023-01-30 14:12:54 +01:00
741b4892b8 „.idea/.gitignore“ löschen 2023-01-30 14:12:47 +01:00
50e0118ded small fix 2023-01-30 14:04:59 +01:00
2d91259953 StartViewApplication ist die Startpunkt des Projekt 2023-01-30 14:01:33 +01:00
53c603249d StartViewApplication ist die Startpunkt des Projekt 2023-01-30 14:01:19 +01:00
81bcb44d74 most Objects done 2023-01-30 04:26:30 +01:00
a0eed3ce51 Food, User 2023-01-27 15:14:36 +01:00
b97fe83f40 Merge pull request 'Richards_Branch' (#4) from Richards_Branch into main 2023-01-23 08:59:53 +01:00
27710e92af Merge branch 'main' into Richards_Branch 2023-01-23 08:59:38 +01:00
a3c3ee0fe0 Login und SingUp aktuallisiert 2023-01-18 22:32:38 +01:00
pbs2h21asc
dd69909b16 Views erstellt 2023-01-18 13:22:05 +01:00
a7bcaf13ce css + png hinzugefügt 2023-01-18 02:41:25 +01:00
f8673ca92a Views hinzugefügt 2023-01-18 02:39:17 +01:00
400ffb0e98 ParetSence 2023-01-17 22:30:56 +01:00
3bb141fb52 Views & Controller erstellt 2023-01-17 15:58:22 +01:00
ec2d3b581d fixed salt 2023-01-17 13:47:24 +01:00
e245233a23 fixed the mess 2023-01-17 08:47:09 +01:00
074107752d LoginView überarbeitet 2023-01-16 23:25:58 +01:00
8634df0d6d LoginView überarbeitet 2023-01-16 23:09:16 +01:00
8ce8c027c8 test 2023-01-16 18:37:39 +01:00
1194b163fa login view
menue view
MenueController
2023-01-16 18:06:54 +01:00
f072cc9f66 Merge remote-tracking branch 'origin/main' 2023-01-16 18:02:45 +01:00
438d18e378 salz 2023-01-16 17:23:25 +01:00
7d0855be4e Merge remote-tracking branch 'origin/main' 2023-01-16 16:58:57 +01:00
c93489d014 zeile 15 wurde geändert 2023-01-16 16:58:44 +01:00
0fcc477613 Merge pull request 'von der Wiege bis zur Bahre, Kommentare, Kommentare' (#3) from MaltesConsolenEcke into main
Reviewed-on: #3
2023-01-16 16:38:07 +01:00
0dcec76379 von der Wiege bis zur Bahre, Kommentare, Kommentare 2023-01-16 16:35:45 +01:00
9b040cd779 Merge pull request 'MaltesConsolenEcke' (#2) from MaltesConsolenEcke into main
works on my machine
2023-01-12 15:59:04 +01:00
573e17161b added invoice and order collection 2023-01-07 23:14:41 +01:00
58fb02875a added missing functionality 2023-01-06 01:51:42 +01:00
89ea9ca70e basic encryption 2023-01-06 00:02:06 +01:00
c4b31bc548 did some stuff 2023-01-05 05:06:19 +01:00
e16f0342a7 frohes Neues 2023-01-01 15:03:21 +01:00
31b6b2cc39 Username und Passwort 2022-12-22 02:02:19 +01:00
d1737b730f Merge pull request 'db' (#1) from db into main
Reviewed-on: #1
2022-12-20 15:24:58 +01:00
0a8e052582 filled food_type and allergy
created generic insert
2022-12-19 17:31:06 +01:00
8478b80407 created tables 2022-12-15 09:26:08 +01:00
83507bef98 made program executable 2022-12-13 03:35:52 +01:00
18d812e1a2 moved dbconnection to own class 2022-12-12 14:03:49 +01:00
79aaa3fe85 db setup //runable 2022-11-29 22:45:05 +01:00
d5d98fde7a db setup 2022-11-29 22:35:12 +01:00
efd2657ef4 zeile 15 wurde geändert 2022-11-24 15:11:43 +01:00
eeca53fc25 rm test 2022-11-23 14:03:10 +01:00
9178db8a8d Merge remote-tracking branch 'origin/main' into main 2022-11-16 08:40:35 +01:00
e23937c4f6 Hello word 2022-11-16 08:39:41 +01:00