Commit Graph

52 Commits

Author SHA1 Message Date
a6e7db75fd Merge remote-tracking branch 'origin/develop' into develop 2024-12-20 09:09:44 +01:00
ef7551d755 Merge branch 'feature/MissionController' into develop 2024-12-20 09:09:29 +01:00
ebeafaeeed Finished 2024-12-20 09:09:10 +01:00
ea41c3cccc Finished 2024-12-20 09:08:48 +01:00
be1bd0541c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	templates/category/index.html.twig
2024-12-20 09:04:49 +01:00
ffcdd46003 Merge branch 'feature/RideController' into develop 2024-12-20 09:03:40 +01:00
6763f991dd Should be done. 2024-12-20 09:02:51 +01:00
0f130c6453 CategoryController BackEnd 2024-12-06 11:35:23 +01:00
08ae5a6676 Fixed RepresentationController.php (Error : Employee would try to be changed into a string) 2024-12-06 09:04:28 +01:00
97f71e6e23 Fixed RepresentationController.php (Error : Employee would try to be changed into a string) 2024-12-06 08:57:54 +01:00
ebc0a27382 Ongoing - RepresentationController.php
Ongoing - AffectationController.php
2024-12-06 07:57:39 +01:00
5cde70a7b3 Form login, WIP 2024-12-05 16:44:09 +01:00
fab5249ac5 Merge branch 'feature/login' into develop 2024-11-28 16:49:04 +01:00
3f2fcfd269 login finished. 2024-11-28 16:48:02 +01:00
f38c5e4350 login finished. 2024-11-28 16:46:35 +01:00
3ab2ef5a9e login WIP astier 2024-11-28 15:00:06 +01:00
adbfe09f01 Merge branch 'feature/login' of https://gitea.btssio-poitiers.fr/astiery/HegreLand into feature/login 2024-11-28 14:42:17 +01:00
c60aa4c43a Form login, WIP 2024-11-28 14:41:12 +01:00
f71e0027eb MissionCategory.php 2024-11-28 14:40:56 +01:00
3a8d60fddb Rebase develop 2024-11-28 14:40:25 +01:00
5219334da2 EmployeeController.php done 2024-11-28 14:30:11 +01:00
136dc8367e Form login, WIP 2024-11-28 14:28:32 +01:00
de2ab661b5 Working on employee backend 2024-11-21 17:55:00 +01:00
e607897c5b Forgot to change the path of the repositories 2024-11-21 14:46:47 +01:00
57bd6c953e Regenerated Repositories 2024-11-21 14:45:51 +01:00
37812be99b Re-adding Repositories 2024-11-21 14:44:18 +01:00
ba7e152552 Edited base.html.twig 2024-11-14 14:19:23 +01:00
76b4d05620 Finished RelationService.php 2024-10-25 00:03:32 +02:00
e66a2510ca Finished RelationService.php 2024-10-24 23:58:15 +02:00
3b353cde0b Finished RelationService 2024-10-24 23:57:42 +02:00
17fd3ef23a MissionCategory.php 2024-10-17 17:17:21 +02:00
e7a9a3fd5c Pulled all changes from develop 2024-10-17 16:39:16 +02:00
2782b154ed Added some style.css 2024-10-17 16:37:01 +02:00
6dd6550292 Merge branch 'feature/dashboard' into develop 2024-10-17 14:40:59 +02:00
60d5ae04ac updated entities 2024-10-17 14:39:42 +02:00
6860e00bf8 first feature commit 2024-10-17 14:33:38 +02:00
922834da8a Removed extra OneToMany relations in 2024-10-10 14:43:50 +02:00
cbce2ca3c6 Added .idea/ to .gitignore 2024-10-03 17:41:16 +02:00
428ee14836 Supprimer .idea/vcs.xml 2024-10-03 17:39:49 +02:00
7a4c7aa01e Supprimer .idea/phpunit.xml 2024-10-03 17:39:46 +02:00
3ba44656b3 Supprimer .idea/php.xml 2024-10-03 17:39:42 +02:00
2dc0f69e4d Supprimer .idea/modules.xml 2024-10-03 17:39:39 +02:00
b8e03593af Supprimer .idea/HegreLand.iml 2024-10-03 17:39:35 +02:00
df69ccf634 Supprimer .idea/.gitignore 2024-10-03 17:39:25 +02:00
6903630012 Added getters & setters 2024-10-03 17:27:42 +02:00
f0c7c03b9b Finished entities 2024-10-03 17:23:04 +02:00
1531c122b8 Missing IncidentType & Incident + Mission & Category relations 2024-09-26 17:57:11 +02:00
BESBOT Axel
168ff58d15 added AffectationController IncidentController RepresentationController 2024-09-26 16:52:22 +02:00
e29b52cb83 pre git flow init 2024-09-26 15:49:16 +02:00
ASTIER Yann
340bab7c53 first commit 2024-09-26 15:36:56 +02:00