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 |
|
David Négrier
|
807ccc49d4
|
Fixing rewriterule with register link in prod
|
2020-10-14 13:52:02 +02:00 |
|
David Négrier
|
b7340022de
|
Fixing rewriterule with @ in prod
|
2020-10-14 13:29:16 +02:00 |
|
David Négrier
|
d32022320e
|
Merge pull request #306 from thecodingmachine/gettags
Adding ADMIN_API_TOKEN to deployment
|
2020-10-14 13:18:52 +02:00 |
|
David Négrier
|
ff37e0f9b9
|
Adding ADMIN_API_TOKEN
|
2020-10-14 12:25:05 +02:00 |
|
David Négrier
|
cf4c608360
|
Adding ADMIN_API_TOKEN to deployment
|
2020-10-14 12:00:23 +02:00 |
|
David Négrier
|
a2aea2d387
|
Merge pull request #305 from thecodingmachine/gettags
Get tags from the admin
|
2020-10-14 11:53:55 +02:00 |
|
David Négrier
|
731ccd8796
|
Fix CI
|
2020-10-14 11:48:34 +02:00 |
|
David Négrier
|
98bda49d7e
|
Get tags from the admin
And uses tag "admin" to choose whether to display the console or not
|
2020-10-14 11:07:34 +02:00 |
|
David Négrier
|
3710c3cb7d
|
Merge pull request #303 from thecodingmachine/fixsendrights
Fixing the way rights are sent to the admin
|
2020-10-14 10:54:48 +02:00 |
|
David Négrier
|
ce93e5bbaa
|
Fixing the way rights are sent to the admin (now sending organization/world/room)
|
2020-10-14 10:37:00 +02:00 |
|
Gregoire Parant
|
f05f4a7f5b
|
Fix url
|
2020-10-13 22:19:32 +02:00 |
|
Gregoire Parant
|
436cde7033
|
Fixe style media manager and text modale
|
2020-10-13 21:54:08 +02:00 |
|
Gregoire Parant
|
3e74e178fb
|
Fix CI
|
2020-10-13 21:22:39 +02:00 |
|
Gregoire Parant
|
047fa7b594
|
Merge branch 'player-report-fix-conflict' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
|
2020-10-13 21:16:57 +02:00 |
|
Gregoire Parant
|
9c44d37020
|
Merge remote-tracking branch 'github.com/develop' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
|
2020-10-13 21:14:46 +02:00 |
|
Gregoire Parant
|
05a1ea8469
|
Merge branch 'develop' into player-report
# Conflicts:
# back/src/Controller/IoSocketController.ts
# front/src/Phaser/Game/GameScene.ts
# front/src/index.ts
# messages/messages.proto
|
2020-10-13 20:39:29 +02:00 |
|
Gregoire Parant
|
dbaf44e814
|
Change report flag
- Add icon on video
- Permit to have a modal with comment
|
2020-10-13 19:56:42 +02:00 |
|
David Négrier
|
9113ef4ff6
|
Merge pull request #302 from thecodingmachine/roomswitching
Fixing room switching
|
2020-10-13 18:49:45 +02:00 |
|
David Négrier
|
cb159350e9
|
Fixed room switching
|
2020-10-13 18:44:50 +02:00 |
|
David Négrier
|
4ca2876b31
|
Merge pull request #301 from thecodingmachine/room_refactoring
Refactoring Room.ts to fetch map url automatically from ID
|
2020-10-13 17:35:02 +02:00 |
|
David Négrier
|
a2c750dea2
|
Fix linter
|
2020-10-13 17:30:53 +02:00 |
|
David Négrier
|
45a2721c5c
|
Fixing code post rebase
|
2020-10-13 17:20:20 +02:00 |
|