From: vincent@cubedesigners.com Date: Tue, 12 Oct 2021 12:11:32 +0000 (+0000) Subject: wait #4776 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e327ca3de9fb2779829d0362892d5b22683d44ae;p=cubeextranet.git wait #4776 @0.5 --- diff --git a/desktop/windows-installer/Fluidbook-Workshop.exe b/desktop/windows-installer/Fluidbook-Workshop.exe index d8dd23b5c..0307c7d98 100644 Binary files a/desktop/windows-installer/Fluidbook-Workshop.exe and b/desktop/windows-installer/Fluidbook-Workshop.exe differ diff --git a/desktop/windows/workshop/windows-x32/libEGL.dll b/desktop/windows/workshop/windows-x32/libEGL.dll index bc36f6bd3..b5b81b06a 100644 Binary files a/desktop/windows/workshop/windows-x32/libEGL.dll and b/desktop/windows/workshop/windows-x32/libEGL.dll differ diff --git a/desktop/windows/workshop/windows-x32/libGLESv2.dll b/desktop/windows/workshop/windows-x32/libGLESv2.dll index d15af7060..b2bfb9da0 100644 Binary files a/desktop/windows/workshop/windows-x32/libGLESv2.dll and b/desktop/windows/workshop/windows-x32/libGLESv2.dll differ diff --git a/desktop/windows/workshop/windows-x32/node.dll b/desktop/windows/workshop/windows-x32/node.dll index ef0af8475..cf5bc2fd4 100644 Binary files a/desktop/windows/workshop/windows-x32/node.dll and b/desktop/windows/workshop/windows-x32/node.dll differ diff --git a/desktop/windows/workshop/windows-x32/notification_helper.exe b/desktop/windows/workshop/windows-x32/notification_helper.exe index 6fad87dc9..9528f74d4 100644 Binary files a/desktop/windows/workshop/windows-x32/notification_helper.exe and b/desktop/windows/workshop/windows-x32/notification_helper.exe differ diff --git a/desktop/windows/workshop/windows-x32/nw.dll b/desktop/windows/workshop/windows-x32/nw.dll index d3c5b6dd7..821b8da24 100644 Binary files a/desktop/windows/workshop/windows-x32/nw.dll and b/desktop/windows/workshop/windows-x32/nw.dll differ diff --git a/desktop/windows/workshop/windows-x32/nw_elf.dll b/desktop/windows/workshop/windows-x32/nw_elf.dll index 21aaa072d..fa4d2350f 100644 Binary files a/desktop/windows/workshop/windows-x32/nw_elf.dll and b/desktop/windows/workshop/windows-x32/nw_elf.dll differ diff --git a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns index 5f5ddb814..6811cfdb3 100644 Binary files a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns and b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.icns differ diff --git a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico index fdaa6af8d..256e978ac 100644 Binary files a/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico and b/desktop/windows/workshop/windows-x32/package.nw/fluidbook.ico differ diff --git a/desktop/windows/workshop/windows-x32/package.nw/main.js b/desktop/windows/workshop/windows-x32/package.nw/main.js index a5290a5a5..00c63a8b6 100644 --- a/desktop/windows/workshop/windows-x32/package.nw/main.js +++ b/desktop/windows/workshop/windows-x32/package.nw/main.js @@ -3,7 +3,6 @@ if (nw.App.argv.length >= 1 && nw.App.argv[0].indexOf('https://workshop.fluidboo url = nw.App.argv[0]; } var win = nw.Window.open(url, {}, function (win) { - win.window.nw=nw; }); try { diff --git a/desktop/windows/workshop/windows-x32/resources.pak b/desktop/windows/workshop/windows-x32/resources.pak index e91e2c591..52ede4c06 100644 Binary files a/desktop/windows/workshop/windows-x32/resources.pak and b/desktop/windows/workshop/windows-x32/resources.pak differ diff --git a/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll b/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll index 2603e5c07..377cd4665 100644 Binary files a/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll and b/desktop/windows/workshop/windows-x32/swiftshader/libEGL.dll differ diff --git a/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll b/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll index 203d1b21e..080358353 100644 Binary files a/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll and b/desktop/windows/workshop/windows-x32/swiftshader/libGLESv2.dll differ diff --git a/desktop/windows/workshop/windows-x32/workshop.exe b/desktop/windows/workshop/windows-x32/workshop.exe index c1aa9ded1..58fdaa9b9 100644 Binary files a/desktop/windows/workshop/windows-x32/workshop.exe and b/desktop/windows/workshop/windows-x32/workshop.exe differ diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index ba11026f5..33470b80d 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -1408,12 +1408,11 @@ class wsMaintenance if ($platform === 'windows') { $p = 'windows-x32'; $exe = 'workshop'; - $version = '0.50.2'; } else if ($platform === 'mac') { $p = 'mac-x64'; $exe = 'Fluidbook Workshop'; - $version = '0.50.2'; } + $version = '0.50.2'; $path = ROOT . '/desktop'; $outpath = $path . '/' . $platform;