Commit graph

585 commits

Author SHA1 Message Date
Edwin S Lopez
040ec1d227
Merge e795fb6dd3 into e19048f5dd 2025-04-11 00:16:14 +00:00
Eddi3_As
e795fb6dd3 Merge remote-tracking branch 'ft_admin/main' into feature/gestion-admin 2025-04-10 20:14:43 -04:00
Eddi3_As
8d44d09c54 fixed tests 2025-04-10 19:18:52 -04:00
Eddi3_As
e0897ff536 ajout merge 2025-04-10 16:56:18 -04:00
NouhailaAater
e19048f5dd
Merge pull request #317 from ets-cfuhrman-pfe/editor-ux
Some checks failed
CI/CD Pipeline for Backend / build_and_push_backend (push) Failing after 1m2s
CI/CD Pipeline for Nginx Router / build_and_push_nginx (push) Failing after 1m3s
CI/CD Pipeline for Frontend / build_and_push_frontend (push) Failing after 19s
Tests / lint-and-tests (client) (push) Failing after 1m26s
Tests / lint-and-tests (server) (push) Failing after 1m8s
Amélioration ux
2025-04-09 15:47:50 -04:00
NouhailaAater
09ec127a76 Positionnement a gauche bouton quitter 2025-04-08 21:57:43 -04:00
NouhailaAater
911d051089 Merge branch 'main' of https://github.com/ets-cfuhrman-pfe/EvalueTonSavoir into editor-ux 2025-04-08 21:38:24 -04:00
NouhailaAater
ddf955a7a2 Amélioration page editor 2025-04-08 21:32:35 -04:00
NouhailaAater
51cebdaba1 deplacemnt delete 2025-04-08 19:35:55 -04:00
NouhailaAater
57c5321c09 Amélioration de la page dashboard 2025-04-08 19:34:27 -04:00
Christopher (Cris) Fuhrman
62df610d62
Merge pull request #313 from ets-cfuhrman-pfe/fuhrmanator/issue312
Some checks failed
CI/CD Pipeline for Backend / build_and_push_backend (push) Failing after 18s
CI/CD Pipeline for Nginx Router / build_and_push_nginx (push) Failing after 17s
CI/CD Pipeline for Frontend / build_and_push_frontend (push) Failing after 18s
Tests / lint-and-tests (client) (push) Failing after 1m5s
Tests / lint-and-tests (server) (push) Failing after 54s
Corrige problème avec l'URL générée pour les images dans la galerie
2025-04-07 22:07:04 -04:00
C. Fuhrman
f13b58d89b Use BACKEND_URL instead of IMG_URL
Fixes #312
2025-04-07 22:00:28 -04:00
C. Fuhrman
a66631c60b IMG_URL not needed finally (default to running server with relative URL) 2025-04-07 21:10:53 -04:00
Christopher (Cris) Fuhrman
5a5897d25c
Merge pull request #290 from ets-cfuhrman-pfe/feature/qr-code-url-generation
Some checks failed
CI/CD Pipeline for Backend / build_and_push_backend (push) Failing after 58s
CI/CD Pipeline for Nginx Router / build_and_push_nginx (push) Failing after 1m0s
CI/CD Pipeline for Frontend / build_and_push_frontend (push) Failing after 19s
Tests / lint-and-tests (client) (push) Failing after 1m32s
Tests / lint-and-tests (server) (push) Failing after 57s
Rejoindre une salle via un code QR
2025-04-07 20:14:10 -04:00
C. Fuhrman
20bfb8774f Merge remote-tracking branch 'origin/main' into feature/qr-code-url-generation 2025-04-07 20:08:33 -04:00
NouhailaAater
36b5c58b94 Small UX update 2025-04-07 19:44:03 -04:00
Christopher (Cris) Fuhrman
40aee9aa89
Merge pull request #288 from ets-cfuhrman-pfe/feature/gestion-images
Some checks failed
CI/CD Pipeline for Backend / build_and_push_backend (push) Failing after 1m2s
CI/CD Pipeline for Nginx Router / build_and_push_nginx (push) Failing after 1m1s
CI/CD Pipeline for Frontend / build_and_push_frontend (push) Failing after 18s
Tests / lint-and-tests (client) (push) Failing after 1m29s
Tests / lint-and-tests (server) (push) Failing after 1m3s
Feature/gestion images
2025-04-07 15:50:15 -04:00
C. Fuhrman
c13e73208e franciser, npm audit fix 2025-04-07 15:43:41 -04:00
C. Fuhrman
f28bd90c6e Merge remote-tracking branch 'origin/main' into feature/gestion-images 2025-04-07 15:16:17 -04:00
Christopher (Cris) Fuhrman
7a8ab7e5f5
Merge pull request #266 from ets-cfuhrman-pfe/philippe/partage_quiz
Some checks failed
CI/CD Pipeline for Backend / build_and_push_backend (push) Failing after 3m26s
CI/CD Pipeline for Nginx Router / build_and_push_nginx (push) Failing after 1m2s
CI/CD Pipeline for Frontend / build_and_push_frontend (push) Failing after 18s
Tests / lint-and-tests (client) (push) Failing after 1m28s
Tests / lint-and-tests (server) (push) Failing after 1m4s
Philippe/partage quiz
2025-04-07 15:07:10 -04:00
Christopher (Cris) Fuhrman
42c0bee527
Merge pull request #304 from ets-cfuhrman-pfe/feature/finish-quiz-button
Ajout du bouton "Terminer le quiz"
2025-04-07 14:50:10 -04:00
NouhailaAater
1de68418e0 correction 2025-04-06 23:19:34 -04:00
Eddi3_As
10169b93f1 ajout isadmin check 2025-04-02 20:40:36 -04:00
Eddi3_As
0ae9791e5b added missing types tests 2025-03-30 18:32:39 -04:00
Eddi3_As
3f9d53eb5e added admintable component test 2025-03-30 18:05:06 -04:00
Eddi3_As
b4d981527c added todo test 2025-03-28 22:57:45 -04:00
Eddi3_As
3071e2e26c missing file 2025-03-28 22:56:39 -04:00
Eddi3_As
09f7af313c added tests 2025-03-28 22:39:44 -04:00
Eddi3_As
8daef780d3 FIX cards au lieu de gauge 2025-03-28 20:55:14 -04:00
Eddi3_As
8f6cf8cffa ajustement route 2025-03-27 19:51:30 -04:00
Eddi3_As
9205c0c6bf FIX test changement espacement 2025-03-27 19:24:18 -04:00
Eddi3_As
8e999dc10f Merge branch 'feature/gestion-images' of https://github.com/ets-cfuhrman-pfe/EvalueTonSavoir into feature/gestion-images 2025-03-27 19:19:27 -04:00
Eddi3_As
d0328f9ec8 FIX ajustement gallery demandés 2025-03-27 19:18:43 -04:00
Philippe
61bf9b9d86 lint ShareQuizService.test.tsx 2025-03-24 17:05:01 -04:00
Philippe
a26ffa2880 test for already existing quizzes trying to be imported 2025-03-24 16:56:46 -04:00
Philippe
95f914ce3e share by email code and tests removed 2025-03-24 16:42:41 -04:00
Philippe
46c17ba127 new changes with tests 2025-03-24 16:34:55 -04:00
NouhailaAater
74764ee695 Test 2025-03-24 03:00:05 -04:00
NouhailaAater
6600da990b Add Finish Quiz button 2025-03-24 02:52:41 -04:00
NouhailaAater
7c7fe031f8 Résolution des conflits avec main 2025-03-24 00:08:34 -04:00
C. Fuhrman
aa739233dd Merge branch 'main' into feature/gestion-images 2025-03-22 16:15:25 -04:00
C. Fuhrman
0d7b6ee5eb Node 22 server 2025-03-22 16:14:12 -04:00
C. Fuhrman
d5733fa728 Merge branch 'main' into philippe/partage_quiz 2025-03-22 15:28:52 -04:00
Eddi3_As
78e398ecd8 ajout test ImageGalleryModal 2025-03-22 03:49:28 -04:00
Eddi3_As
755d14a5b7 ajout dernier tests 2025-03-21 23:29:20 -04:00
Eddi3_As
1a7dc7fec2 ajout tests 2025-03-21 15:24:21 -04:00
Christopher (Cris) Fuhrman
ee7a7a0544
Update README.md
Some checks failed
CI/CD Pipeline for Backend / build_and_push_backend (push) Failing after 20s
CI/CD Pipeline for Nginx Router / build_and_push_nginx (push) Failing after 18s
CI/CD Pipeline for Frontend / build_and_push_frontend (push) Failing after 19s
Tests / lint-and-tests (client) (push) Failing after 1m10s
Tests / lint-and-tests (server) (push) Failing after 57s
fix link
2025-03-21 13:15:20 -04:00
Christopher (Cris) Fuhrman
8c57a8759f
Merge pull request #302 from ets-cfuhrman-pfe/Multilingual-readme
Update readme (bilingual)
2025-03-21 13:11:55 -04:00
C. Fuhrman
22a2754e31 Update readme (bilingual) 2025-03-21 11:58:44 -04:00
C. Fuhrman
3d9015febd Fix bug with multiple choice (radio vs checkbox)
Some checks failed
CI/CD Pipeline for Backend / build_and_push_backend (push) Failing after 18s
CI/CD Pipeline for Nginx Router / build_and_push_nginx (push) Failing after 17s
CI/CD Pipeline for Frontend / build_and_push_frontend (push) Failing after 18s
Tests / lint-and-tests (client) (push) Failing after 57s
Tests / lint-and-tests (server) (push) Failing after 1m2s
Snapshot update
2025-03-21 11:25:06 -04:00