David Négrier 6f2c319785 Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling ... # Conflicts: # back/src/Services/SocketManager.ts # deeployer.libsonnet # docker-compose.yaml # front/src/Connexion/RoomConnection.ts # front/src/Enum/EnvironmentVariable.ts # front/src/Phaser/Game/GameScene.ts # front/webpack.config.js # pusher/src/Controller/IoSocketController.ts		2020-12-11 13:00:11 +01:00
..
Controller	Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling	2020-12-11 13:00:11 +01:00
Enum	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
Messages	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
Model	Adapting admin connection to pusher.	2020-12-10 17:46:15 +01:00
Server	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
Services	Reimplementing ban/unban/messages	2020-12-11 12:23:50 +01:00
App.ts	Extracting FileController into a Uploader container	2020-12-09 21:29:29 +01:00