seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in feature/all-clients-are-modern (pull request #49) 

Move all clients to the 'modern' track.

* Force old client website to upgrade to new client

* Also add

* wording fix
This commit is contained in:
Seth Call 2024-09-08 18:18:02 +00:00
parent c60959126c
commit 3f1a3402d8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruby/lib/jam_ruby/models/artifact_update.rb
View File

@ -12,7 +12,8 @@ module JamRuby
"#{CLIENT_PREFIX}/JamBlasterClient",
"#{CLIENT_PREFIX_MODERN}/Win32",
"#{CLIENT_PREFIX_MODERN}/MacOSX-Intel",
"#{CLIENT_PREFIX_MODERN}/MacOSX-M"
"#{CLIENT_PREFIX_MODERN}/MacOSX-M",
"#{CLIENT_PREFIX_MODERN}/MacOSX"
]
self.primary_key = 'id'

1
web/app/assets/javascripts/JamServer.js
View File

@ -711,6 +711,7 @@
client_id: client_id,
machine: machine,
os: context.JK.GetOSAsString(),
product: "JamClientModern",
//jamblaster_serial_no: context.PlatformStore.jamblasterSerialNo(),
udp_reachable: context.JK.StunInstance ? !context.JK.StunInstance.sync() : null // latency tester doesn't have the stun class loaded
}

2
web/app/assets/javascripts/clientUpdate.js
View File

@ -265,7 +265,7 @@
return;
}
var product = "JamClient"
var product = "JamClientModern"
var currentVersion = context.jamClient.ClientUpdateVersion();
if (!forceShow && (currentVersion == null || currentVersion.indexOf("Compiled")) > -1) {

6
web/app/views/clients/_client_update.html.erb
View File

@ -114,11 +114,9 @@
<div align="center">
<div class="download-manual">
<p class="fix"><b>Step 1:</b> Uninstall the JamKazam application manually.</p>
<br/>
<p class="fix"><b>Step 2:</b> Download the latest JamKazam installer from <a class="open-downloads" href="/downloads" rel="external">our downloads page.</a></p><br/>
<p class="fix"><b>Step 1:</b> Download the latest JamKazam installer from <a class="open-downloads" href="/downloads" rel="external">our downloads page.</a></p><br/>
<p class="fix"><b>Step 3:</b> Double-click the downloaded file, and then drag & drop the Jamkazam application into your Applications folder.</p>
<p class="fix"><b>Step 2:</b> Double-click the downloaded file, and then drag & drop the Jamkazam application into your Applications folder, <b>and choose Replace option</b></p>
</div>
<div class="error-detail">
Our automatic updater is temporarily not working for Mac OS on this release.