9b61ac8633
Merge branch 'main' into develop
2025-04-29 19:48:35 +00:00
8904a7cf90
Merge pull request 'login_function' ( #40 ) from login_function into develop
...
Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/40
2025-04-29 19:20:51 +00:00
c4d922b903
Merge remote-tracking branch 'origin/develop' into login_function
...
# Conflicts:
# public/registrieren/registrieren.html
- Cleaned up code
- Added a specific error if e-mail that are already registered are tried to register again
- fields in the registration form cant be empty
- email input in registration form is now html type email
- fields in login form cant be empty
- email input on login form is now html type email
2025-04-29 21:18:10 +02:00
d88761032a
Merge remote-tracking branch 'origin/develop' into login_function
2025-04-29 20:46:24 +02:00
fca329024a
Merge pull request 'kontaktformular' ( #39 ) from kontaktformular into develop
...
Reviewed-on: #39
2025-04-29 18:42:49 +00:00
c04a6b0335
Link im Header
2025-04-29 20:41:53 +02:00
5bea7b14dd
html kontaktformular.html erstellt.
2025-04-29 20:28:13 +02:00
4ee49a70fd
html Kontakt spalte hinzugefügt
2025-04-29 20:02:29 +02:00
1da3a53ee5
Merge remote-tracking branch 'origin/develop' into login_function
...
# Conflicts:
# public/registrieren/registrieren.html
- Login / Logout button in header now acts as expected
2025-04-29 19:43:36 +02:00
c6cf3c39ed
reworked warenkorb
2025-04-29 14:45:07 +02:00
ae6f31f982
Merge branch 'feature/Warenkorb' into develop
2025-04-29 14:35:47 +02:00
f99c8d11ab
warenkorb überarbeitet
2025-04-29 14:29:12 +02:00
c5b4aca426
Merge remote-tracking branch 'origin/develop' into login_function
...
# Conflicts:
# public/registrieren/registrieren.html
2025-04-29 13:59:32 +02:00
a83e97f075
Merge pull request 'Kommentieren' ( #35 ) from Kommentieren into develop
...
Reviewed-on: #35
2025-04-29 10:55:10 +00:00
e796b2eb41
Link im Header
2025-04-29 12:51:45 +02:00
c6f33b142b
- user registration passwords have to match in order to be able to register
2025-04-29 12:50:58 +02:00
e3c6cfe5f5
Link im Header
2025-04-29 12:50:48 +02:00
482d7559d8
Merge pull request '- changed the categories of the products to fit the theme' ( #37 ) from db_testdata into develop
...
Reviewed-on: #37
2025-04-29 08:09:42 +00:00
6605455ce5
Merge branch 'develop' into db_testdata
2025-04-29 08:07:36 +00:00
c70bc7c4e2
Link im Header
2025-04-28 09:47:06 +02:00
39c5e58af4
Code Kommentierung, Bestellformular angepasst. Code Anpassung.
2025-04-28 09:05:28 +02:00
e2a1fb9151
- changed the categories of the products to fit the theme
2025-04-26 18:16:34 +02:00
