develop #50

Merged
vex merged 21 commits from develop into main 2025-05-01 14:29:43 +00:00

21 Commits

Author SHA1 Message Date
f29ff1a3f9 Merge branch 'main' into develop 2025-05-01 14:28:36 +00:00
95c2b8a60c Kommentar angepasst. 2025-05-01 15:11:42 +02:00
373d655bae - cleaned up and formatted code 2025-05-01 15:07:23 +02:00
535d6e0737 - cleaned up and formatted code 2025-05-01 14:55:53 +02:00
2fb193bac2 Merge pull request 'feature/scripts' (#49) from feature/scripts into develop
Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/49
2025-05-01 10:15:23 +00:00
286ffda457 Merge remote-tracking branch 'origin/develop' into login_function
# Conflicts:
#	public/registrieren/registrieren.html

- Cleaned up code
- Passwords are now encrypted in the database. Passwords of all pregenerated useres is "changeme"
2025-05-01 12:10:41 +02:00
79372d6b2e Merge remote-tracking branch 'origin/develop' into feature/scripts 2025-05-01 11:35:29 +02:00
2784c0f2c6 Merge pull request 'Route Kommentare hinzugefügt.' (#48) from feature/scripts_auslagern into develop
Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/48
2025-05-01 07:01:30 +00:00
bef2da62d4 Route Kommentare hinzugefügt. 2025-05-01 09:00:43 +02:00
b01a2fee0a Css angepasst. Login/Ausloggen funktionen hinzugefügt. 2025-05-01 00:29:00 +02:00
vex
52d30233fc - cleaned up unnecessary files
- preparation for encryption
2025-04-30 21:36:41 +02:00
6b4a600b7f Merge pull request 'Css angepasst. Ünnotiges Script gelöscht' (#47) from feature/css into develop
Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/47
2025-04-30 13:34:18 +00:00
4ca9ee39e7 Css angepasst. Ünnotiges Script gelöscht 2025-04-30 15:33:19 +02:00
8c3a6699db Merge pull request 'Css Anpassung' (#45) from feature/css into develop
Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/45
2025-04-30 09:07:43 +00:00
a75bd6ee5f Css angepasst. 2025-04-30 11:07:26 +02:00
693d87954c Css angepasst. 2025-04-30 11:04:59 +02:00
c586ce8b9d fixxed localstorage behaviour by logout 2025-04-30 10:09:34 +02:00
e25e2a1d05 Merge pull request 'feature/Warenkorb' (#44) from feature/Warenkorb into develop
Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/44
2025-04-30 06:45:30 +00:00
4113f06da3 Bestellformular gefixxed 2025-04-30 08:37:41 +02:00
6f8f4f65ba Bestellformular gefixxed 2025-04-30 08:36:48 +02:00
11f007066d Link im Header 2025-04-29 23:31:44 +02:00