145 Commits

Author SHA1 Message Date
Allan Cueff
1a5d95ede2 red for eliminated teams 2023-11-07 19:40:55 +01:00
Allan Cueff
cb223c139a fix num of teams 2023-11-07 19:32:40 +01:00
c150792a7a Fix when a match is finish move to the bottom V2 2023-11-07 19:16:08 +01:00
c6415ffec0 Fix when a match is finish move to the bottom 2023-11-07 19:10:44 +01:00
13f52983d8 Fix when a new match start change waiting match status 2023-11-07 19:05:11 +01:00
1dffbbad68 Merge remote-tracking branch 'origin/main' 2023-11-07 18:52:46 +01:00
68d67ba4f0 Put the finished match at the end of the page 2023-11-07 18:52:38 +01:00
Allan Cueff
8e951927d5 Merge branch 'main' of https://github.com/appen-isen/site-interpromo-2023 2023-11-07 18:18:13 +01:00
Allan Cueff
fa00a89685 hotfix sport id poules multiples 2023-11-07 18:18:08 +01:00
1175cd243a Merge remote-tracking branch 'origin/main'
# Conflicts:
#	Front/js/backend/match.js
2023-11-07 18:16:17 +01:00
80f7bb62de FIX 2023-11-07 18:15:32 +01:00
Allan Cueff
5d655c43ed print tableau 2023-11-07 15:46:41 +01:00
6b0932f4af Merge remote-tracking branch 'origin/main' 2023-11-07 12:06:13 +01:00
57ff1ff228 Fix mode don't show when add a match from web interface 2023-11-07 12:06:06 +01:00
Allan Cueff
c8b606b051 add icons + finish sports page 2023-11-07 01:12:57 +01:00
2f0aef3a24 Merge remote-tracking branch 'origin/main' 2023-11-06 23:42:00 +01:00
023b596f56 Fix list of match don't show if link was not index.html 2023-11-06 23:40:25 +01:00
Allan Cueff
0b7b2c3d29 fix page teams bitée par un merge 2023-11-06 23:33:15 +01:00
Félix MARQUET
405f09aeb8 Merge pull request #12 from appen-isen/classementv2
Yolo on push sans tester (on a tester au final)
2023-11-06 21:05:27 +01:00
Félix MARQUET
b788c7c7c4 Merge branch 'main' into classementv2 2023-11-06 21:05:11 +01:00
74bc3540d8 Merge branch 'classementv2' of https://github.com/appen-isen/site-interpromo-2023 into classementv2 2023-11-06 21:02:15 +01:00
d957ce7619 Fix classement by using async function 2023-11-06 21:02:12 +01:00
Allan Cueff
b0cb17a95d classement for teams 2023-11-06 20:56:38 +01:00
Allan Cueff
dfb7ed399c corrections 2023-11-06 20:45:49 +01:00
eb4fa106cd Fix missing let 2023-11-06 20:22:06 +01:00
Allan Cueff
7de229b66e new classement & mode tournois 2023-11-06 20:15:58 +01:00
Allan Cueff
560fb2677d Merge pull request #11 from appen-isen/badminton
Badminton
2023-11-06 20:14:01 +01:00
Allan Cueff
5fa43745ed Merge branch 'main' into badminton 2023-11-06 20:13:51 +01:00
Félix MARQUET
96770c1938 Update arbitrage.js 2023-11-06 20:10:40 +01:00
772abee3f9 Fix issues in display of match status 2023-11-06 19:59:02 +01:00
b1efcc587f Add icons to sport 2023-11-06 19:50:38 +01:00
Allan Cueff
8f7bea7813 don't print badminton teams 2023-11-06 19:27:09 +01:00
Allan Cueff
ec162009b4 switch from "equipes" to "duo_bad" in DB 2023-11-05 22:54:16 +01:00
Allan Cueff
983c4507ef nom sport prochain match dans page teams 2023-11-05 16:37:53 +01:00
Allan Cueff
ef978b6e7b Merge pull request #10 from appen-isen/temporary
rebase fix du main dans badminton
2023-11-05 16:32:32 +01:00
Allan Cueff
c1052fa94a Merge branch 'badminton' into temporary 2023-11-05 16:32:18 +01:00
Allan Cueff
11257a0c6c fix affichage des membres & du capitaine 2023-11-05 16:24:33 +01:00
Allan Cueff
184f6316b4 add bedminton teams only in promo cards 2023-11-05 16:14:07 +01:00
2a8a826df6 Fix the url to pocketbase from V6 to V4 (for the prod) 2023-11-04 09:02:01 +01:00
0ef1713a01 Fix the path to appen logo for the navbar (for the prod) 2023-11-04 09:00:34 +01:00
Allan Cueff
10c269d30b add week day + always 2 digits minutes 2023-11-04 01:13:18 +01:00
Allan Cueff
03ac1e204e Merge pull request #9 from appen-isen/Backend
Backend
2023-11-04 00:53:39 +01:00
Allan Cueff
5fb8b00352 remade sports.js + rewrited duplicate code in functions 2023-11-03 12:53:12 +01:00
Allan Cueff
b6f1cb5ef1 clean code + bootstrap lists 2023-11-03 00:43:58 +01:00
29ddf5eb4e Merge remote-tracking branch 'origin/Backend' into Backend 2023-11-02 16:12:07 +01:00
80a2316711 Create the counting of the point at the end of a match 2023-11-02 16:10:24 +01:00
Allan Cueff
d39c6406bf miam les alertes qui marche bien miam miam 2023-11-02 15:40:04 +01:00
f0e85b93d3 Fix the match don't change overtime 2023-11-02 15:26:59 +01:00
460aba26ff Add the best team in the sports page and display the next match of the sport 2023-11-02 15:14:57 +01:00
6840dfd934 Fix little issues with the hr 2023-11-02 15:01:49 +01:00