Commit Graph

163 Commits

Author SHA1 Message Date
Alexandre POMMIER
c5371353f8 Merge remote-tracking branch 'origin/reborn' into apommier 2023-06-28 17:51:45 +02:00
Alexandre POMMIER
00a8c9567f delete all console log, hide join when pass 2023-06-28 17:49:23 +02:00
Elisee ADJIGUIDI
02ecea7d52 no dropIn in alert 2023-06-28 17:48:14 +02:00
Elisee ADJIGUIDI
e320c0fd66 Merge branch 'reborn' of github.com:kinou-p/ft_transcendence into reborn 2023-06-28 17:25:13 +02:00
Elisee ADJIGUIDI
b609c7a9d7 no comment 2023-06-28 17:23:01 +02:00
Alexandre POMMIER
49f3626948 Merge remote-tracking branch 'origin/reborn' into apommier 2023-06-28 17:05:32 +02:00
Alexandre POMMIER
86ceafae40 add > for gamesession and sessionnbr 2023-06-28 17:04:50 +02:00
Lara REALI
3eca00e7af Merge branch 'reborn' into phoenix 2023-06-28 16:37:14 +02:00
44183cd1b5 Merge branch 'tmp_apommier' into apommier 2023-06-28 14:22:29 +02:00
18706e168e fix error useEffect pong by putting it in field.tsx, add game session, when page closed nbr session work for me but maybe not at school 2023-06-28 14:19:23 +02:00
Alexandre POMMIER
790e9e5897 je sais plus 2023-06-26 12:02:50 +02:00
Lara REALI
dce2c895e1 remove comment 2023-06-26 11:48:53 +02:00
Alexandre POMMIER
ad10c23528 clean all 2023-06-26 11:38:22 +02:00
Lara REALI
c578ee926c Merge branch 'phoenix' into reborn 2023-06-26 11:13:08 +02:00
Lara REALI
fb6d96fb29 rm index.js change icon and title , delete report webvital 2023-06-26 10:50:47 +02:00
Alexandre POMMIER
0ceea91dc0 merge apommier dipper 2023-06-26 10:49:01 +02:00
Alexandre POMMIER
369ab63f8a clen a bit and add verifypassword who now add to channel if good pass 2023-06-26 10:47:15 +02:00
Elisee ADJIGUIDI
badd6a8379 merge 2023-06-26 10:45:08 +02:00
Elisee ADJIGUIDI
612d0084c0 password 2023-06-26 10:38:22 +02:00
Alexandre POMMIER
a6dfe6940f big big merge 2023-06-26 07:55:12 +02:00
Alexandre POMMIER
0d80c118b4 Merge remote-tracking branch 'origin/phoenix' into reborn 2023-06-26 07:46:36 +02:00
Alexandre POMMIER
984b374500 fix alert in modal setting 2023-06-26 07:46:00 +02:00
Lara REALI
53106b33bc fix log color 2023-06-26 07:26:27 +02:00
Alexandre POMMIER
b59e987c7d clean chat api and pong from commentary 2023-06-26 07:06:16 +02:00
Lara REALI
49d73b92d3 log color to fix 2023-06-26 06:58:09 +02:00
Elisee ADJIGUIDI
cd4e414d16 resize name conv 2023-06-26 06:36:29 +02:00
Alexandre POMMIER
42cdd645c8 Merge remote-tracking branch 'origin/dipper' into reborn 2023-06-26 06:05:44 +02:00
Alexandre POMMIER
02ab84add4 mute work 2023-06-26 06:05:14 +02:00
Elisee ADJIGUIDI
94e6250e17 limit conv name 2023-06-26 06:00:38 +02:00
Elisee ADJIGUIDI
9f323ee15d from username to nickname 2023-06-26 05:49:26 +02:00
Elisee ADJIGUIDI
3d74296bb8 recentre alerte 2023-06-26 05:09:47 +02:00
Elisee ADJIGUIDI
ba5490cf90 Alert mute 2023-06-26 04:44:08 +02:00
Alexandre POMMIER
8ebeabb386 Merge remote-tracking branch 'origin/phoenix' into reborn 2023-06-26 04:18:16 +02:00
Lara REALI
84cc25a5a1 reload fix , friends , navbarSocial change margin friends 2023-06-26 04:17:07 +02:00
Alexandre POMMIER
abf09f24fd merge reborn 2023-06-26 04:16:48 +02:00
Alexandre POMMIER
cd6de16511 fix chan invite 2023-06-26 04:06:09 +02:00
Elisee ADJIGUIDI
13dfa6cd95 retrait compteur dans alert et recentre profile 2023-06-26 04:04:51 +02:00
Elisee ADJIGUIDI
9026a81680 merge 2023-06-26 03:02:04 +02:00
Lara REALI
26b3c82790 merge error 2023-06-26 02:54:48 +02:00
Elisee ADJIGUIDI
ba60337c71 unbanned unblocked 2023-06-26 02:40:29 +02:00
Lara REALI
87d342d89a merge apommier 2023-06-26 02:39:09 +02:00
Alexandre POMMIER
152d0541d4 add useeffect app for return 2023-06-26 02:27:43 +02:00
Lara REALI
322aecc182 quit + alert +addsesion 2023-06-26 02:22:47 +02:00
Elisee ADJIGUIDI
80ff5f6c9f new alert bad input qrcode resize button chat modif alert name already taken 2023-06-26 01:47:41 +02:00
Alexandre POMMIER
4151350162 fix login with other app, pong greater speed at start, fix in game status ?, rename home.js to loginbutton.tsx 2023-06-26 01:31:46 +02:00
Lara REALI
b61531d8d2 color for qr input + text in chat input + w = wall 2023-06-26 00:32:42 +02:00
Lara REALI
1e9946859c augment desactivate 2fa size + blur OK + Friend list css OK Invite button suppress comment spectate button 2023-06-25 21:51:21 +02:00
Lara REALI
007dbe1832 Merge branch 'ereali' into reborn 2023-06-25 00:39:05 +02:00
Alexandre POMMIER
9098c29287 fix invite double channel when add friend fix invite, history power up time limited wall 2023-06-25 00:30:30 +02:00
Lara REALI
cf0edf5bc0 Merge remote-tracking branch 'origin/apommier' into ereali 2023-06-24 20:18:46 +02:00