simplonco
|
61864af0a3
|
Merge branch 'master' into hugo
|
2023-01-16 14:11:22 +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 |
|
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
|
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
|
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
|
134fa0fef4
|
admin messages and not in direct
|
2023-01-16 00:34:20 +01:00 |
|
simplonco
|
b4bdc2080b
|
user admin visible
|
2023-01-15 20:45:03 +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 |
|
LuckyLaszlo
|
e3407b8a9d
|
Invitations changes.
Now require confirmation from both side to start game.
|
2023-01-15 19:02:16 +01:00 |
|
simplonco
|
83c07451f9
|
added is admin
|
2023-01-15 16:26:53 +01:00 |
|
simplonco
|
ffdc3839b9
|
abord trying to live informe for new rooms
|
2023-01-15 14:07:34 +01:00 |
|
simplonco
|
804cab9c8d
|
if password changed, other users cannot continue to send message
|
2023-01-15 13:38:12 +01:00 |
|
simplonco
|
d9652a5eab
|
Merge branch 'master' into hugo
|
2023-01-15 02:12:50 +01:00 |
|
simplonco
|
4342da6749
|
modify password ok
|
2023-01-15 02:11:45 +01:00 |
|
simplonco
|
1a7091679b
|
wip change password
+ little clean in files, delete some
|
2023-01-15 01:05:57 +01:00 |
|
simplonco
|
f3d0af4738
|
separate password add
|
2023-01-15 00:21:12 +01:00 |
|
LuckyLaszlo
|
b72042a263
|
Game invitation from chat WIP (missing username)
+ fetchUser() and fetchAllUsers()
+ changes accept/declineInvitation()
|
2023-01-15 00:00:35 +01:00 |
|
simplonco
|
0496b34577
|
wip add and change password
+ changed on_click
|
2023-01-14 23:05:01 +01:00 |
|
simplonco
|
b19031a8f0
|
clean some console
|
2023-01-14 19:51:39 +01:00 |
|
simplonco
|
78e6bbcac4
|
Merge branch 'master' into hugo
|
2023-01-14 19:35:08 +01:00 |
|
simplonco
|
3889a7b434
|
changed all back http error status
|
2023-01-14 19:28:57 +01:00 |
|
simplonco
|
81b67a54e6
|
protected room working at least
|
2023-01-14 19:17:46 +01:00 |
|
simplonco
|
efc836eac0
|
wip password, and better catch error http request
|
2023-01-14 18:40:18 +01:00 |
|
LuckyLaszlo
|
52f48ae305
|
bugfix generateToken() for invitation
|
2023-01-14 18:34:03 +01:00 |
|
simplonco
|
d07b13b749
|
exported function fetch with catch
|
2023-01-14 14:23:02 +01:00 |
|
simplonco
|
356e1caac3
|
wip protected, already solved error http handling for createroom
|
2023-01-14 13:07:18 +01:00 |
|
simplonco
|
8e4ce8e9a8
|
wip password protected
|
2023-01-14 01:14:10 +01:00 |
|
simplonco
|
ee98fdabc1
|
wip protected room
|
2023-01-14 00:26:25 +01:00 |
|
hugogogo
|
feb00afced
|
wip password
|
2023-01-13 17:53:02 +01:00 |
|
hugogogo
|
f828419340
|
leaving message
|
2023-01-13 15:52:38 +01:00 |
|
hugogogo
|
5bcd52b573
|
no more duplicate messages join
|
2023-01-13 15:06:00 +01:00 |
|
LuckyLaszlo
|
46b914a29a
|
Merge branch 'master' into luke
|
2023-01-13 14:53:17 +01:00 |
|
cherif
|
0addb48c84
|
mini changement sur la façon de mettre à jour le statut pendant la création d'une partie. Cette corection sera complétée par une correction au niveau du gameserver
|
2023-01-13 14:49:06 +01:00 |
|
cherif
|
97f0a52b2c
|
Correction d'un bug qui ne mettait pas à jour le statut lorsque l'on quittait et revenait se connecter sur le site
|
2023-01-13 14:25:08 +01:00 |
|
hugogogo
|
126d7cefd0
|
protection against viewing or joining private rooms
|
2023-01-13 13:47:14 +01:00 |
|
simplonco
|
7a80cf6310
|
pbm double message join fixed
|
2023-01-13 11:59:59 +01:00 |
|
simplonco
|
23d1810226
|
wip private
|
2023-01-13 01:07:39 +01:00 |
|
simplonco
|
27bbb6346f
|
invitation is working
|
2023-01-13 00:08:00 +01:00 |
|
hugogogo
|
41711a75f2
|
wip invite, and join room gives 2 messages
|
2023-01-12 20:12:06 +01:00 |
|