Commit graph

198 commits

Author SHA1 Message Date
Yass
2d9e88f570
Merge branch 'main' into laura 2026-02-25 15:31:19 +01:00
laura.chevillet
4d834823e7 Merge branch 'laura' of https://github.com/Yasder5/projet_php into laura 2026-02-25 15:28:27 +01:00
Yasder5
cf19a5be07 ca va pas ce soir 2026-02-24 20:11:17 +01:00
Yasder5
4d057ecf12 jsuis vraiment un bouffon 2026-02-24 20:06:30 +01:00
Yasder5
976bf2c848 correction erreur de merge 2026-02-24 20:01:12 +01:00
Yass
1b8f1d7fef
Merge pull request #30 from Yasder5/yass
Yass
2026-02-24 19:58:28 +01:00
Yass
6ae6dff302
Merge branch 'main' into yass 2026-02-24 19:58:20 +01:00
Yasder5
1b7527ab66 changement plus coherent 2026-02-24 19:55:58 +01:00
Yasder5
0c6088d4da ce souvenir lors de la connexion 2026-02-24 19:42:05 +01:00
Yasder5
485641ed6d display qui etait kc 2026-02-24 16:18:20 +01:00
Yass
46c6d53651
Merge pull request #29 from Yasder5/besnik
Besnik
2026-02-24 16:15:09 +01:00
Yass
0a09ed66fc
Merge branch 'main' into besnik 2026-02-24 16:15:00 +01:00
Yasder5
1d0fd2acff merge guillaume->main 2026-02-24 15:34:17 +01:00
GuillaumeH-Cci
374085d0fe Fonctionnalité de modification/ajout de projet terminer 2026-02-24 15:22:22 +01:00
Bess1k
db1c382d8d
Update project_display.tpl 2026-02-24 14:26:55 +01:00
Yasder5
a524946d6a fix lien display 2026-02-24 14:16:57 +01:00
Yasder5
9f69345f42 merge laura->main 2026-02-24 13:57:21 +01:00
laura.chevillet
c0dd044c57 Merge branch 'laura' of https://github.com/Yasder5/projet_php into laura 2026-02-24 13:20:42 +01:00
Bess1k
3cda2f0b85
Update footer.tpl 2026-02-24 13:11:43 +01:00
Bess1k
7a34954e74
Update project_display.tpl 2026-02-24 13:10:46 +01:00
Bess1k
4d9703fdec
Update search.tpl 2026-02-24 13:10:04 +01:00
Bess1k
6c0475d26c
Affiche titre header.tpl 2026-02-24 13:09:14 +01:00
Bess1k
197aba7c61
Add files via upload 2026-02-24 13:06:09 +01:00
Bess1k
fe300a6591
Afiche titre mentions.tpl 2026-02-24 13:05:31 +01:00
Bess1k
2edc3fde76
Add files via upload 2026-02-24 13:04:09 +01:00
Bess1k
778f6dd48d
Delete views/inscription.tpl 2026-02-24 13:03:14 +01:00
Bess1k
4d68b83e97
Ajouter le titre dans browser.tpl 2026-02-24 13:02:48 +01:00
laura.chevillet
c62302dc37 modif recherche requete préparée et ajout confirmation suppression projet 2026-02-24 13:02:23 +01:00
Bess1k
e7830a516a
Changer le regex, et ranger les fonctions.php 2026-02-24 13:01:13 +01:00
Yasder5
ebca120979 la page about en plus hehe 2026-02-24 08:54:45 +01:00
Yasder5
031d5a94b6 ajout placebo quand pas photo profile 2026-02-23 23:55:55 +01:00
Yasder5
f5244f903e Merge branch 'main' of https://github.com/Yasder5/projet_php 2026-02-23 21:10:43 +01:00
Yasder5
b5ca7b1d4d okllllmmmm 2026-02-23 21:09:55 +01:00
Yass
ad9c8a854b
Update link for 'À propos' in header template 2026-02-23 21:00:54 +01:00
Yasder5
42a41e5359 j'ai oublié un lien oopsi 2026-02-23 20:48:57 +01:00
Yasder5
5dbda3a6a0 aaaaaaaaaaaaaaaaaaaaaaaaaa 2026-02-23 20:23:50 +01:00
Yasder5
47d9dc54e6 avec les bon chemins c'est mieux 2026-02-23 20:10:04 +01:00
Yasder5
fafe560571 bug serveur linux regler 2026-02-23 20:08:07 +01:00
Yasder5
566e69e10b test erreur serveur 2026-02-23 20:01:27 +01:00
Yasder5
1b6ed09158 oopsi j'ai pas bien merge 2026-02-23 19:58:22 +01:00
Yass
d5f740687d
Merge pull request #28 from Yasder5/yass
Yass
2026-02-23 19:46:46 +01:00
Yass
750b5715bc
Merge branch 'main' into yass 2026-02-23 19:46:39 +01:00
Yass
4e562b7fc3
Delete templates_c directory 2026-02-23 19:45:08 +01:00
Yasder5
fed88a764b oops j'ai oublié de push 2026-02-23 19:43:44 +01:00
Yasder5
d1e2bd6c31 correction bug manque phpmailer 2026-02-20 18:20:01 +01:00
Yass
18301190fc
Merge pull request #26 from Yasder5/besnik
Besnik
2026-02-20 17:11:59 +01:00
Yasder5
1648e2bf46 Resolve merge conflicts 2026-02-20 17:10:59 +01:00
Yass
e526c13414
Merge pull request #24 from Yasder5/laura
Page aide utilisateur ok
2026-02-20 17:01:53 +01:00
Yass
99aff29504
Merge branch 'main' into laura 2026-02-20 17:01:46 +01:00
Yass
534b7faa74
Merge pull request #23 from Yasder5/guillaume
Guillaume
2026-02-20 16:56:29 +01:00