Merge branch 'develop' into GlobalMessageToWorld

# Conflicts: # CHANGELOG.md # front/src/Api/Events/IframeEvent.ts # front/src/Components/App.svelte # pusher/src/Services/SocketManager.ts
2021-08-02 23:07:39 +02:00
parent bd96a32d5b 2480d13f58
commit 14b4229019
48 changed files with 1346 additions and 1634 deletions
@@ -790,7 +790,7 @@ export class SocketManager {
        if (!room) {
            //todo: this should cause the http call to return a 500
            console.error(
-                "In sendAdminRoomMessage, could not find room with id '" +
+                "In dispatchWorldFullWarning, could not find room with id '" +
                    roomId +
                    "'. Maybe the room was closed a few milliseconds ago and there was a race condition?"
            );