Commit Graph

108 Commits

Author SHA1 Message Date
Arnaud Delcasse 03b9044ffc Merge branch 'main' into spie06 2023-04-12 22:21:43 +02:00
Arnaud Delcasse d6de19d8e2 Add exports 2023-04-12 22:21:25 +02:00
Arnaud Delcasse 0ecee50d1c Merge branch 'main' into spie06 2023-04-12 10:55:41 +02:00
Arnaud Delcasse 39e770bb09 Bookings list in admin 2023-04-12 10:52:29 +02:00
Arnaud Delcasse 96205b81df Merge branch 'main' into spie06 2023-03-15 16:48:27 +01:00
Arnaud Delcasse a11ed1c595 Fix document update issue 2023-03-15 16:48:09 +01:00
Arnaud Delcasse ea71e44837 Merge branch 'main' into spie06 2023-03-13 16:58:35 +01:00
Arnaud Delcasse 9f4d331959 small fix 2023-03-13 16:58:13 +01:00
Arnaud Delcasse 1da9c68690 Merge branch 'main' into spie06 2023-03-13 16:31:26 +01:00
Arnaud Delcasse 2f49d003ee small fix 2023-03-13 16:31:03 +01:00
Arnaud Delcasse a548f50234 Merge branch 'main' into spie06 2023-03-13 16:22:58 +01:00
Arnaud Delcasse 2248bd8425 add group management 2023-03-13 16:22:44 +01:00
Arnaud Delcasse 2ea7cf99f6 Merge branch 'main' into spie06 2023-03-10 15:44:01 +01:00
Arnaud Delcasse 139b4c9c14 Add licence plate 2023-03-10 15:43:46 +01:00
Arnaud Delcasse 2056bc72e2 Merge branch 'main' into spie06 2023-03-10 14:52:58 +01:00
Arnaud Delcasse 072eb62d63 Remove Voitures disponibles 2023-03-10 14:52:30 +01:00
Arnaud Delcasse dbeac9bec7 Merge branch 'spie06' of https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme into spie06 2023-03-10 13:20:42 +01:00
Arnaud Delcasse 388b6366df Merge branch 'main' into spie06 2023-03-10 13:20:22 +01:00
Arnaud Delcasse 0c77e5054a small updates after merge 2023-03-10 13:20:03 +01:00
soukainna 7c620ba09a Merge branch 'dev' into spie06 2023-03-08 10:35:39 +01:00
Nicolas CARON b89b8064c5 edit vehicles-list to fix viewing status problems 2023-03-08 10:09:49 +01:00
soukainna 0f4d0e1e5b fix the break err 2023-03-06 10:49:24 +01:00
soukainna 583027422c Merge branch 'addStatistiques' into dev 2023-03-06 10:39:38 +01:00
soukainna a36827a6ff add vehicles status in stat 2023-03-06 10:22:25 +01:00
Nicolas CARON ad7f5b642e Sow status of vehicle in vehicles list 2023-03-03 16:58:47 +01:00
Nicolas CARON 193bd8ef3a add 'Retiré' in 'Statut Réservation' for some case 2023-03-03 13:16:26 +01:00
Nicolas CARON 332d9dd509 add 'Disponible' for 'Statut Réservation' for some case 2023-03-03 11:39:37 +01:00
soukainna 511baa6a8e modify config 2023-02-27 15:10:49 +01:00
soukainna 031ef7b924 put organisation info 2023-02-27 14:55:23 +01:00
soukainna fc60854e21 add members stats 2023-02-27 14:16:01 +01:00
soukainna afc403bded add vehicles stats 2023-02-27 14:15:02 +01:00
soukainna e0fd3aa510 fix events stats 2023-02-27 14:14:08 +01:00
soukainna 33c182574c add events stats 2023-02-27 14:10:26 +01:00
soukainna 274f6c1616 add beneficaires stats 2023-02-27 14:09:57 +01:00
soukainna 675974a9e7 add config stats 2023-02-27 14:09:30 +01:00
soukainna 612f74202d remove sup button 2023-02-24 18:50:26 +01:00
soukainna 6ccb72e566 drop my comment 2023-02-24 18:49:13 +01:00
soukainna ea4eea03da delete some logs 2023-02-24 18:47:58 +01:00
Nicolas CARON bb70ed9136 edit design in template vehicles-list 2023-02-24 17:23:27 +01:00
Nicolas CARON c450eecc37 display all status for vehicles list - statut 'Disponible' for a new vehicle 2023-02-24 16:04:01 +01:00
Nicolas CARON 59950586ec showing 1 statut for vehicles-list 2023-02-24 13:51:25 +01:00
Nicolas CARON c16e27fb25 showing all statuts for vehicle 2023-02-24 10:53:27 +01:00
Nicolas CARON 361447f188 add 'statut' on vehicles-list template 2023-02-23 16:46:56 +01:00
Nicolas CARON 70ad96a4e8 add 'statut' on vehicles-list template 2023-02-23 16:46:38 +01:00
Nicolas CARON e43e23353a edit mail for the prescipteur when a beneficiary is delete 2023-02-23 12:37:11 +01:00
soukainna a2f9184e22 fix profile err 2023-02-23 09:52:02 +01:00
soukainna 3a58b63edd Merge branch 'addInfoInCovoiturage' into dev 2023-02-22 12:38:20 +01:00
soukainna 0867a13df7 Merge branch 'modifyAnEvent' into dev 2023-02-22 12:33:44 +01:00
soukainna 5ffb2bcf85 add file unbloking 2023-02-22 12:23:10 +01:00
Nicolas CARON bee362342c sending mail to the prescripteur 2023-02-22 11:57:21 +01:00