develop #41

vex · 2025-04-29T19:48:30Z

vex commented

2025-04-29 19:48:30 +00:00

No description provided.

vex added 21 commits 2025-04-29 19:48:31 +00:00

- changed the categories of the products to fit the theme e2a1fb9151

Code Kommentierung, Bestellformular angepasst. Code Anpassung. 39c5e58af4

Link im Header c70bc7c4e2

Merge branch 'develop' into db_testdata 6605455ce5

Merge pull request '- changed the categories of the products to fit the theme' (#37 ) from db_testdata into develop 482d7559d8

Reviewed-on: #37

Link im Header e3c6cfe5f5

- user registration passwords have to match in order to be able to register c6f33b142b

Link im Header e796b2eb41

Merge pull request 'Kommentieren' (#35 ) from Kommentieren into develop a83e97f075

Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/35

Merge remote-tracking branch 'origin/develop' into login_function c5b4aca426

# Conflicts:
#	public/registrieren/registrieren.html

warenkorb überarbeitet f99c8d11ab

Merge branch 'feature/Warenkorb' into develop ae6f31f982

reworked warenkorb c6cf3c39ed

Merge remote-tracking branch 'origin/develop' into login_function 1da3a53ee5

# Conflicts:
#	public/registrieren/registrieren.html

- Login / Logout button in header now acts as expected

html Kontakt spalte hinzugefügt 4ee49a70fd

html kontaktformular.html erstellt. 5bea7b14dd

Link im Header c04a6b0335

Merge pull request 'kontaktformular' (#39 ) from kontaktformular into develop fca329024a

Reviewed-on: https://gitea.vexhosting.dynv6.net/Berufsschule/Webshop/pulls/39

Merge remote-tracking branch 'origin/develop' into login_function d88761032a

Merge remote-tracking branch 'origin/develop' into login_function c4d922b903

# 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

Merge pull request 'login_function' (#40 ) from login_function into develop 8904a7cf90

Reviewed-on: https://gitea.vex-intern.de/Berufsschule/Webshop/pulls/40

vex added 1 commit 2025-04-29 19:48:38 +00:00

Merge branch 'main' into develop 9b61ac8633

vex merged commit 6c62b1034e into main

2025-04-29 19:48:45 +00:00

vex referenced this issue from a commit

2025-04-29 19:48:47 +00:00

Merge pull request 'develop' (#41) from develop into main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Berufsschule/Webshop#41