lbehm
/
workadventure
1
0
Fork 0
Code Issues Pull Requests Releases Activity
987 Commits 21 Branches 1 Tag 50 MiB
Commit Graph

987 Commits

Author SHA1 Message Date
David Négrier a4a19a60e5
Merge pull request #342 from thecodingmachine/ban-message 
Ban feature
 2020-10-20 10:26:14 +02:00
Gregoire Parant 565ce6b70b eslint fix 2020-10-20 09:24:06 +02:00
Gregoire Parant 8d1d6fc8dc Push message when user is connected on new room 2020-10-20 09:20:00 +02:00
Gregoire Parant eb1f62bb1c Add banned message and close ws 2020-10-20 08:30:11 +02:00
Gregoire Parant 7059c6e6e3 Refactor message 2020-10-20 08:20:21 +02:00
Gregoire Parant ba9f9dcbe1 Fix CD 2020-10-19 21:04:16 +02:00
Gregoire Parant dfa6d2cc66 Verify user in admin 
- If 404, user don't exist in admin, it will be anonym user
- if 403, user is ban or not associate in the world
 2020-10-19 20:49:30 +02:00
Gregoire Parant bf9dfcc835 Ban mesage 
- Create type message could be use to send private message at any user
- Create SendMessageUser message
- Add sound when user receive ban message
 2020-10-19 19:32:47 +02:00
David Négrier 88a1e899a3
Merge pull request #338 from thecodingmachine/ioSocketRefractor 
Creating a websocket for the admin plateform
 2020-10-19 14:28:00 +02:00
arp 75d9ed8dfa implemented the admin websocket 
now send data
 2020-10-19 14:23:50 +02:00
David Négrier 84566f08f3
Merge pull request #339 from thecodingmachine/jitsijwt 
Adding JWT authentication to Jitsi
 2020-10-19 13:45:26 +02:00
David Négrier bf01116f63 Removing useless features of Jitsi meet 2020-10-19 12:36:05 +02:00
David Négrier a7c16654c3 Deploying with new configurable Jitsi conf 2020-10-19 12:07:05 +02:00
David Négrier ed1fbb5324 Linting 2020-10-19 11:14:52 +02:00
David Négrier 16d1c2354e Adding fallback to unauthenticated Jitsi 2020-10-19 11:07:49 +02:00
David Négrier 260b0ea408 Adding JWT authentication to Jitsi 2020-10-16 19:23:28 +02:00
Kharhamel 4334ab0f54
Merge pull request #332 from thecodingmachine/ioSocketRefractor 
move most of the logic of IOSocketController into a dedicated class
 2020-10-16 14:36:00 +02:00
David Négrier 59ae5f6b47 Fixing TCM map URL in Choose your map page 2020-10-16 10:01:20 +02:00
David Négrier fcb3972296
Merge pull request #335 from thecodingmachine/develop 
Fixing change of map with relative URLs (deploy to prod)
 2020-10-16 09:37:40 +02:00
David Négrier c259dd582c Fixing change of map with relative URLs 2020-10-16 09:29:18 +02:00
arp e6bd655527 move most of the logic of IOSocketController into a dedicated class 2020-10-15 18:22:28 +02:00
David Négrier 9598487961
Merge pull request #334 from thecodingmachine/develop 
Release 15/10
 2020-10-15 18:15:11 +02:00
David Négrier 1abae077a3
Merge pull request #292 from thecodingmachine/player-report 
Report player
 2020-10-15 18:05:48 +02:00
David Négrier c75f1edc40 Merge branch 'develop' of github.com:thecodingmachine/workadventure into player-report 
# Conflicts:
#	back/src/Controller/AuthenticateController.ts
 2020-10-15 18:01:44 +02:00
David Négrier c59a335a1a Removing useless resource 2020-10-15 18:00:34 +02:00
David Négrier 267476c651 Removing TODO 2020-10-15 17:59:32 +02:00
David Négrier 0ea7240834 Adding condition to enable reporting only on private rooms 2020-10-15 17:58:27 +02:00
David Négrier 6d0c435553
Merge pull request #333 from thecodingmachine/fixstatuscode 
Fixing HTTP status code not correctly outputed because of CORS headers
 2020-10-15 17:35:26 +02:00
David Négrier 2bf795d9c2 Fixing HTTP status code not correctly outputed because of CORS headers 2020-10-15 17:27:40 +02:00
David Négrier e7890907c1
Merge pull request #331 from thecodingmachine/verifyjwtserverside 
Adding a new endpoint to verify the JWT token server-side before connecting
 2020-10-15 17:02:41 +02:00
David Négrier 4f54c3cd86 Fixing JWT verify 2020-10-15 16:54:04 +02:00
David Négrier a348001036 Adding a new endpoint to verify the JWT token server-side before connecting 2020-10-15 16:48:42 +02:00
David Négrier 702084b00a
Merge pull request #330 from thecodingmachine/exiturl 
Adding exitUrl property
 2020-10-15 16:00:50 +02:00
David Négrier 2fe61ce11b
Merge pull request #329 from thecodingmachine/fixhistory 
Fixing URL not being rewritten when changing maps
 2020-10-15 15:52:01 +02:00
David Négrier 36d73333f5 Adding exitUrl property 
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
 2020-10-15 15:50:51 +02:00
Kharhamel 47275acebb
Merge pull request #327 from thecodingmachine/name8 
improved textField component and allowed 8 caracter names
 2020-10-15 15:27:45 +02:00
David Négrier 517b3a644b Fixing URL not being rewritten when changing maps 2020-10-15 14:35:09 +02:00
arp d35b3ff5be extended the exprire duration for jwt token 2020-10-15 14:30:43 +02:00
arp 67a9bd2520 improved textField component and allowed 8 caracter names 2020-10-15 14:23:39 +02:00
David Négrier 3ba3b24647
Merge pull request #328 from thecodingmachine/ping 
The server now sends regular ping requests to keep connections alive
 2020-10-15 14:12:12 +02:00
David Négrier d098a1b8db The server now sends regular ping requests to keep connections alive 2020-10-15 13:53:59 +02:00
Gregoire Parant 62dfb68aaf Update style report modal 2020-10-15 12:24:16 +02:00
Gregoire Parant 38d2cc9a8c Remove teleport feature 2020-10-15 12:12:11 +02:00
Gregoire Parant 8df56204e3 Add teleport event 2020-10-15 11:51:24 +02:00
Gregoire Parant 7b435edd71 Finish report 2020-10-15 10:37:40 +02:00
Gregoire Parant f6ae7d8d3b Merge branch 'develop' into player-report 
# Conflicts:
#	back/src/Controller/IoSocketController.ts
 2020-10-15 09:44:37 +02:00
Kharhamel 49a0125f88
Merge pull request #320 from thecodingmachine/nodejsTags 
now fetch the tags from the admin into the nodejs back
 2020-10-14 16:58:57 +02:00
arp a6a51caa93 now fetch the tags from the admin into the nodejs back 2020-10-14 16:50:42 +02:00
Gregoire Parant 4799460064 Merge branch 'develop' into player-report 
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
 2020-10-14 15:06:10 +02:00
David Négrier 5e54083f34
Merge pull request #316 from thecodingmachine/develop 
Deploy to prod
 2020-10-14 14:55:24 +02:00