[PR #24] [MERGED] Merge the main in the Felix Branche #24

New issue

Closed

opened 2026-05-06 12:22:29 +02:00 by BreizhHardware · 0 comments

BreizhHardware commented

2026-05-06 12:22:29 +02:00

Owner

📋 Pull Request Information

Original PR: https://github.com/YanisRff/ProjetS3PHP/pull/24
Author: @BreizhHardware
Created: 1/7/2024
Status: ✅ Merged
Merged: 1/7/2024
Merged by: @BreizhHardware

Base: Felix ← Head: main

📝 Commits (10+)

2a3a367 signup.php finito pipo
1d6ed56 Merge remote-tracking branch 'origin/Yanis'
2ad44c2 Merge pull request #20 from YanisRff/main
67c7fd1 Merge pull request #21 from YanisRff/Yanis
35792c3 Merge remote-tracking branch 'origin/main'
09aa128 almost finished rdv.php Just a problem with the upload of a file and with "deplacer un rdv"
e8b86c2 Merge pull request #22 from YanisRff/Yanis
5066636 Merge remote-tracking branch 'origin/main'
171695c Just pour le dossier
2005c8a Merge pull request #23 from YanisRff/Yanis

📊 Changes

7 files changed (+351 additions, -332 deletions)

View changed files

➕ errorAuth.php (+22 -0)
📝 rdv-praticien.php (+60 -234)
📝 rdv.php (+157 -98)
➕ src/php/db/Rdv.php (+69 -0)
➕ src/php/db/scripts/CancelRDV.php (+27 -0)
➕ src/php/db/scripts/uploadFile.php (+16 -0)
➕ src/uploadFiles/JustToBeHere.pdf (+0 -0)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/YanisRff/ProjetS3PHP/pull/24 **Author:** [@BreizhHardware](https://github.com/BreizhHardware) **Created:** 1/7/2024 **Status:** ✅ Merged **Merged:** 1/7/2024 **Merged by:** [@BreizhHardware](https://github.com/BreizhHardware) **Base:** `Felix` ← **Head:** `main` --- ### 📝 Commits (10+) - [`2a3a367`](https://github.com/YanisRff/ProjetS3PHP/commit/2a3a367ce4dfbc5873eab657d3f429bc0afd83e8) signup.php finito pipo - [`1d6ed56`](https://github.com/YanisRff/ProjetS3PHP/commit/1d6ed562bd4266711a2a1351518cf70a1d923805) Merge remote-tracking branch 'origin/Yanis' - [`2ad44c2`](https://github.com/YanisRff/ProjetS3PHP/commit/2ad44c26bce3344bdd0409a9da0adb74cdf85b0f) Merge pull request #20 from YanisRff/main - [`67c7fd1`](https://github.com/YanisRff/ProjetS3PHP/commit/67c7fd103da732db04804e75f52063c8e60f1f46) Merge pull request #21 from YanisRff/Yanis - [`35792c3`](https://github.com/YanisRff/ProjetS3PHP/commit/35792c32da43863d3cc6d5636e13866fa7de3f49) Merge remote-tracking branch 'origin/main' - [`09aa128`](https://github.com/YanisRff/ProjetS3PHP/commit/09aa128ba4904429eae6bd8b5c2e103bcdcbf7ee) almost finished rdv.php Just a problem with the upload of a file and with "deplacer un rdv" - [`e8b86c2`](https://github.com/YanisRff/ProjetS3PHP/commit/e8b86c243eb5314a8225af920a1c1c04e7d29553) Merge pull request #22 from YanisRff/Yanis - [`5066636`](https://github.com/YanisRff/ProjetS3PHP/commit/506663694c46e39950f976478cf5343a5958056c) Merge remote-tracking branch 'origin/main' - [`171695c`](https://github.com/YanisRff/ProjetS3PHP/commit/171695cb6a4307c8ae5cb7f010f81e5f550996aa) Just pour le dossier - [`2005c8a`](https://github.com/YanisRff/ProjetS3PHP/commit/2005c8ad00f1a4b7b2ecffa0579b41258cace83e) Merge pull request #23 from YanisRff/Yanis ### 📊 Changes **7 files changed** (+351 additions, -332 deletions) <details> <summary>View changed files</summary> ➕ `errorAuth.php` (+22 -0) 📝 `rdv-praticien.php` (+60 -234) 📝 `rdv.php` (+157 -98) ➕ `src/php/db/Rdv.php` (+69 -0) ➕ `src/php/db/scripts/CancelRDV.php` (+27 -0) ➕ `src/php/db/scripts/uploadFile.php` (+16 -0) ➕ `src/uploadFiles/JustToBeHere.pdf` (+0 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>