Commit Graph

439 Commits

Author SHA1 Message Date
Me
926fc1dd67 Merge remote-tracking branch 'origin/master' into eric_front_and_back 2023-01-17 03:05:06 +01:00
Me
29b6042cda clean up 2023-01-17 03:04:36 +01:00
cherif
8db801eb23 mini correction 2023-01-17 00:48:24 +01:00
cherif
2386bb39b3 Correction d'un autre bug mais dans la bonne fonction de luke. 2023-01-17 00:46:49 +01:00
cherif
d8a5a41673 remise en place de la correction d'un bug enlevé précédemment par un commit 2023-01-17 00:43:58 +01:00
cherif
fffbe3f1e9 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-17 00:43:19 +01:00
cherif
1220bdb363 ajout d'une limite pour la taille des mots 2023-01-17 00:38:51 +01:00
cherif
796a8464b1 COrrection de nombreux bug, changement de font, réel username unique insensible à la casse... 2023-01-17 00:30:39 +01:00
Me
68bf406834 Merge remote-tracking branch 'origin/master' into eric_front_and_back 2023-01-16 21:47:20 +01:00
Me
86f7add6ed a few small fixes, about to add 404 exceptions most places i do fetches 2023-01-16 21:47:02 +01:00
LuckyLaszlo
2cd3a50b6f Merge branch 'master' into luke 2023-01-16 21:09:57 +01:00
simplonco
cf05d242cd gros probleme resolu 2023-01-16 21:06:58 +01:00
Me
0499d92818 merged luke's branch into mine, he fixed all the fetches to catch stuff, need to test 2023-01-16 19:23:32 +01:00
Me
af872eafc5 removed the cached .env that was lurking about 2023-01-16 18:53:14 +01:00
LuckyLaszlo
3588a8c12d Merge branch 'master' into luke 2023-01-16 18:53:00 +01:00
Me
49ffa74bb4 small update to ProfileUsers, make it so buttons don't load if user doesn't 2023-01-16 18:48:13 +01:00
LuckyLaszlo
dfd34c590b primaryRoutes.js fetch() fix and refactoring 2023-01-16 18:04:30 +01:00
LuckyLaszlo
314fa10cff fetch() changes in all svelte
+ miscs front refactoring
2023-01-16 18:03:08 +01:00
LuckyLaszlo
36f13cb5af fetchUser/Avatar() with optionnal username param
+ miscs smalls changes
2023-01-16 18:00:19 +01:00
simplonco
8b365968ac chat not on game 2023-01-16 17:57:37 +01:00
simplonco
f9d4045f64 small css stye fix 2023-01-16 17:51:56 +01:00
simplonco
569ef89077 added severall protections 2023-01-16 17:43:13 +01:00
simplonco
5f0e733f55 Merge branch 'master' into hugo 2023-01-16 17:28:48 +01:00
simplonco
ed2df0611e Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 17:28:33 +01:00
simplonco
15c53b17b3 blocked messages are not in hitory 2023-01-16 17:27:35 +01:00
simplonco
8b508063e8 will not show users in rooms if blocked 2023-01-16 16:46:04 +01:00
simplonco
e52690d890 will not show direct rooms if blocked 2023-01-16 16:18:42 +01:00
simplonco
3cd9a0b52e will not show direct rooms if blocked 2023-01-16 16:08:56 +01:00
cherif
ebf9037050 suppression du resize 2023-01-16 15:09:00 +01:00
simplonco
61864af0a3 Merge branch 'master' into hugo 2023-01-16 14:11:22 +01:00
simplonco
4b81fb8331 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 14:11:09 +01:00
simplonco
d379b4da37 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 14:10:54 +01:00
simplonco
9d5aa7f3a1 socket reconnecte automatically to last room and blocked users 2023-01-16 14:10:12 +01:00
cherif
3f3a445d8c Suppression des variables flex dans le css global afin d'éviter des problèmes sur certaines pages 2023-01-16 14:07:54 +01:00
Me
ae34fd1cb6 a few small fixes 2023-01-16 13:44:49 +01:00
simplonco
20ea0bcef5 interaction blocked users and view profile ok, still block message todo 2023-01-16 13:35:15 +01:00
simplonco
2a4e076f3f Merge branch 'master' into hugo 2023-01-16 09:19:30 +01:00
simplonco
ebad66ed2a Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-16 09:19:13 +01:00
simplonco
a643e6bb78 wip unblock socket 2023-01-16 09:18:50 +01:00
Me
b9e93bda17 Merge remote-tracking branch 'origin/master' into eric_front_and_back 2023-01-16 08:52:50 +01:00
Me
139703e867 fixed a whole bunch of things, better logic for blocking, more reactive front, you can't double friend someone who has friended you anymore, path to display just one user other than you, cleaned up comments and commented out console.logs 2023-01-16 08:52:27 +01:00
simplonco
3e4e0ce937 wip block socket ok 2023-01-16 08:52:04 +01:00
simplonco
fe44a9b21c wip bock user 2023-01-16 08:13:10 +01:00
simplonco
cc389a67b7 small style adjustment and admin view on user 2023-01-16 07:42:52 +01:00
simplonco
4cfac6bd25 merge with master 2023-01-16 07:22:51 +01:00
simplonco
cc47a64b2a mute ok 2023-01-16 07:16:48 +01:00
simplonco
23d45db6ae mute almost done, still changing layout 2023-01-16 06:51:14 +01:00
simplonco
7433490ac6 mute user works, not forever so far 2023-01-16 05:36:23 +01:00
simplonco
9a08c305cb small ss adjusment 2023-01-16 00:40:45 +01:00
simplonco
134fa0fef4 admin messages and not in direct 2023-01-16 00:34:20 +01:00