Commit Graph

423 Commits

Author SHA1 Message Date
simplonco
0dbe255f26 smal service change 2023-01-17 11:52:02 +01:00
simplonco
61badedd21 wip protect get list blocked 2023-01-17 09:51:24 +01:00
simplonco
cf05d242cd gros probleme resolu 2023-01-16 21:06:58 +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
LuckyLaszlo
102d03c4bb fetch() in Game.svelte
+ fix .dim_background
+ Header in App,svelte
2023-01-16 00:08:50 +01:00
simplonco
d60f2f0c9f fixed user and room name pbm
+ style ok
2023-01-15 23:52:22 +01:00
Me
48d4ff3dee Merge remote-tracking branch 'origin/master' into eric_front_and_back 2023-01-15 22:07:48 +01:00
Me
e546723263 a temporary solution to displaying just a user 2023-01-15 22:07:30 +01:00
simplonco
170a1f0cd1 wip styles 2023-01-15 22:02:32 +01:00
simplonco
eacdb5636a wip styles 2023-01-15 21:23:34 +01:00
LuckyLaszlo
c6d034b9f7 css small fix 2023-01-15 21:11:38 +01:00
LuckyLaszlo
1a07065f6a CSS smalls changes (headers, ranking colors)
+ mode "cinema" in Game.svelte
2023-01-15 20:52:08 +01:00
simplonco
b4bdc2080b user admin visible 2023-01-15 20:45:03 +01:00
Me
99cc341286 merged 2023-01-15 20:28:26 +01:00
simplonco
77c420a174 make admin ok 2023-01-15 19:50:27 +01:00
LuckyLaszlo
b2b54f1fdc Merge branch 'master' into luke 2023-01-15 19:34:58 +01:00
simplonco
164581b655 wip style according to pages 2023-01-15 19:16:06 +01:00
LuckyLaszlo
e3407b8a9d Invitations changes.
Now require confirmation from both side to start game.
2023-01-15 19:02:16 +01:00
simplonco
acd480e332 chat is on every pages 2023-01-15 18:43:13 +01:00
cherif
fa8e3d7473 changements de le couleur et de la font sur l'ensemble du site. 2023-01-15 18:07:23 +01:00